the end time itself is not part of a time range ... this fixes the segfault reported...

[rrdtool.git] / src / rrd_info.c

diff --git a/src/rrd_info.c b/src/rrd_info.c
index 0037ff614dc0b2b04d658f9b88c29101fa0cc79f..6627087f4801d3540858ba49cdf4d9ab423c60a5 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2rc9  Copyright by Tobi Oetiker, 1997-2005
+ * RRDtool 1.2.30  Copyright by Tobi Oetiker, 1997-2009
  *****************************************************************************
  * rrd_info  Get Information about the configuration of an RRD
  *****************************************************************************/
@@ -110,6 +110,9 @@ rrd_info_r(char *filename) {
 
     for(i=0;i<rrd.stat_head->ds_cnt;i++){
 
+       info.u_cnt=i;
+       cd=info_push(cd,sprintf_alloc("ds[%s].index",            rrd.ds_def[i].ds_nam), RD_I_CNT, info);
+  
        info.u_str=rrd.ds_def[i].dst;
        cd=info_push(cd,sprintf_alloc("ds[%s].type",             rrd.ds_def[i].ds_nam), RD_I_STR, info);
   
@@ -117,7 +120,7 @@ rrd_info_r(char *filename) {
     switch (current_ds) {
           case DST_CDEF:
                  {
-                 char *buffer = 0;
+                 char *buffer = NULL;
                  rpn_compact2str((rpn_cdefds_t *) &(rrd.ds_def[i].par[DS_cdef]),
                         rrd.ds_def, &buffer);
                  info.u_str = buffer;
@@ -155,6 +158,9 @@ rrd_info_r(char *filename) {
        info.u_cnt=rrd.rra_def[i].row_cnt;
        cd=info_push(cd,sprintf_alloc("rra[%d].rows",i),  RD_I_CNT,   info);
 
+       info.u_cnt=rrd.rra_ptr[i].cur_row;
+       cd=info_push(cd,sprintf_alloc("rra[%d].cur_row",i),  RD_I_CNT,   info);
+
        info.u_cnt=rrd.rra_def[i].pdp_cnt;
        cd=info_push(cd,sprintf_alloc("rra[%d].pdp_per_row",i),  RD_I_CNT,   info);