Merge branch 'master' into ff/rrdd

[rrdtool.git] / src / rrd_fetch.c

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 956c634..b555bf9 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.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_fetch.c  read date from an rrd to use for further processing
  *****************************************************************************
@@ -73,7 +73,7 @@ int rrd_fetch(
     long      step_tmp = 1;
     time_t    start_tmp = 0, end_tmp = 0;
     const char *cf;
-    char *daemon = NULL;
+    char *opt_daemon = NULL;
     int status;
 
     rrd_time_value_t start_tv, end_tv;
@@ -120,10 +120,10 @@ int rrd_fetch(
             break;
 
         case 'd':
-            if (daemon != NULL)
-                    free (daemon);
-            daemon = strdup (optarg);
-            if (daemon == NULL)
+            if (opt_daemon != NULL)
+                    free (opt_daemon);
+            opt_daemon = strdup (optarg);
+            if (opt_daemon == NULL)
             {
                 rrd_set_error ("strdup failed.");
                 return (-1);
@@ -167,15 +167,15 @@ int rrd_fetch(
         return -1;
     }
 
-    if (daemon == NULL)
+    if (opt_daemon == NULL)
     {
         char *temp;
 
         temp = getenv (ENV_RRDCACHED_ADDRESS);
         if (temp != NULL)
         {
-            daemon = strdup (temp);
-            if (daemon == NULL)
+            opt_daemon = strdup (temp);
+            if (opt_daemon == NULL)
             {
                 rrd_set_error("strdup failed.");
                 return (-1);
@@ -183,9 +183,9 @@ int rrd_fetch(
         }
     }
 
-    if (daemon != NULL)
+    if (opt_daemon != NULL)
     {
-        status = rrdc_connect (daemon);
+        status = rrdc_connect (opt_daemon);
         if (status != 0)
         {
             rrd_set_error ("rrdc_connect failed with status %i.", status);
@@ -201,7 +201,7 @@ int rrd_fetch(
         }
 
         rrdc_disconnect ();
-    } /* if (daemon) */
+    } /* if (opt_daemon) */
 
     cf = argv[optind + 1];