X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_tool.c;h=d860abec5c4aff5c480a3e337bbcfc1423eab523;hb=6a36cc27733ba7908809cfc43c2cdd0ce49178e0;hp=81c5a9c3f571b4429949c40500d0161c03a874c6;hpb=b03e4fb568740b5a5a48a11ae4e630a4e27d5989;p=rrdtool.git diff --git a/src/rrd_tool.c b/src/rrd_tool.c index 81c5a9c..d860abe 100644 --- 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 *****************************************************************************/ @@ -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" + "\t\t[--no-overwrite|-O]\n" "\t\t[DS:ds-name:DST:dst arguments]\n" "\t\t[RRA:CF:cf arguments]\n"); @@ -153,6 +154,7 @@ void PrintUsage( "\t\t[-B|--font-smoothing-threshold size]\n" "\t\t[-T|--tabwidth width]\n" "\t\t[-E|--slope-mode]\n" + "\t\t[-P|--pango-markup]\n" "\t\t[-N|--no-gridfit]\n" "\t\t[-X|--units-exponent value]\n" "\t\t[-L|--units-length value]\n" @@ -170,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[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" @@ -718,10 +721,10 @@ int HandleInputLine( XML_ENCODING); printf("<%s>\n", ROOT_TAG); printf(" <%s>\n", META_TAG); - printf(" <%s>%lu\n", META_START_TAG, - (unsigned long) start + step, META_START_TAG); + printf(" <%s>%lld\n", META_START_TAG, + (long long int) start + step, META_START_TAG); printf(" <%s>%lu\n", META_STEP_TAG, step, META_STEP_TAG); - printf(" <%s>%lu\n", META_END_TAG, (unsigned long) end, + printf(" <%s>%lld\n", META_END_TAG, (long long int) end, META_END_TAG); printf(" <%s>%lu\n", META_ROWS_TAG, row_cnt, META_ROWS_TAG); @@ -742,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>%lu", COL_TIME_TAG, ti, COL_TIME_TAG); + printf("<%s>%lld", COL_TIME_TAG, (long long int)ti, COL_TIME_TAG); for (j = 0; j < col_cnt; j++) { rrd_value_t newval = DNAN;