X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Frrd_xport.c;h=0dc5e671265bfb9fc59e8bd3967cf7f2d02e8ba9;hb=8d278938aef5adefa2915dd446abc028cc764550;hp=a439b4a514b66998881c7206b0d694b54018c672;hpb=a4c8bc0c3fe53c713819358f506aa5d24bae5754;p=rrdtool.git diff --git a/src/rrd_xport.c b/src/rrd_xport.c index a439b4a..0dc5e67 100644 --- a/src/rrd_xport.c +++ b/src/rrd_xport.c @@ -1,5 +1,5 @@ /**************************************************************************** - * RRDtool 1.3rc4 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3rc7 Copyright by Tobi Oetiker, 1997-2008 **************************************************************************** * rrd_xport.c export RRD data ****************************************************************************/ @@ -56,7 +56,7 @@ int rrd_xport( image_desc_t im; time_t start_tmp = 0, end_tmp = 0; - struct rrd_time_value start_tv, end_tv; + rrd_time_value_t start_tv, end_tv; char *parsetime_error = NULL; struct option long_options[] = { {"start", required_argument, 0, 's'}, @@ -72,8 +72,8 @@ int rrd_xport( rrd_graph_init(&im); - 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; @@ -91,13 +91,13 @@ int rrd_xport( case 262: break; 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; } @@ -115,7 +115,7 @@ int rrd_xport( } } - 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; }