X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Frrd_graph_helper.c;h=13d50418d2eca11a385ae8a3db108157dd7bc93b;hb=daf8e7ff715a59e1f9827080d1b785ffb3c5a4b1;hp=cac3d7a6e56dda44977f280a8c0abc74b5559642;hpb=aed5641cac5013af2b076e0aba9c998a4de3c2dd;p=rrdtool.git diff --git a/src/rrd_graph_helper.c b/src/rrd_graph_helper.c index cac3d7a..13d5041 100644 --- a/src/rrd_graph_helper.c +++ b/src/rrd_graph_helper.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007 + * RRDtool 1.3rc7 Copyright by Tobi Oetiker, 1997-2008 **************************************************************************** * rrd_graph_helper.c commandline parser functions * this code initially written by Alex van den Bogaerdt @@ -791,13 +791,14 @@ int rrd_parse_PVHLAST( char csv[64]; char *pch; float dsh; + int count = 0; + char *saveptr; strcpy(csv, tmpstr); - int count = 0; - pch = strtok(tmpstr, ","); + pch = strtok_r(tmpstr, ",", &saveptr); while (pch != NULL) { - pch = strtok(NULL, ","); + pch = strtok_r(NULL, ",", &saveptr); count++; } dprintf("- %d dash value(s) found: ", count); @@ -805,7 +806,7 @@ int rrd_parse_PVHLAST( gdp->dash = 1; gdp->ndash = count; gdp->p_dashes = (double *) malloc(sizeof(double) * count); - pch = strtok(csv, ","); + pch = strtok_r(csv, ",", &saveptr); count = 0; while (pch != NULL) { if (sscanf(pch, "%f", &dsh)) { @@ -813,7 +814,7 @@ int rrd_parse_PVHLAST( dprintf("%.1f ", gdp->p_dashes[count]); count++; } - pch = strtok(NULL, ","); + pch = strtok_r(NULL, ",", &saveptr); } dprintf("\n"); } else