X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_dump.c;h=ea28245a63d6c497f5cf6a3b6518a83b3435c081;hb=210e991460e82d01d086f853e65485040eb2fffb;hp=093e7d24918d76f7c2a13190f9ad81e5c2f0c266;hpb=0f72e76832879a6acae1e2b42ce75b9447a98914;p=rrdtool.git diff --git a/src/rrd_dump.c b/src/rrd_dump.c index 093e7d2..ea28245 100644 --- a/src/rrd_dump.c +++ b/src/rrd_dump.c @@ -1,5 +1,5 @@ /***************************************************************************** - * RRDtool 1.3.0 Copyright by Tobi Oetiker, 1997-2008 + * RRDtool 1.3.1 Copyright by Tobi Oetiker, 1997-2008 ***************************************************************************** * rrd_dump Display a RRD ***************************************************************************** @@ -442,7 +442,7 @@ int rrd_dump( { int rc; int opt_noheader = 0; - char *rrdcached = NULL; + char *opt_daemon = NULL; /* init rrd clean */ @@ -465,10 +465,10 @@ int rrd_dump( switch (opt) { case 'd': - if (rrdcached != NULL) - free (rrdcached); - rrdcached = strdup (optarg); - if (rrdcached == NULL) + if (opt_daemon != NULL) + free (opt_daemon); + opt_daemon = strdup (optarg); + if (opt_daemon == NULL) { rrd_set_error ("strdup failed."); return (-1); @@ -493,15 +493,15 @@ int rrd_dump( return (-1); } - if (rrdcached == NULL) + if (opt_daemon == NULL) { char *temp; temp = getenv (ENV_RRDCACHED_ADDRESS); if (temp != NULL) { - rrdcached = strdup (temp); - if (rrdcached == NULL) + opt_daemon = strdup (temp); + if (opt_daemon == NULL) { rrd_set_error("strdup failed."); return (-1); @@ -509,11 +509,11 @@ int rrd_dump( } } - if (rrdcached != NULL) + if (opt_daemon != NULL) { int status; - status = rrdc_connect (rrdcached); + status = rrdc_connect (opt_daemon); if (status != 0) { rrd_set_error ("rrdc_connect failed with status %i.", status); @@ -529,7 +529,7 @@ int rrd_dump( } rrdc_disconnect (); - } /* if (rrdcached) */ + } /* if (opt_daemon) */ if ((argc - optind) == 2) { rc = rrd_dump_opt_r(argv[optind], argv[optind + 1], opt_noheader);