fix warning: "__STRICT_ANSI__" is not defined warning patch by Gilles Esp

[rrdtool.git] / src / rrd_graph.c

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 5081c8a..8935d4e 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -1426,6 +1426,8 @@ time_t find_first_time(
     struct tm tm;
 
     localtime_r(&start, &tm);
+    /* let mktime figure this dst on its own */
+    tm.tm_isdst = -1;
 
     switch (baseint) {
     case TMT_SECOND:
@@ -1494,6 +1496,8 @@ time_t find_next_time(
     time_t    madetime;
 
     localtime_r(&current, &tm);
+    /* let mktime figure this dst on its own */
+    tm.tm_isdst = -1;
 
     int limit = 2;
     switch (baseint) {
@@ -1718,6 +1722,9 @@ int print_calc(
                 ("STACK should already be turned into LINE or AREA here");
             return -1;
             break;
+        case GF_XAXIS:
+        case GF_YAXIS:
+           break;
         }
     }
     return graphelement;
@@ -3303,7 +3310,7 @@ int graph_paint(
     image_desc_t *im)
 {
     int       lazy = lazy_check(im);
-    int       i;      
+    int       cnt;      
 
     /* imgformat XML or higher dispatch to xport 
      * output format there is selected via graph_type 
@@ -3323,22 +3330,22 @@ int graph_paint(
      * if there are no graph elements (i==0) we stop here ...
      * if we are lazy, try to quit ...
      */
-    i = print_calc(im);
-    if (i < 0)
+    cnt = print_calc(im);
+    if (cnt < 0)
         return -1;
 
     /* if we want and can be lazy ... quit now */
-    if (i == 0)
+    if (cnt == 0)
         return 0;
 
     /* otherwise call graph_paint_timestring */
     switch (im->graph_type) {
     case GTYPE_TIME:
-      return graph_paint_timestring(im,lazy);
+      return graph_paint_timestring(im,lazy,cnt);
       break;
     case GTYPE_XY:
-      return graph_paint_xy(im,lazy);
-      break;
+      return graph_paint_xy(im,lazy,cnt);
+      break;      
     }
     /* final return with error*/
     rrd_set_error("Graph type %i is not implemented",im->graph_type);
@@ -3346,9 +3353,9 @@ int graph_paint(
 }
 
 int graph_paint_timestring(
-                          image_desc_t *im, int lazy)
+                          image_desc_t *im, int lazy, int cnt)
 {
-    int       i, ii;
+    int       i,ii;
     double    areazero = 0.0;
     graph_desc_t *lastgdes = NULL;
     rrd_infoval_t info;
@@ -3357,7 +3364,7 @@ int graph_paint_timestring(
  *** Calculating sizes and locations became a bit confusing ***
  *** so I moved this into a separate function.              ***
  **************************************************************/
-    if (graph_size_location(im, i) == -1)
+    if (graph_size_location(im, cnt) == -1)
         return -1;
 
     info.u_cnt = im->xorigin;
@@ -3427,6 +3434,8 @@ int graph_paint_timestring(
         case GF_VRULE:
         case GF_XPORT:
         case GF_SHIFT:
+        case GF_XAXIS:
+        case GF_YAXIS:
             break;
         case GF_TICK:
             for (ii = 0; ii < im->xsize; ii++) {
@@ -3921,8 +3930,10 @@ int graph_cairo_finish (image_desc_t *im)
 }
 
 int graph_paint_xy(
-                     image_desc_t *im, int lazy)
+                  image_desc_t *im, int lazy, int cnt)
 {
+  /* to stop compiler warnings for now */
+  lazy=cnt=(int)im->gdes_c;
   rrd_set_error("XY diagramm not implemented");  
   return -1;
 }
@@ -3943,6 +3954,8 @@ int gdes_alloc(
         return -1;
     }
 
+    /* set to zero */
+    memset(&(im->gdes[im->gdes_c - 1]),0,sizeof(graph_desc_t));
 
     im->gdes[im->gdes_c - 1].step = im->step;
     im->gdes[im->gdes_c - 1].step_orig = im->step;