projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add note on variable names
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
b64a703
..
a5a4e00
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.2.
3
Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.
8
Copyright by Tobi Oetiker, 1997-2005
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@
-22,8
+22,8
@@
void PrintUsage(char *cmd)
{
char help_main[] =
{
char help_main[] =
- "RRDtool
1.2.3
Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
+ "RRDtool
" PACKAGE_VERSION "
Copyright 1997-2005 by Tobias Oetiker <tobi@oetiker.ch>\n"
+#if defined(
_
WIN32) && !defined(__CYGWIN__) && !defined(__CYGWIN32__)
" Compiled " __DATE__ " " __TIME__ "\n\n"
#else
" Compiled " MAKE_TIMESTAMP "\n\n"
" Compiled " __DATE__ " " __TIME__ "\n\n"
#else
" Compiled " MAKE_TIMESTAMP "\n\n"
@@
-81,7
+81,7
@@
void PrintUsage(char *cmd)
"\t\ttime|N:value[:value...]\n\n"
"\t\tat-time@value[:value...]\n\n"
"\t\t[ time:value[:value...] ..]\n\n";
"\t\ttime|N:value[:value...]\n\n"
"\t\tat-time@value[:value...]\n\n"
"\t\t[ time:value[:value...] ..]\n\n";
-
+
char help_fetch[] =
"* fetch - fetch data out of an RRD\n\n"
"\trrdtool fetch filename.rrd CF\n"
char help_fetch[] =
"* fetch - fetch data out of an RRD\n\n"
"\trrdtool fetch filename.rrd CF\n"
@@
-552,7
+552,8
@@
int HandleInputLine(int argc, char **argv, FILE* out)
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
strcmp("v", argv[1]) == 0 ||
strcmp("-v", argv[1]) == 0 ||
strcmp("-version", argv[1]) == 0 )
- printf("RRDtool 1.2.3 Copyright by Tobi Oetiker, 1997-2005\n");
+ printf("RRDtool " PACKAGE_VERSION " Copyright by Tobi Oetiker, 1997-2005 (%f)\n",
+ rrd_version());
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
else if (strcmp("restore", argv[1]) == 0)
rrd_restore(argc-1, &argv[1]);
else if (strcmp("resize", argv[1]) == 0)
@@
-586,12
+587,13
@@
int HandleInputLine(int argc, char **argv, FILE* out)
free (data);
}
} else if (strcmp("xport", argv[1]) == 0) {
free (data);
}
} else if (strcmp("xport", argv[1]) == 0) {
+ int xxsize;
unsigned long int j = 0;
time_t start,end, ti;
unsigned long step, col_cnt,row_cnt;
rrd_value_t *data,*ptr;
char **legend_v;
unsigned long int j = 0;
time_t start,end, ti;
unsigned long step, col_cnt,row_cnt;
rrd_value_t *data,*ptr;
char **legend_v;
- if(rrd_xport(argc-1, &argv[1], &start,&end,&step,&col_cnt,&legend_v,&data) != -1) {
+ if(rrd_xport(argc-1, &argv[1], &
xxsize,&
start,&end,&step,&col_cnt,&legend_v,&data) != -1) {
row_cnt = (end-start)/step;
ptr = data;
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);
row_cnt = (end-start)/step;
ptr = data;
printf("<?xml version=\"1.0\" encoding=\"%s\"?>\n\n", XML_ENCODING);