X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph_helper.c;h=4373fd0ca34b353c9cb684334df0ab6795782529;hb=6152d278ba083f0447e5989c7933897a03fcd7e3;hp=0a6fabcb42121a9df68281dd68e49b4b2e64f438;hpb=c809151f5435867ee8e4187e4ba1f75a50f793e8;p=rrdtool.git diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index 0a6fabc..4373fd0 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -445,9 +445,11 @@ int rrd_parse_shift( return 1; } } else { + long time_tmp = 0; rrd_clear_error(); i = 0; - sscanf(&line[*eaten], "%li%n", &gdp->shval, &i); + sscanf(&line[*eaten], "%li%n", &time_tmp, &i); + gdp->shval = time_tmp; if (i != (int) strlen(&line[*eaten])) { rrd_set_error("Not a valid offset: %s in line %s", &line[*eaten], line); @@ -594,9 +596,6 @@ int rrd_parse_PVHLAST( if ((gdp->vidx = find_var(im, tmpstr)) >= 0) { dprintf("- found vname: '%s' vidx %li\n", tmpstr, gdp->vidx); switch (gdp->gf) { -#ifdef WITH_PIECHART - case GF_PART: -#endif case GF_VRULE: case GF_HRULE: if (im->gdes[gdp->vidx].gf != GF_VDEF) { @@ -608,11 +607,13 @@ int rrd_parse_PVHLAST( default:; } } else { + long time_tmp = 0; dprintf("- it is not an existing vname\n"); switch (gdp->gf) { case GF_VRULE: k = 0; - sscanf(tmpstr, "%li%n", &gdp->xrule, &k); + sscanf(tmpstr, "%li%n",&time_tmp , &k); + gdp->xrule = time_tmp; if (((j != 0) && (k == j)) || ((j == 0) && (k == i))) { dprintf("- found time: %li\n", gdp->xrule); } else { @@ -626,9 +627,9 @@ int rrd_parse_PVHLAST( k = 0; sscanf(tmpstr, "%lf%n", &gdp->yrule, &k); if (((j != 0) && (k == j)) || ((j == 0) && (k == i))) { - dprintf("- found number: %f\n", gdp->yrule); + dprintf("- found number: %lf\n", gdp->yrule); } else { - dprintf("- is is not a valid number: %li\n", gdp->xrule); + dprintf("- is is not a valid number: %lf\n", gdp->yrule); rrd_set_error ("parameter '%s' does not represent a number in line %s\n", tmpstr, line);