diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index 063982ebcf11e2d998db3206802562732d5d4382..7708be6e084baad327d3fc245068c42f234503c8 100644 (file)
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
/****************************************************************************
- * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
+ * RRDtool 1.4.8 Copyright by Tobi Oetiker, 1997-2013
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
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'},
{"maxrows", required_argument, 0, 'm'},
{"step", required_argument, 0, 261},
{"enumds", no_argument, 0, 262}, /* these are handled in the frontend ... */
+ {"json", no_argument, 0, 263}, /* these are handled in the frontend ... */
{"daemon", required_argument, 0, 'd'},
{0, 0, 0, 0}
};
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;
}
{ /* 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;
}
while (--j > -1)
free(legend_list[j]);
free(legend_list);
+ free(step_list);
rrd_set_error("malloc xport legend entry");
return (-1);
}