X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_graph.c;h=715f0dc76e160f97645f404d4739fd689e82f452;hb=c20f3bfc89a81e291b6374b6f414a1a4cac0a2e6;hp=5060733a876041dfdab7fa592410eabdb89e1d52;hpb=577c5c94d26c8193ea45f7d622276c7ceb39d66e;p=rrdtool.git

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 5060733..715f0dc 100644
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -677,9 +677,9 @@ for (col=0;col<row_cnt;col++) {
    relevant rrds ... */
 
 int
-data_fetch( image_desc_t *im )
+data_fetch(image_desc_t *im )
 {
-    int		i,ii;
+    unsigned int i,ii;
     int		skip;
 
     /* pull the data from the log files ... */
@@ -1096,7 +1096,7 @@ find_first_time(
     )
 {
     struct tm tm;
-    tm = *localtime(&start);
+    localtime_r(&start, &tm);
     switch(baseint){
     case TMT_SECOND:
 	tm.tm_sec -= tm.tm_sec % basestep; break;
@@ -1149,7 +1149,7 @@ find_next_time(
 {
     struct tm tm;
     time_t madetime;
-    tm = *localtime(&current);
+    localtime_r(&current, &tm);
     do {
 	switch(baseint){
 	case TMT_SECOND:
@@ -1254,14 +1254,15 @@ print_calc(image_desc_t *im, char ***prdata)
 	    } /* prepare printval */
 
 	    if (!strcmp(im->gdes[i].format,"%c")) { /* VDEF time print */
+		char ctime_buf[128]; /* PS: for ctime_r, must be >= 26 chars */
 		if (im->gdes[i].gf == GF_PRINT){
 		    (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
 		    sprintf((*prdata)[prlines-2],"%s (%lu)",
-					ctime(&printtime),printtime);
+					ctime_r(&printtime,ctime_buf),printtime);
 		    (*prdata)[prlines-1] = NULL;
 		} else {
 		    sprintf(im->gdes[i].legend,"%s (%lu)",
-					ctime(&printtime),printtime);
+					ctime_r(&printtime,ctime_buf),printtime);
 		    graphelement = 1;
 		}
 	    } else {
@@ -1357,6 +1358,16 @@ leg_place(image_desc_t *im)
 
     for(i=0;i<im->gdes_c;i++){
 	fill_last = fill;
+        
+        /* hid legends for rules which are not displayed */
+        
+	if (im->gdes[i].gf == GF_HRULE &&
+	    (im->gdes[i].yrule < im->minval || im->gdes[i].yrule > im->maxval))
+	    im->gdes[i].legend[0] = '\0';
+
+	if (im->gdes[i].gf == GF_VRULE &&
+	    (im->gdes[i].xrule < im->start || im->gdes[i].xrule > im->end))
+	    im->gdes[i].legend[0] = '\0';
 
 	leg_cc = strlen(im->gdes[i].legend);
 	
@@ -1694,7 +1705,7 @@ vertical_grid(
     long factor;
     char graph_label[100];
     double X0,Y0,Y1; /* points for filled graph and more*/
-   
+    struct tm tm;
 
     /* the type of time grid is determined by finding
        the number of seconds per pixel in the graph */
@@ -1774,7 +1785,8 @@ vertical_grid(
 	if (ti < im->start || ti > im->end) continue;
 
 #if HAVE_STRFTIME
-	strftime(graph_label,99,im->xlab_user.stst,localtime(&tilab));
+	localtime_r(&tilab, &tm);
+	strftime(graph_label,99,im->xlab_user.stst, &tm);
 #else
 # error "your libc has no strftime I guess we'll abort the exercise here."
 #endif
@@ -2195,15 +2207,15 @@ graph_paint(image_desc_t *im, char ***calcpr)
   double areazero = 0.0;
   enum gf_en stack_gf = GF_PRINT;
   graph_desc_t *lastgdes = NULL;    
-  
+
   /* if we are lazy and there is nothing to PRINT ... quit now */
   if (lazy && im->prt_c==0) return 0;
-  
+
   /* pull the data from the rrd files ... */
   
   if(data_fetch(im)==-1)
     return -1;
-  
+
   /* evaluate VDEF and CDEF operations ... */
   if(data_calc(im)==-1)
     return -1;
@@ -2399,14 +2411,11 @@ graph_paint(image_desc_t *im, char ***calcpr)
       /* make sure we do not run into trouble when stacking on NaN */
       for(ii=0;ii<im->xsize;ii++){
         if (isnan(im->gdes[i].p_data[ii])) {
-          double ybase = 0.0;
-          if (lastgdes) {
-            ybase = ytr(im,lastgdes->p_data[ii-1]);
-          };
-          if (isnan(ybase) || !lastgdes ){
-            ybase =  ytr(im,areazero);
+          if (lastgdes && (im->gdes[i].gf == GF_STACK)) {
+            im->gdes[i].p_data[ii] = lastgdes->p_data[ii];
+          } else {
+            im->gdes[i].p_data[ii] =  ytr(im,areazero);
           }
-          im->gdes[i].p_data[ii] = ybase;
         }
       } 
       lastgdes = &(im->gdes[i]);                         
@@ -2473,7 +2482,7 @@ graph_paint(image_desc_t *im, char ***calcpr)
   } else {
     if ((fo = fopen(im->graphfile,"wb")) == NULL) {
       rrd_set_error("Opening '%s' for write: %s",im->graphfile,
-                    strerror(errno));
+                    rrd_strerror(errno));
       return (-1);
     }
   }
@@ -2491,7 +2500,7 @@ graph_paint(image_desc_t *im, char ***calcpr)
 int
 gdes_alloc(image_desc_t *im){
 
-    long def_step = (im->end-im->start)/im->xsize;
+    unsigned long def_step = (im->end-im->start)/im->xsize;
     
     if (im->step > def_step) /* step can be increassed ... no decreassed */
       def_step = im->step;
@@ -2626,7 +2635,7 @@ rrd_graph(int argc, char **argv, char ***prdata, int *xsize, int *ysize)
 void
 rrd_graph_init(image_desc_t *im)
 {
-    int i;
+    unsigned int i;
 
 #ifdef HAVE_TZSET
     tzset();