* fixed im initialization broken after the introduction of dashes ...
git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1279
a5681a0c-68f1-0310-ab6d-
d61299d08faa
im->gdes[im->gdes_c - 1].rpnp = NULL;
im->gdes[im->gdes_c - 1].p_dashes = NULL;
im->gdes[im->gdes_c - 1].shift = 0.0;
im->gdes[im->gdes_c - 1].rpnp = NULL;
im->gdes[im->gdes_c - 1].p_dashes = NULL;
im->gdes[im->gdes_c - 1].shift = 0.0;
+ im->gdes[im->gdes_c - 1].dash = 0;
+ im->gdes[im->gdes_c - 1].ndash = 0;
+ im->gdes[im->gdes_c - 1].offset = 0;
im->gdes[im->gdes_c - 1].col.red = 0.0;
im->gdes[im->gdes_c - 1].col.green = 0.0;
im->gdes[im->gdes_c - 1].col.blue = 0.0;
im->gdes[im->gdes_c - 1].col.red = 0.0;
im->gdes[im->gdes_c - 1].col.green = 0.0;
im->gdes[im->gdes_c - 1].col.blue = 0.0;
char csv[64];
char *pch;
float dsh;
char csv[64];
char *pch;
float dsh;
- pch = strtok(tmpstr, ",");
+ strcpy(csv, tmpstr);
+
+ pch = strtok_r(tmpstr, ",",&saveptr);
- pch = strtok(NULL, ",");
+ pch = strtok_r(NULL, ",",&saveptr);
count++;
}
dprintf("- %d dash value(s) found: ", count);
count++;
}
dprintf("- %d dash value(s) found: ", count);
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)) {
dprintf("%.1f ", gdp->p_dashes[count]);
count++;
}
dprintf("%.1f ", gdp->p_dashes[count]);
count++;
}
- pch = strtok(NULL, ",");
+ pch = strtok_r(NULL, ",",&saveptr);