From ad6f3441d407ca0c82b86b481f697ca913844d54 Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 18 Jun 2007 18:25:35 +0000 Subject: [PATCH] fix indentation git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1134 a5681a0c-68f1-0310-ab6d-d61299d08faa --- src/rrd_cgi.c | 6 ++-- src/rrd_graph.c | 92 +++++++++++++++++++++++++------------------------ src/rrd_tune.c | 36 +++++++++---------- src/rrd_xport.c | 16 ++++----- 4 files changed, 77 insertions(+), 73 deletions(-) diff --git a/src/rrd_cgi.c b/src/rrd_cgi.c index 846397f..0bb326f 100644 --- a/src/rrd_cgi.c +++ b/src/rrd_cgi.c @@ -220,7 +220,8 @@ static vardata *varheap = NULL; static size_t varheap_size = 0; /* allocate and initialize variable heap */ -static int initvar(void) +static int initvar( + void) { varheap = (vardata *) malloc(sizeof(vardata) * INIT_VARSTORE_SIZE); if (varheap == NULL) { @@ -233,7 +234,8 @@ static int initvar(void) } /* cleanup: free allocated memory */ -static void donevar(void) +static void donevar( + void) { int i; diff --git a/src/rrd_graph.c b/src/rrd_graph.c index 7fbe865..f7ea572 100644 --- a/src/rrd_graph.c +++ b/src/rrd_graph.c @@ -3721,53 +3721,54 @@ void rrd_graph_options( long long_tmp; struct rrd_time_value start_tv, end_tv; long unsigned int color; + /* defines for long options without a short equivalent. should be bytes, and may not collide with (the ASCII value of) short options */ #define LONGOPT_UNITS_SI 255 - struct option long_options[] = { - {"start", required_argument, 0, 's'}, - {"end", required_argument, 0, 'e'}, - {"x-grid", required_argument, 0, 'x'}, - {"y-grid", required_argument, 0, 'y'}, - {"vertical-label", required_argument, 0, 'v'}, - {"width", required_argument, 0, 'w'}, - {"height", required_argument, 0, 'h'}, - {"full-size-mode", no_argument, 0, 'D'}, - {"interlaced", no_argument, 0, 'i'}, - {"upper-limit", required_argument, 0, 'u'}, - {"lower-limit", required_argument, 0, 'l'}, - {"rigid", no_argument, 0, 'r'}, - {"base", required_argument, 0, 'b'}, - {"logarithmic", no_argument, 0, 'o'}, - {"color", required_argument, 0, 'c'}, - {"font", required_argument, 0, 'n'}, - {"title", required_argument, 0, 't'}, - {"imginfo", required_argument, 0, 'f'}, - {"imgformat", required_argument, 0, 'a'}, - {"lazy", no_argument, 0, 'z'}, - {"zoom", required_argument, 0, 'm'}, - {"no-legend", no_argument, 0, 'g'}, - {"force-rules-legend", no_argument, 0, 'F'}, - {"only-graph", no_argument, 0, 'j'}, - {"alt-y-grid", no_argument, 0, 'Y'}, - {"no-minor", no_argument, 0, 'I'}, - {"slope-mode", no_argument, 0, 'E'}, - {"alt-autoscale", no_argument, 0, 'A'}, - {"alt-autoscale-min", no_argument, 0, 'J'}, - {"alt-autoscale-max", no_argument, 0, 'M'}, - {"no-gridfit", no_argument, 0, 'N'}, - {"units-exponent", required_argument, 0, 'X'}, - {"units-length", required_argument, 0, 'L'}, - {"units", required_argument, 0, LONGOPT_UNITS_SI}, - {"step", required_argument, 0, 'S'}, - {"tabwidth", required_argument, 0, 'T'}, - {"font-render-mode", required_argument, 0, 'R'}, - {"graph-render-mode", required_argument, 0, 'G'}, - {"font-smoothing-threshold", required_argument, 0, 'B'}, - {"watermark", required_argument, 0, 'W'}, - {"alt-y-mrtg", no_argument, 0, 1000}, /* this has no effect it is just here to save old apps from crashing when they use it */ - {0, 0, 0, 0} - }; + struct option long_options[] = { + {"start", required_argument, 0, 's'}, + {"end", required_argument, 0, 'e'}, + {"x-grid", required_argument, 0, 'x'}, + {"y-grid", required_argument, 0, 'y'}, + {"vertical-label", required_argument, 0, 'v'}, + {"width", required_argument, 0, 'w'}, + {"height", required_argument, 0, 'h'}, + {"full-size-mode", no_argument, 0, 'D'}, + {"interlaced", no_argument, 0, 'i'}, + {"upper-limit", required_argument, 0, 'u'}, + {"lower-limit", required_argument, 0, 'l'}, + {"rigid", no_argument, 0, 'r'}, + {"base", required_argument, 0, 'b'}, + {"logarithmic", no_argument, 0, 'o'}, + {"color", required_argument, 0, 'c'}, + {"font", required_argument, 0, 'n'}, + {"title", required_argument, 0, 't'}, + {"imginfo", required_argument, 0, 'f'}, + {"imgformat", required_argument, 0, 'a'}, + {"lazy", no_argument, 0, 'z'}, + {"zoom", required_argument, 0, 'm'}, + {"no-legend", no_argument, 0, 'g'}, + {"force-rules-legend", no_argument, 0, 'F'}, + {"only-graph", no_argument, 0, 'j'}, + {"alt-y-grid", no_argument, 0, 'Y'}, + {"no-minor", no_argument, 0, 'I'}, + {"slope-mode", no_argument, 0, 'E'}, + {"alt-autoscale", no_argument, 0, 'A'}, + {"alt-autoscale-min", no_argument, 0, 'J'}, + {"alt-autoscale-max", no_argument, 0, 'M'}, + {"no-gridfit", no_argument, 0, 'N'}, + {"units-exponent", required_argument, 0, 'X'}, + {"units-length", required_argument, 0, 'L'}, + {"units", required_argument, 0, LONGOPT_UNITS_SI}, + {"step", required_argument, 0, 'S'}, + {"tabwidth", required_argument, 0, 'T'}, + {"font-render-mode", required_argument, 0, 'R'}, + {"graph-render-mode", required_argument, 0, 'G'}, + {"font-smoothing-threshold", required_argument, 0, 'B'}, + {"watermark", required_argument, 0, 'W'}, + {"alt-y-mrtg", no_argument, 0, 1000}, /* this has no effect it is just here to save old apps from crashing when they use it */ + {0, 0, 0, 0} + }; optind = 0; opterr = 0; /* initialize getopt */ @@ -4527,7 +4528,8 @@ int vdef_calc( /* NaN < -INF < finite_values < INF */ int vdef_percent_compar( - const void *a, const void *b) + const void *a, + const void *b) { /* Equality is not returned; this doesn't hurt except * (maybe) for a little performance. diff --git a/src/rrd_tune.c b/src/rrd_tune.c index 714e7d4..f675c8b 100644 --- a/src/rrd_tune.c +++ b/src/rrd_tune.c @@ -72,24 +72,24 @@ int rrd_tune( double max; char dst[DST_SIZE]; rrd_file_t *rrd_file; - struct option long_options[] = { - {"heartbeat", required_argument, 0, 'h'}, - {"minimum", required_argument, 0, 'i'}, - {"maximum", required_argument, 0, 'a'}, - {"data-source-type", required_argument, 0, 'd'}, - {"data-source-rename", required_argument, 0, 'r'}, - /* added parameter tuning options for aberrant behavior detection */ - {"deltapos", required_argument, 0, 'p'}, - {"deltaneg", required_argument, 0, 'n'}, - {"window-length", required_argument, 0, 'w'}, - {"failure-threshold", required_argument, 0, 'f'}, - {"alpha", required_argument, 0, 'x'}, - {"beta", required_argument, 0, 'y'}, - {"gamma", required_argument, 0, 'z'}, - {"gamma-deviation", required_argument, 0, 'v'}, - {"aberrant-reset", required_argument, 0, 'b'}, - {0, 0, 0, 0} - }; + struct option long_options[] = { + {"heartbeat", required_argument, 0, 'h'}, + {"minimum", required_argument, 0, 'i'}, + {"maximum", required_argument, 0, 'a'}, + {"data-source-type", required_argument, 0, 'd'}, + {"data-source-rename", required_argument, 0, 'r'}, + /* added parameter tuning options for aberrant behavior detection */ + {"deltapos", required_argument, 0, 'p'}, + {"deltaneg", required_argument, 0, 'n'}, + {"window-length", required_argument, 0, 'w'}, + {"failure-threshold", required_argument, 0, 'f'}, + {"alpha", required_argument, 0, 'x'}, + {"beta", required_argument, 0, 'y'}, + {"gamma", required_argument, 0, 'z'}, + {"gamma-deviation", required_argument, 0, 'v'}, + {"aberrant-reset", required_argument, 0, 'b'}, + {0, 0, 0, 0} + }; optind = 0; opterr = 0; /* initialize getopt */ diff --git a/src/rrd_xport.c b/src/rrd_xport.c index 21110b8..a063c87 100644 --- a/src/rrd_xport.c +++ b/src/rrd_xport.c @@ -58,14 +58,14 @@ int rrd_xport( time_t start_tmp = 0, end_tmp = 0; struct rrd_time_value start_tv, end_tv; char *parsetime_error = NULL; - struct option long_options[] = { - {"start", required_argument, 0, 's'}, - {"end", required_argument, 0, 'e'}, - {"maxrows", required_argument, 0, 'm'}, - {"step", required_argument, 0, 261}, - {"enumds", no_argument, 0, 262}, /* these are handled in the frontend ... */ - {0, 0, 0, 0} - }; + struct option long_options[] = { + {"start", required_argument, 0, 's'}, + {"end", required_argument, 0, 'e'}, + {"maxrows", required_argument, 0, 'm'}, + {"step", required_argument, 0, 261}, + {"enumds", no_argument, 0, 262}, /* these are handled in the frontend ... */ + {0, 0, 0, 0} + }; optind = 0; opterr = 0; /* initialize getopt */ -- 2.30.2