-z does not take an option -- Tomoyuki Murakami <tomoyuki@pobox.com>

[rrdtool.git] / src / rrd_graph.c

diff --git a/src/rrd_graph.c b/src/rrd_graph.c
index 80c4d0f..8d21d70 100644 (file)
--- a/src/rrd_graph.c
+++ b/src/rrd_graph.c
@@ -853,19 +853,22 @@ data_calc( image_desc_t *im){
                 *   resulting data source.
                 */
                for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
-                   if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
+               if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
+                  im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
                        long ptr = im->gdes[gdi].rpnp[rpi].ptr;
                        if (im->gdes[ptr].ds_cnt == 0) {
 #if 0
-printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
+                       printf("DEBUG: inside CDEF '%s' processing VDEF '%s'\n",
        im->gdes[gdi].vname,
        im->gdes[ptr].vname);
-printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
+                       printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
 #endif
                            im->gdes[gdi].rpnp[rpi].val = im->gdes[ptr].vf.val;
                            im->gdes[gdi].rpnp[rpi].op  = OP_NUMBER;
                        } else {
-                           if ((steparray = rrd_realloc(steparray, (++stepcnt+1)*sizeof(*steparray)))==NULL){
+                       if ((steparray =
+                                rrd_realloc(steparray,
+                                                        (++stepcnt+1)*sizeof(*steparray)))==NULL){
                                rrd_set_error("realloc steparray");
                                rpnstack_free(&rpnstack);
                                return -1;
@@ -904,7 +907,8 @@ printf("DEBUG: value from vdef is %f\n",im->gdes[ptr].vf.val);
 
                 /* move the data pointers to the correct period */
                 for(rpi=0;im->gdes[gdi].rpnp[rpi].op != OP_END;rpi++){
-                    if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE){
+               if(im->gdes[gdi].rpnp[rpi].op == OP_VARIABLE ||
+                  im->gdes[gdi].rpnp[rpi].op == OP_PREV_OTHER){
                         long ptr = im->gdes[gdi].rpnp[rpi].ptr;
                         if(im->gdes[gdi].start > im->gdes[ptr].start) {
                             im->gdes[gdi].rpnp[rpi].data += im->gdes[gdi].rpnp[rpi].ds_cnt;
@@ -1281,6 +1285,7 @@ print_calc(image_desc_t *im, char ***prdata)
 
            if (im->gdes[i].gf == GF_PRINT){
                (*prdata)[prlines-2] = malloc((FMT_LEG_LEN+2)*sizeof(char));
+               (*prdata)[prlines-1] = NULL;
                if (bad_format(im->gdes[i].format)) {
                        rrd_set_error("bad format for [G]PRINT in '%s'", im->gdes[i].format);
                        return -1;
@@ -1290,7 +1295,6 @@ print_calc(image_desc_t *im, char ***prdata)
 #else
                sprintf((*prdata)[prlines-2],im->gdes[i].format,printval,si_symb);
 #endif
-               (*prdata)[prlines-1] = NULL;
            } else {
                /* GF_GPRINT */
 
@@ -2715,7 +2719,7 @@ rrd_graph_options(int argc, char *argv[],image_desc_t *im)
 
 
        opt = getopt_long(argc, argv, 
-                         "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:z:g",
+                         "s:e:x:y:v:w:h:iu:l:rb:oc:n:m:t:f:a:zg",
                          long_options, &option_index);
 
        if (opt == EOF)
@@ -3200,6 +3204,7 @@ printf("DEBUG: start == %lu, end == %lu, %lu steps\n"
                field = (steps-1)*dst->vf.param/100;
                dst->vf.val  = array[field];
                dst->vf.when = 0;       /* no time component */
+               free(array);
 #if 0
 for(step=0;step<steps;step++)
 printf("DEBUG: %3li:%10.2f %c\n",step,array[step],step==field?'*':' ');