X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_fetch.c;h=baa0cf3a8b33705565199252028f952508112b81;hb=d38f649c3e9f0dbfbd80a86eb94ef7970e4a376c;hp=1317483b110adf49478d71b509b6b1c446ef4440;hpb=daf8e7ff715a59e1f9827080d1b785ffb3c5a4b1;p=rrdtool.git diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c index 1317483..baa0cf3 100644 --- a/src/rrd_fetch.c +++ b/src/rrd_fetch.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3rc7 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_fetch.c read date from an rrd to use for further processing ***************************************************************************** @@ -73,7 +73,7 @@ int rrd_fetch( time_t start_tmp = 0, end_tmp = 0; const char *cf; - struct rrd_time_value start_tv, end_tv; + rrd_time_value_t start_tv, end_tv; char *parsetime_error = NULL; struct option long_options[] = { {"resolution", required_argument, 0, 'r'}, @@ -86,8 +86,8 @@ int rrd_fetch( opterr = 0; /* initialize getopt */ /* init start and end time */ - parsetime("end-24h", &start_tv); - parsetime("now", &end_tv); + rrd_parsetime("end-24h", &start_tv); + rrd_parsetime("now", &end_tv); while (1) { int option_index = 0; @@ -100,13 +100,13 @@ int rrd_fetch( switch (opt) { case 's': - if ((parsetime_error = parsetime(optarg, &start_tv))) { + if ((parsetime_error = rrd_parsetime(optarg, &start_tv))) { rrd_set_error("start time: %s", parsetime_error); return -1; } break; case 'e': - if ((parsetime_error = parsetime(optarg, &end_tv))) { + if ((parsetime_error = rrd_parsetime(optarg, &end_tv))) { rrd_set_error("end time: %s", parsetime_error); return -1; } @@ -121,7 +121,7 @@ int rrd_fetch( } - if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) { + if (rrd_proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) { return -1; }