X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_last.c;h=90bcae7afc608997f5a1709f3ee066ae7fe2356e;hb=454dc9735d59ddbbfd1a658541683017e71c294a;hp=7fb3cb884344f8c76119d9b7b7c860b092afbcc2;hpb=e5b05bec82bbff5db8add4e58dd6f0fcf2670291;p=rrdtool.git diff --git a/src/rrd_last.c b/src/rrd_last.c index 7fb3cb8..90bcae7 100644 --- a/src/rrd_last.c +++ b/src/rrd_last.c @@ -14,9 +14,7 @@ time_t rrd_last( char **argv) { char *opt_daemon = NULL; - int status; time_t lastupdate; - int flushfirst = 1; optind = 0; opterr = 0; /* initialize getopt */ @@ -26,11 +24,10 @@ time_t rrd_last( int option_index = 0; static struct option long_options[] = { {"daemon", required_argument, 0, 'd'}, - {"noflush", no_argument, 0, 'F'}, {0, 0, 0, 0} }; - opt = getopt_long(argc, argv, "d:F", long_options, &option_index); + opt = getopt_long(argc, argv, "d:", long_options, &option_index); if (opt == EOF) break; @@ -47,12 +44,8 @@ time_t rrd_last( } break; - case 'F': - flushfirst = 0; - break; - default: - rrd_set_error ("Usage: rrdtool %s [--daemon [--noflush]] ", + rrd_set_error ("Usage: rrdtool %s [--daemon ] ", argv[0]); return (-1); break; @@ -60,16 +53,11 @@ time_t rrd_last( } /* while (42) */ if ((argc - optind) != 1) { - rrd_set_error ("Usage: rrdtool %s [--daemon [--noflush]] ", + rrd_set_error ("Usage: rrdtool %s [--daemon ] ", argv[0]); return (-1); } - if(flushfirst) { - status = rrdc_flush_if_daemon(opt_daemon, argv[optind]); - if (status) return (-1); - } - rrdc_connect (opt_daemon); if (rrdc_is_connected (opt_daemon)) lastupdate = rrdc_last (argv[optind]); @@ -77,6 +65,7 @@ time_t rrd_last( else lastupdate = rrd_last_r(argv[optind]); + if (opt_daemon) free(opt_daemon); return (lastupdate); }