- dprintf("- optional parameter follows: %s\n", &line[*eaten]);
- i=0;
- sscanf(&line[*eaten], "%6[a-z]=%n", command, &i);
- if (!i) {
- rrd_set_error("Parse error in '%s'",line);
- return 1;
- }
- (*eaten)+=i;
- dprintf("- processing '%s'\n",command);
- if (!strcmp("reduce",command)) {
- if (rrd_parse_CF(line,eaten,gdp,&gdp->cf_reduce)) return 1;
- if (line[*eaten] != '\0')
- (*eaten)--;
- } else if (!strcmp("step",command)) {
- i=0;
- sscanf(&line[*eaten],"%lu%n",&gdp->step,&i);
- gdp->step_orig = gdp->step;
- (*eaten)+=i;
- dprintf("- using step %lu\n",gdp->step);
- } else if (!strcmp("start",command)) {
- i=scan_for_col(&line[*eaten],255,tmpstr);
- (*eaten)+=i;
- if ((parsetime_error = parsetime(tmpstr, &start_tv))) {
- rrd_set_error( "start time: %s", parsetime_error );
- return 1;
- }
- dprintf("- done parsing: '%s'\n",&line[*eaten]);
- } else if (!strcmp("end",command)) {
- i=scan_for_col(&line[*eaten],255,tmpstr);
- (*eaten)+=i;
- if ((parsetime_error = parsetime(tmpstr, &end_tv))) {
- rrd_set_error( "end time: %s", parsetime_error );
- return 1;
- }
- dprintf("- done parsing: '%s'\n",&line[*eaten]);
- } else {
- rrd_set_error("Parse error in '%s'",line);
- return 1;
- }
- if (line[*eaten]=='\0') break;
- if (line[*eaten]!=':') {
- dprintf("- Expected to see end of string but got '%s'\n",\
- &line[*eaten]);
- rrd_set_error("Parse error in '%s'",line);
- return 1;
- }
- (*eaten)++;
- }
- if (proc_start_end(&start_tv,&end_tv,&start_tmp,&end_tmp) == -1){
- /* error string is set in parsetime.c */
- return 1;
- }
- if (start_tmp < 3600*24*365*10) {
- rrd_set_error("the first entry to fetch should be "
- "after 1980 (%ld)",start_tmp);
- return 1;
+ dprintf("- optional parameter follows: %s\n", &line[*eaten]);
+ i = 0;
+ sscanf(&line[*eaten], "%6[a-z]=%n", command, &i);
+ if (!i) {
+ rrd_set_error("Parse error in '%s'", line);
+ return 1;
+ }
+ (*eaten) += i;
+ dprintf("- processing '%s'\n", command);
+ if (!strcmp("reduce", command)) {
+ if (rrd_parse_CF(line, eaten, gdp, &gdp->cf_reduce))
+ return 1;
+ if (line[*eaten] != '\0')
+ (*eaten)--;
+ } else if (!strcmp("step", command)) {
+ i = 0;
+ sscanf(&line[*eaten], "%lu%n", &gdp->step, &i);
+ gdp->step_orig = gdp->step;
+ (*eaten) += i;
+ dprintf("- using step %lu\n", gdp->step);
+ } else if (!strcmp("start", command)) {
+ i = scan_for_col(&line[*eaten], 255, tmpstr);
+ (*eaten) += i;
+ if ((parsetime_error = parsetime(tmpstr, &start_tv))) {
+ rrd_set_error("start time: %s", parsetime_error);
+ return 1;
+ }
+ dprintf("- done parsing: '%s'\n", &line[*eaten]);
+ } else if (!strcmp("end", command)) {
+ i = scan_for_col(&line[*eaten], 255, tmpstr);
+ (*eaten) += i;
+ if ((parsetime_error = parsetime(tmpstr, &end_tv))) {
+ rrd_set_error("end time: %s", parsetime_error);
+ return 1;
+ }
+ dprintf("- done parsing: '%s'\n", &line[*eaten]);
+ } else {
+ rrd_set_error("Parse error in '%s'", line);
+ return 1;
+ }
+ if (line[*eaten] == '\0')
+ break;
+ if (line[*eaten] != ':') {
+ dprintf("- Expected to see end of string but got '%s'\n",
+ &line[*eaten]);
+ rrd_set_error("Parse error in '%s'", line);
+ return 1;
+ }
+ (*eaten)++;
+ }
+ if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+ /* error string is set in parsetime.c */
+ return 1;
+ }
+ if (start_tmp < 3600 * 24 * 365 * 10) {
+ rrd_set_error("the first entry to fetch should be "
+ "after 1980 (%ld)", start_tmp);
+ return 1;