fix indenting ... again

git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk/program@1093 a5681a0c-68f1-0310-ab6d-d61299d08faa

diff --git a/src/rrd_fetch.c b/src/rrd_fetch.c
index 618f3d3..422f59b 100644 (file)
--- a/src/rrd_fetch.c
+++ b/src/rrd_fetch.c
@@ -430,7 +430,7 @@ int rrd_fetch_fn(
                               POSIX_FADV_DONTNEED)) {
                 rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s",
                               filename, rrd_strerror(errno));
-                goto err_close;/*XXX: should use err_free_all_ds_namv */
+                goto err_close; /*XXX: should use err_free_all_ds_namv */
             }
 #endif
 
@@ -454,22 +454,22 @@ int rrd_fetch_fn(
                       POSIX_FADV_DONTNEED)) {
         rrd_set_error("setting POSIX_FADV_DONTNEED on '%s': %s", filename,
                       rrd_strerror(errno));
-        goto err_free; /*XXX: should use err_free_all_ds_namv */
+        goto err_free;  /*XXX: should use err_free_all_ds_namv */
     }
 #endif
     rrd_close(rrd_file);
     return (0);
-err_free_data:
+  err_free_data:
     free(*data);
     *data = NULL;
-err_free_all_ds_namv:
-    for (i = 0; (unsigned long)i < rrd.stat_head->ds_cnt; ++i)
+  err_free_all_ds_namv:
+    for (i = 0; (unsigned long) i < rrd.stat_head->ds_cnt; ++i)
         free((*ds_namv)[i]);
-err_free_ds_namv:
+  err_free_ds_namv:
     free(*ds_namv);
-err_close:
+  err_close:
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
     return (-1);
 }

diff --git a/src/rrd_first.c b/src/rrd_first.c
index bb86947..abba426 100644 (file)
--- a/src/rrd_first.c
+++ b/src/rrd_first.c
@@ -88,9 +88,9 @@ time_t rrd_first_r(
             rrd.live_head->last_up %
             (rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step)) +
         (timer * rrd.rra_def[rraindex].pdp_cnt * rrd.stat_head->pdp_step);
-err_close:
+  err_close:
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
     return (then);
 }

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 2aba6f9..191404e 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1575,7 +1575,8 @@ int leg_place(
         }
 
         if (im->extra_flags & FULL_SIZE_MODE)
-            leg_y = leg_y_prev = leg_y - (int) (im->text_prop[TEXT_PROP_LEGEND].size*1.8);
+            leg_y = leg_y_prev =
+                leg_y - (int) (im->text_prop[TEXT_PROP_LEGEND].size * 1.8);
 
         for (i = 0; i < im->gdes_c; i++) {
             fill_last = fill;
@@ -1702,14 +1703,14 @@ int leg_place(
                 if (im->extra_flags & FULL_SIZE_MODE) {
                     /* only add y space if there was text on the line */
                     if (leg_x > border || prt_fctn == 's')
-                       leg_y -= im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+                        leg_y -= im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
                     if (prt_fctn == 's')
-                       leg_y += im->text_prop[TEXT_PROP_LEGEND].size;
+                        leg_y += im->text_prop[TEXT_PROP_LEGEND].size;
                 } else {
                     if (leg_x > border || prt_fctn == 's')
-                       leg_y += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+                        leg_y += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
                     if (prt_fctn == 's')
-                       leg_y -= im->text_prop[TEXT_PROP_LEGEND].size;
+                        leg_y -= im->text_prop[TEXT_PROP_LEGEND].size;
                 }
                 fill = 0;
                 leg_c = 0;
@@ -1718,15 +1719,16 @@ int leg_place(
         }
 
         if (im->extra_flags & FULL_SIZE_MODE) {
-           if (leg_y != leg_y_prev) {
-              *gY = leg_y - im->text_prop[TEXT_PROP_LEGEND].size*1.8;
-              im->yorigin = leg_y - im->text_prop[TEXT_PROP_LEGEND].size*1.8;
-           }
+            if (leg_y != leg_y_prev) {
+                *gY = leg_y - im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+                im->yorigin =
+                    leg_y - im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+            }
         } else {
-           im->yimg = leg_y_prev;
-           /* if we did place some legends we have to add vertical space */
-           if (leg_y != im->yimg)
-              im->yimg += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
+            im->yimg = leg_y_prev;
+            /* if we did place some legends we have to add vertical space */
+            if (leg_y != im->yimg)
+                im->yimg += im->text_prop[TEXT_PROP_LEGEND].size * 1.8;
         }
         free(legspace);
     }
@@ -2625,52 +2627,52 @@ int graph_size_location(
      ** |                   watermark                    |
      ** +------------------------------------------------+
      */
-    
-    if (im->ylegend[0] != '\0' ) {
-         Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2;
+
+    if (im->ylegend[0] != '\0') {
+        Xvertical = im->text_prop[TEXT_PROP_UNIT].size * 2;
     }
 
     if (im->title[0] != '\0') {
-         /* The title is placed "inbetween" two text lines so it
+        /* The title is placed "inbetween" two text lines so it
          ** automatically has some vertical spacing.  The horizontal
          ** spacing is added here, on each side.
          */
-         /* if necessary, reduce the font size of the title until it fits the image width */
-         Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.6+10;
+        /* if necessary, reduce the font size of the title until it fits the image width */
+        Ytitle = im->text_prop[TEXT_PROP_TITLE].size * 2.6 + 10;
     }
 
     if (elements) {
-         if (im->draw_x_grid) {
-               Yxlabel=im->text_prop[TEXT_PROP_AXIS].size *2.5;
-         }
-         if (im->draw_y_grid || im->forceleftspace ) {
-               Xylabel=gfx_get_text_width(im->canvas, 0,
-                            im->text_prop[TEXT_PROP_AXIS].font,
-                            im->text_prop[TEXT_PROP_AXIS].size,
-                            im->tabwidth,
-                            "0", 0) * im->unitslength;
-         }
+        if (im->draw_x_grid) {
+            Yxlabel = im->text_prop[TEXT_PROP_AXIS].size * 2.5;
+        }
+        if (im->draw_y_grid || im->forceleftspace) {
+            Xylabel = gfx_get_text_width(im->canvas, 0,
+                                         im->text_prop[TEXT_PROP_AXIS].font,
+                                         im->text_prop[TEXT_PROP_AXIS].size,
+                                         im->tabwidth,
+                                         "0", 0) * im->unitslength;
+        }
     }
 
     if (im->extra_flags & FULL_SIZE_MODE) {
         /* The actual size of the image to draw has been determined by the user.
-        ** The graph area is the space remaining after accounting for the legend,
-        ** the watermark, the pie chart, the axis labels, and the title.
-        */
-        im->xorigin =0;
+         ** The graph area is the space remaining after accounting for the legend,
+         ** the watermark, the pie chart, the axis labels, and the title.
+         */
+        im->xorigin = 0;
         im->ximg = im->xsize;
         im->yimg = im->ysize;
         im->yorigin = im->ysize;
-        Xmain=im->ximg;
-        Ymain=im->yimg;
+        Xmain = im->ximg;
+        Ymain = im->yimg;
 
         im->yorigin += Ytitle;
 
 #ifdef WITH_PIECHART
         if (piechart) {
-            im->piesize=im->xsize<im->ysize?im->xsize:im->ysize;
-            Xpie=im->piesize;
-            Ypie=im->piesize;
+            im->piesize = im->xsize < im->ysize ? im->xsize : im->ysize;
+            Xpie = im->piesize;
+            Ypie = im->piesize;
         }
 #endif
 
@@ -2682,11 +2684,13 @@ int graph_size_location(
 
         /* Initial size calculation for the main graph area */
         Xmain = im->ximg - (Xylabel + 2 * Xspacing);
-        if (Xmain) Xmain -= Xspacing; /* put space between main graph area and right edge */
+        if (Xmain)
+            Xmain -= Xspacing;  /* put space between main graph area and right edge */
 
 #ifdef WITH_PIECHART
-        Xmain -= Xpie; /* remove pie width from main graph area */
-        if (Xpie) Xmain -= Xspacing; /* put space between pie and main graph area */
+        Xmain -= Xpie;  /* remove pie width from main graph area */
+        if (Xpie)
+            Xmain -= Xspacing;  /* put space between pie and main graph area */
 #endif
 
         im->xorigin = Xspacing + Xylabel;
@@ -2694,22 +2698,22 @@ int graph_size_location(
         /* the length of the title should not influence with width of the graph
            if (Xtitle > im->ximg) im->ximg = Xtitle; */
 
-        if (Xvertical) { /* unit description */
+        if (Xvertical) {    /* unit description */
             Xmain -= Xvertical;
             im->xorigin += Xvertical;
         }
         im->xsize = Xmain;
-        xtr(im,0);
+        xtr(im, 0);
 
         /* The vertical size of the image is known in advance.  The main graph area
-        ** (Ymain) and im->yorigin must be set according to the space requirements
-        ** of the legend and the axis labels.
-        */
+         ** (Ymain) and im->yorigin must be set according to the space requirements
+         ** of the legend and the axis labels.
+         */
 
         /* Determine where to place the legends onto the image.
-        ** Set Ymain and adjust im->yorigin to match the space requirements.
-        */
-        if (leg_place(im,&Ymain)==-1)
+         ** Set Ymain and adjust im->yorigin to match the space requirements.
+         */
+        if (leg_place(im, &Ymain) == -1)
             return -1;
 
 #ifdef WITH_PIECHART
@@ -2720,7 +2724,7 @@ int graph_size_location(
         if (Ytitle) {
             Ymain -= Ytitle;
         } else {
-            Ymain -= 1.5*Yspacing;
+            Ymain -= 1.5 * Yspacing;
         }
 
         /* watermark doesn't seem to effect the vertical size of the main graph area, oh well! */
@@ -2730,43 +2734,42 @@ int graph_size_location(
 
         im->ysize = Ymain;
 
-    } else /* dimension options -width and -height refer to the dimensions of the main graph area */
-    {
+    } else {            /* dimension options -width and -height refer to the dimensions of the main graph area */
+
         /* The actual size of the image to draw is determined from
-        ** several sources.  The size given on the command line is
-        ** the graph area but we need more as we have to draw labels
-        ** and other things outside the graph area.
-        */
+         ** several sources.  The size given on the command line is
+         ** the graph area but we need more as we have to draw labels
+         ** and other things outside the graph area.
+         */
 
-        if (im->ylegend[0] != '\0' ) {
-               Xvertical = im->text_prop[TEXT_PROP_UNIT].size *2;
+        if (im->ylegend[0] != '\0') {
+            Xvertical = im->text_prop[TEXT_PROP_UNIT].size * 2;
         }
 
 
         if (im->title[0] != '\0') {
             /* The title is placed "inbetween" two text lines so it
-            ** automatically has some vertical spacing.  The horizontal
-            ** spacing is added here, on each side.
-            */
+             ** automatically has some vertical spacing.  The horizontal
+             ** spacing is added here, on each side.
+             */
             /* don't care for the with of the title
-                    Xtitle = gfx_get_text_width(im->canvas, 0,
-                    im->text_prop[TEXT_PROP_TITLE].font,
-                    im->text_prop[TEXT_PROP_TITLE].size,
-                    im->tabwidth,
-                    im->title, 0) + 2*Xspacing; */
-            Ytitle = im->text_prop[TEXT_PROP_TITLE].size*2.6+10;
+               Xtitle = gfx_get_text_width(im->canvas, 0,
+               im->text_prop[TEXT_PROP_TITLE].font,
+               im->text_prop[TEXT_PROP_TITLE].size,
+               im->tabwidth,
+               im->title, 0) + 2*Xspacing; */
+            Ytitle = im->text_prop[TEXT_PROP_TITLE].size * 2.6 + 10;
         }
 
         if (elements) {
-            Xmain=im->xsize;
-            Ymain=im->ysize;
+            Xmain = im->xsize;
+            Ymain = im->ysize;
         }
-
 #ifdef WITH_PIECHART
         if (piechart) {
-            im->piesize=im->xsize<im->ysize?im->xsize:im->ysize;
-            Xpie=im->piesize;
-            Ypie=im->piesize;
+            im->piesize = im->xsize < im->ysize ? im->xsize : im->ysize;
+            Xpie = im->piesize;
+            Ypie = im->piesize;
         }
 #endif
 
@@ -2777,19 +2780,21 @@ int graph_size_location(
            pie chart area. */
 
         /* The legend width cannot yet be determined, as a result we
-        ** have problems adjusting the image to it.  For now, we just
-        ** forget about it at all; the legend will have to fit in the
-        ** size already allocated.
-        */
+         ** have problems adjusting the image to it.  For now, we just
+         ** forget about it at all; the legend will have to fit in the
+         ** size already allocated.
+         */
         im->ximg = Xylabel + Xmain + 2 * Xspacing;
 
 #ifdef WITH_PIECHART
-        im->ximg  += Xpie;
+        im->ximg += Xpie;
 #endif
 
-        if (Xmain) im->ximg += Xspacing;
+        if (Xmain)
+            im->ximg += Xspacing;
 #ifdef WITH_PIECHART
-        if (Xpie) im->ximg += Xspacing;
+        if (Xpie)
+            im->ximg += Xspacing;
 #endif
 
         im->xorigin = Xspacing + Xylabel;
@@ -2797,28 +2802,29 @@ int graph_size_location(
         /* the length of the title should not influence with width of the graph
            if (Xtitle > im->ximg) im->ximg = Xtitle; */
 
-        if (Xvertical) { /* unit description */
+        if (Xvertical) {    /* unit description */
             im->ximg += Xvertical;
             im->xorigin += Xvertical;
         }
-        xtr(im,0);
+        xtr(im, 0);
 
         /* The vertical size is interesting... we need to compare
-        ** the sum of {Ytitle, Ymain, Yxlabel, Ylegend, Ywatermark} with 
-        ** Yvertical however we need to know {Ytitle+Ymain+Yxlabel}
-        ** in order to start even thinking about Ylegend or Ywatermark.
-        **
-        ** Do it in three portions: First calculate the inner part,
-        ** then do the legend, then adjust the total height of the img,
-        ** adding space for a watermark if one exists;
-        */
+         ** the sum of {Ytitle, Ymain, Yxlabel, Ylegend, Ywatermark} with 
+         ** Yvertical however we need to know {Ytitle+Ymain+Yxlabel}
+         ** in order to start even thinking about Ylegend or Ywatermark.
+         **
+         ** Do it in three portions: First calculate the inner part,
+         ** then do the legend, then adjust the total height of the img,
+         ** adding space for a watermark if one exists;
+         */
 
         /* reserve space for main and/or pie */
 
         im->yimg = Ymain + Yxlabel;
-    
+
 #ifdef WITH_PIECHART
-        if (im->yimg < Ypie) im->yimg = Ypie;
+        if (im->yimg < Ypie)
+            im->yimg = Ypie;
 #endif
 
         im->yorigin = im->yimg - Yxlabel;
@@ -2828,18 +2834,18 @@ int graph_size_location(
             im->yimg += Ytitle;
             im->yorigin += Ytitle;
         } else {
-            im->yimg += 1.5*Yspacing;
-            im->yorigin += 1.5*Yspacing;
+            im->yimg += 1.5 * Yspacing;
+            im->yorigin += 1.5 * Yspacing;
         }
         /* reserve space for padding below the graph */
         im->yimg += Yspacing;
-     
+
         /* Determine where to place the legends onto the image.
-        ** Adjust im->yimg to match the space requirements.
-        */
-        if(leg_place(im,0)==-1)
+         ** Adjust im->yimg to match the space requirements.
+         */
+        if (leg_place(im, 0) == -1)
             return -1;
-        
+
         if (im->watermark[0] != '\0') {
             im->yimg += Ywatermark;
         }
@@ -2854,19 +2860,19 @@ int graph_size_location(
 
 #ifdef WITH_PIECHART
     /* The pie is placed in the upper right hand corner,
-    ** just below the title (if any) and with sufficient
-    ** padding.
-    */
+     ** just below the title (if any) and with sufficient
+     ** padding.
+     */
     if (elements) {
-        im->pie_x = im->ximg - Xspacing - Xpie/2;
-        im->pie_y = im->yorigin-Ymain+Ypie/2;
+        im->pie_x = im->ximg - Xspacing - Xpie / 2;
+        im->pie_y = im->yorigin - Ymain + Ypie / 2;
     } else {
-        im->pie_x = im->ximg/2;
-        im->pie_y = im->yorigin-Ypie/2;
+        im->pie_x = im->ximg / 2;
+        im->pie_y = im->yorigin - Ypie / 2;
     }
 #endif
 
-    ytr(im,DNAN);
+    ytr(im, DNAN);
     return 0;
 }
 
@@ -3607,7 +3613,7 @@ void rrd_graph_options(
             {"vertical-label", required_argument, 0, 'v'},
             {"width", required_argument, 0, 'w'},
             {"height", required_argument, 0, 'h'},
-            {"full-size-mode",  no_argument, 0, 'D'},
+            {"full-size-mode", no_argument, 0, 'D'},
             {"interlaced", no_argument, 0, 'i'},
             {"upper-limit", required_argument, 0, 'u'},
             {"lower-limit", required_argument, 0, 'l'},

diff --git a/src/rrd_graph.h b/src/rrd_graph.h
index 8d5dc35..2c9309b 100644 (file)
--- a/src/rrd_graph.h
+++ b/src/rrd_graph.h
@@ -20,7 +20,7 @@
 #define FORCE_UNITS 0x100   /* mask for all FORCE_UNITS_* flags */
 #define FORCE_UNITS_SI 0x100    /* force use of SI units in Y axis (no effect in linear graph, SI instead of E in log graph) */
 
-#define FULL_SIZE_MODE     0x200   /* -width and -height indicate the total size of the image */
+#define FULL_SIZE_MODE     0x200    /* -width and -height indicate the total size of the image */
 
 enum tmt_en { TMT_SECOND = 0, TMT_MINUTE, TMT_HOUR, TMT_DAY,
     TMT_WEEK, TMT_MONTH, TMT_YEAR
@@ -279,7 +279,7 @@ int       print_calc(
     char ***);
 int       leg_place(
     image_desc_t *,
-    int*);
+    int *);
 int       calc_horizontal_grid(
     image_desc_t *);
 int       draw_horizontal_grid(

diff --git a/src/rrd_info.c b/src/rrd_info.c
index e5d195f..fe65aca 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -306,7 +306,7 @@ info_t   *rrd_info_r(
     }
 
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
     return (data);
 }

diff --git a/src/rrd_lastupdate.c b/src/rrd_lastupdate.c
index 046a173..76db4ce 100644 (file)
--- a/src/rrd_lastupdate.c
+++ b/src/rrd_lastupdate.c
@@ -54,12 +54,12 @@ int rrd_lastupdate(
     rrd_close(rrd_file);
     return (0);
 
-err_free_ds_namv:
+  err_free_ds_namv:
     free(*ds_namv);
-err_close:
+  err_close:
     rrd_close(rrd_file);
-err_free:
+  err_free:
     rrd_free(&rrd);
-err_out:
+  err_out:
     return (-1);
 }

diff --git a/src/rrd_open.c b/src/rrd_open.c
index e182091..238c052 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -457,7 +457,8 @@ off_t rrd_seek(
 
 /* Get current position in rrd_file.  */
 
-inline off_t rrd_tell(rrd_file_t *rrd_file)
+inline off_t rrd_tell(
+    rrd_file_t *rrd_file)
 {
     return rrd_file->pos;
 }
@@ -536,7 +537,9 @@ void rrd_init(
 
 #ifdef HAVE_MMAP
 inline void rrd_free(
-    rrd_t UNUSED(*rrd)) {}
+    rrd_t UNUSED(*rrd))
+{
+}
 #else
 void rrd_free(
     rrd_t *rrd)

diff --git a/src/rrd_resize.c b/src/rrd_resize.c
index 09927df..52c208b 100644 (file)
--- a/src/rrd_resize.c
+++ b/src/rrd_resize.c
@@ -86,7 +86,7 @@ int rrd_resize(
     if (rrd_out_file == NULL) {
         rrd_set_error("Can't create '%s': %s", outfilename,
                       rrd_strerror(errno));
-       rrd_free(&rrdnew);
+        rrd_free(&rrdnew);
         return (-1);
     }
     if (LockRRD(rrd_out_file->fd) != 0) {