/****************************************************************************
- * RRDtool 1.2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_graph_helper.c commandline parser functions
* this code initially written by Alex van den Bogaerdt
char *saveptr;
strcpy(csv, tmpstr);
-
- pch = strtok_r(tmpstr, ",",&saveptr);
+
+ pch = strtok_r(tmpstr, ",", &saveptr);
while (pch != NULL) {
- pch = strtok_r(NULL, ",",&saveptr);
+ pch = strtok_r(NULL, ",", &saveptr);
count++;
}
dprintf("- %d dash value(s) found: ", count);
gdp->dash = 1;
gdp->ndash = count;
gdp->p_dashes = (double *) malloc(sizeof(double) * count);
- pch = strtok_r(csv, ",",&saveptr);
+ pch = strtok_r(csv, ",", &saveptr);
count = 0;
while (pch != NULL) {
if (sscanf(pch, "%f", &dsh)) {
dprintf("%.1f ", gdp->p_dashes[count]);
count++;
}
- pch = strtok_r(NULL, ",",&saveptr);
+ pch = strtok_r(NULL, ",", &saveptr);
}
dprintf("\n");
} else
int i = 0;
char command[7]; /* step, start, end, reduce */
char tmpstr[256];
- struct rrd_time_value start_tv, end_tv;
+ rrd_time_value_t start_tv, end_tv;
time_t start_tmp = 0, end_tmp = 0;
char *parsetime_error = NULL;
} else if (!strcmp("start", command)) {
i = scan_for_col(&line[*eaten], 255, tmpstr);
(*eaten) += i;
- if ((parsetime_error = parsetime(tmpstr, &start_tv))) {
+ if ((parsetime_error = rrd_parsetime(tmpstr, &start_tv))) {
rrd_set_error("start time: %s", parsetime_error);
return 1;
}
} else if (!strcmp("end", command)) {
i = scan_for_col(&line[*eaten], 255, tmpstr);
(*eaten) += i;
- if ((parsetime_error = parsetime(tmpstr, &end_tv))) {
+ if ((parsetime_error = rrd_parsetime(tmpstr, &end_tv))) {
rrd_set_error("end time: %s", parsetime_error);
return 1;
}
}
(*eaten)++;
}
- if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
- /* error string is set in parsetime.c */
+ if (rrd_proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+ /* error string is set in rrd_parsetime.c */
return 1;
}
if (start_tmp < 3600 * 24 * 365 * 10) {