X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_xport.c;h=8f13492ad457ccca5bc00875b68ba843fb15ccfc;hb=a57bc62667ff447309c0ed2d1a14aa387261bcfb;hp=063982ebcf11e2d998db3206802562732d5d4382;hpb=19f031713115921bebf5949ce63926d66dd8c6a5;p=rrdtool.git

diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index 063982e..8f13492 100644
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
@@ -58,7 +58,6 @@ int rrd_xport(
     time_t    start_tmp = 0, end_tmp = 0;
     rrd_time_value_t start_tv, end_tv;
     char     *parsetime_error = NULL;
-    char     *opt_daemon = NULL;
 
     struct option long_options[] = {
         {"start", required_argument, 0, 's'},
@@ -114,15 +113,15 @@ int rrd_xport(
             break;
         case 'd':
         {
-            if (opt_daemon != NULL)
+            if (im.daemon_addr != NULL)
             {
                 rrd_set_error ("You cannot specify --daemon "
                         "more than once.");
                 return (-1);
             }
 
-            opt_daemon = strdup(optarg);
-            if (opt_daemon == NULL)
+            im.daemon_addr = strdup(optarg);
+            if (im.daemon_addr == NULL)
             {
                 rrd_set_error("strdup error");
                 return -1;
@@ -169,8 +168,7 @@ int rrd_xport(
     }
 
     {   /* try to connect to rrdcached */
-        int status = rrdc_connect(opt_daemon);
-        if (opt_daemon) free(opt_daemon);
+        int status = rrdc_connect(im.daemon_addr);
         if (status != 0) return status;
     }
 
@@ -265,6 +263,7 @@ int rrd_xport_fn(
                 while (--j > -1)
                     free(legend_list[j]);
                 free(legend_list);
+                free(step_list);
                 rrd_set_error("malloc xport legend entry");
                 return (-1);
             }