prepare for the release of rrdtool-1.2.28

[rrdtool.git] / src / rrd_xport.c

diff --git a/src/rrd_xport.c b/src/rrd_xport.c
index fee2c36837f98bb79648e62324e7a835a9182aae..45f272ac3fbf474db8b7d5bd0411133a79c853ca 100644 (file)
--- a/src/rrd_xport.c
+++ b/src/rrd_xport.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * RRDtool 1.2.15  Copyright by Tobi Oetiker, 1997-2006
+ * RRDtool 1.2.28  Copyright by Tobi Oetiker, 1997-2008
  ****************************************************************************
  * rrd_xport.c  export RRD data 
  ****************************************************************************/
@@ -61,6 +61,7 @@ rrd_xport(int argc, char **argv, int UNUSED(*xsize),
            {"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}
        };
        int option_index = 0;
@@ -76,6 +77,8 @@ rrd_xport(int argc, char **argv, int UNUSED(*xsize),
        case 261:
            im.step =  atoi(optarg);
            break;
+       case 262:
+           break;
        case 's':
            if ((parsetime_error = parsetime(optarg, &start_tv))) {
                rrd_set_error( "start time: %s", parsetime_error );
@@ -96,7 +99,7 @@ rrd_xport(int argc, char **argv, int UNUSED(*xsize),
            }
            break;
        case '?':
-           rrd_set_error("unknown option '%c'", optopt);
+            rrd_set_error("unknown option '%s'",argv[optind-1]);
             return -1;
        }
     }
@@ -162,7 +165,7 @@ rrd_xport_fn(image_desc_t *im,
 
     unsigned long nof_xports = 0;
     unsigned long xport_counter = 0;
-    unsigned long *ref_list;
+    int *ref_list;
     rrd_value_t **srcptr_list;
     char **legend_list;
     int ii = 0;
@@ -254,8 +257,8 @@ rrd_xport_fn(image_desc_t *im,
     if (((*data) = malloc((*col_cnt) * row_cnt * sizeof(rrd_value_t)))==NULL){
         free(srcptr_list);
         free(ref_list);
-       free(legend_list);
-       rrd_set_error("malloc xport data area");
+        free(legend_list);
+        rrd_set_error("malloc xport data area");
        return(-1);
     }
     dstptr = (*data);