projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document restricted time parsing when using the daemon. -- Florian Forster
[rrdtool.git]
/
src
/
rrd_tool.c
diff --git
a/src/rrd_tool.c
b/src/rrd_tool.c
index
9e60847
..
d860abe
100644
(file)
--- a/
src/rrd_tool.c
+++ b/
src/rrd_tool.c
@@
-1,5
+1,5
@@
/*****************************************************************************
/*****************************************************************************
- * RRDtool 1.4.
2 Copyright by Tobi Oetiker, 1997-2009
+ * RRDtool 1.4.
3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
*****************************************************************************
* rrd_tool.c Startup wrapper
*****************************************************************************/
@@
-65,6
+65,7
@@
void PrintUsage(
N_("* create - create a new RRD\n\n"
"\trrdtool create filename [--start|-b start time]\n"
"\t\t[--step|-s step]\n"
N_("* create - create a new RRD\n\n"
"\trrdtool create filename [--start|-b start time]\n"
"\t\t[--step|-s step]\n"
+ "\t\t[--no-overwrite|-O]\n"
"\t\t[DS:ds-name:DST:dst arguments]\n"
"\t\t[RRA:CF:cf arguments]\n");
"\t\t[DS:ds-name:DST:dst arguments]\n"
"\t\t[RRA:CF:cf arguments]\n");
@@
-171,6
+172,7
@@
void PrintUsage(
"\t\t[PRINT:vdefname:format]\n"
"\t\t[GPRINT:vdefname:format]\n" "\t\t[COMMENT:text]\n"
"\t\t[SHIFT:vname:offset]\n"
"\t\t[PRINT:vdefname:format]\n"
"\t\t[GPRINT:vdefname:format]\n" "\t\t[COMMENT:text]\n"
"\t\t[SHIFT:vname:offset]\n"
+ "\t\t[TEXTALIGN:{left|right|justified|center}]\n"
"\t\t[TICK:vname#rrggbb[aa][:[fraction][:legend]]]\n"
"\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[TICK:vname#rrggbb[aa][:[fraction][:legend]]]\n"
"\t\t[HRULE:value#rrggbb[aa][:legend]]\n"
"\t\t[VRULE:value#rrggbb[aa][:legend]]\n"
@@
-719,10
+721,10
@@
int HandleInputLine(
XML_ENCODING);
printf("<%s>\n", ROOT_TAG);
printf(" <%s>\n", META_TAG);
XML_ENCODING);
printf("<%s>\n", ROOT_TAG);
printf(" <%s>\n", META_TAG);
- printf(" <%s>%l
u
</%s>\n", META_START_TAG,
- (
unsigned long
) start + step, META_START_TAG);
+ printf(" <%s>%l
ld
</%s>\n", META_START_TAG,
+ (
long long int
) start + step, META_START_TAG);
printf(" <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
printf(" <%s>%lu</%s>\n", META_STEP_TAG, step, META_STEP_TAG);
- printf(" <%s>%l
u</%s>\n", META_END_TAG, (unsigned long
) end,
+ printf(" <%s>%l
ld</%s>\n", META_END_TAG, (long long int
) end,
META_END_TAG);
printf(" <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt,
META_ROWS_TAG);
META_END_TAG);
printf(" <%s>%lu</%s>\n", META_ROWS_TAG, row_cnt,
META_ROWS_TAG);
@@
-743,7
+745,7
@@
int HandleInputLine(
printf(" <%s>\n", DATA_TAG);
for (ti = start + step; ti <= end; ti += step) {
printf(" <%s>", DATA_ROW_TAG);
printf(" <%s>\n", DATA_TAG);
for (ti = start + step; ti <= end; ti += step) {
printf(" <%s>", DATA_ROW_TAG);
- printf("<%s>%l
u</%s>", COL_TIME_TAG,
ti, COL_TIME_TAG);
+ printf("<%s>%l
ld</%s>", COL_TIME_TAG, (long long int)
ti, COL_TIME_TAG);
for (j = 0; j < col_cnt; j++) {
rrd_value_t newval = DNAN;
for (j = 0; j < col_cnt; j++) {
rrd_value_t newval = DNAN;