projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inline functions are not supported in c99 ... lets remove this.
[rrdtool.git]
/
src
/
rrd_xport.c
diff --git
a/src/rrd_xport.c
b/src/rrd_xport.c
index
a0bae22
..
0be4615
100644
(file)
--- a/
src/rrd_xport.c
+++ b/
src/rrd_xport.c
@@
-1,5
+1,5
@@
/****************************************************************************
/****************************************************************************
- * RRDtool 1.
2.99907080300 Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.
3.1 Copyright by Tobi Oetiker, 1997-2008
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
****************************************************************************
* rrd_xport.c export RRD data
****************************************************************************/
@@
-56,7
+56,7
@@
int rrd_xport(
image_desc_t im;
time_t start_tmp = 0, end_tmp = 0;
image_desc_t im;
time_t start_tmp = 0, end_tmp = 0;
-
struct rrd_time_value
start_tv, end_tv;
+
rrd_time_value_t
start_tv, end_tv;
char *parsetime_error = NULL;
struct option long_options[] = {
{"start", required_argument, 0, 's'},
char *parsetime_error = NULL;
struct option long_options[] = {
{"start", required_argument, 0, 's'},
@@
-72,8
+72,8
@@
int rrd_xport(
rrd_graph_init(&im);
rrd_graph_init(&im);
- parsetime("end-24h", &start_tv);
- parsetime("now", &end_tv);
+
rrd_
parsetime("end-24h", &start_tv);
+
rrd_
parsetime("now", &end_tv);
while (1) {
int option_index = 0;
while (1) {
int option_index = 0;
@@
-91,13
+91,13
@@
int rrd_xport(
case 262:
break;
case 's':
case 262:
break;
case 's':
- if ((parsetime_error = parsetime(optarg, &start_tv))) {
+ if ((parsetime_error =
rrd_
parsetime(optarg, &start_tv))) {
rrd_set_error("start time: %s", parsetime_error);
return -1;
}
break;
case 'e':
rrd_set_error("start time: %s", parsetime_error);
return -1;
}
break;
case 'e':
- if ((parsetime_error = parsetime(optarg, &end_tv))) {
+ if ((parsetime_error =
rrd_
parsetime(optarg, &end_tv))) {
rrd_set_error("end time: %s", parsetime_error);
return -1;
}
rrd_set_error("end time: %s", parsetime_error);
return -1;
}
@@
-115,7
+115,7
@@
int rrd_xport(
}
}
}
}
- if (proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
+ if (
rrd_
proc_start_end(&start_tv, &end_tv, &start_tmp, &end_tmp) == -1) {
return -1;
}
return -1;
}
@@
-177,7
+177,7
@@
int rrd_xport_fn(
unsigned long nof_xports = 0;
unsigned long xport_counter = 0;
unsigned long nof_xports = 0;
unsigned long xport_counter = 0;
- int *ref_list;
+ int
*ref_list;
rrd_value_t **srcptr_list;
char **legend_list;
int ii = 0;
rrd_value_t **srcptr_list;
char **legend_list;
int ii = 0;