projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
check for pdf as well
[rrdtool.git]
/
src
/
rrd_graph_helper.c
diff --git
a/src/rrd_graph_helper.c
b/src/rrd_graph_helper.c
index
cac3d7a
..
44f2c17
100644
(file)
--- a/
src/rrd_graph_helper.c
+++ b/
src/rrd_graph_helper.c
@@
-791,13
+791,14
@@
int rrd_parse_PVHLAST(
char csv[64];
char *pch;
float dsh;
char csv[64];
char *pch;
float dsh;
-
- strcpy(csv, tmpstr);
int count = 0;
int count = 0;
+ char *saveptr;
- pch = strtok(tmpstr, ",");
+ strcpy(csv, tmpstr);
+
+ pch = strtok_r(tmpstr, ",",&saveptr);
while (pch != NULL) {
while (pch != NULL) {
- pch = strtok
(NULL, ","
);
+ pch = strtok
_r(NULL, ",",&saveptr
);
count++;
}
dprintf("- %d dash value(s) found: ", count);
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);
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)) {
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++;
}
dprintf("%.1f ", gdp->p_dashes[count]);
count++;
}
- pch = strtok
(NULL, ","
);
+ pch = strtok
_r(NULL, ",",&saveptr
);
}
dprintf("\n");
} else
}
dprintf("\n");
} else