projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow rrdtool for windows to properly support binary mode stdout/stdin -- Larry Adams
[rrdtool.git]
/
src
/
rrd_xport.c
diff --git
a/src/rrd_xport.c
b/src/rrd_xport.c
index
5d3f3eb
..
8f13492
100644
(file)
--- a/
src/rrd_xport.c
+++ b/
src/rrd_xport.c
@@
-1,5
+1,5
@@
/****************************************************************************
/****************************************************************************
- * RRDtool 1.
3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.
4.3 Copyright by Tobi Oetiker, 1997-2010
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
@@
-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;
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'},
struct option long_options[] = {
{"start", required_argument, 0, 's'},
@@
-114,15
+113,15
@@
int rrd_xport(
break;
case 'd':
{
break;
case 'd':
{
- if (
opt_daemon
!= NULL)
+ if (
im.daemon_addr
!= NULL)
{
rrd_set_error ("You cannot specify --daemon "
"more than once.");
return (-1);
}
{
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;
{
rrd_set_error("strdup error");
return -1;
@@
-169,8
+168,7
@@
int rrd_xport(
}
{ /* try to connect to rrdcached */
}
{ /* 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;
}
if (status != 0) return status;
}
@@
-265,6
+263,7
@@
int rrd_xport_fn(
while (--j > -1)
free(legend_list[j]);
free(legend_list);
while (--j > -1)
free(legend_list[j]);
free(legend_list);
+ free(step_list);
rrd_set_error("malloc xport legend entry");
return (-1);
}
rrd_set_error("malloc xport legend entry");
return (-1);
}
@@
-286,7
+285,7
@@
int rrd_xport_fn(
free(step_list);
*start = im->start - im->start % (*step);
free(step_list);
*start = im->start - im->start % (*step);
- *end = im->end - im->end % (*step);
+ *end = im->end - im->end % (*step)
+ (*step)
;
/* room for rearranged data */
/* room for rearranged data */