diff --git a/src/rrd_info.c b/src/rrd_info.c
index 73407a95c7d760f14f6cc190708201fcc9ab30d3..eaeeea36ed9c9101b2b88f37d7fb2571505c89d6 100644 (file)
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.2 Copyright by Tobi Oetiker, 1997-2009
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
char *str = NULL;
va_list argp;
#ifdef HAVE_VASPRINTF
- va_start( argp, fmt );
- vasprintf( &str, fmt, argp );
+ va_start( argp, fmt );
+ if (vasprintf( &str, fmt, argp ) == -1){
+ va_end(argp);
+ rrd_set_error ("vasprintf failed.");
+ return(NULL);
+ }
#else
int maxlen = 1024 + strlen(fmt);
str = (char*)malloc(sizeof(char) * (maxlen + 1));
vsprintf(str, fmt, argp);
#endif
}
-#endif // HAVE_VASPRINTF
+#endif /* HAVE_VASPRINTF */
va_end(argp);
return str;
}
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
+ info.u_cnt=i;
+ cd= rrd_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 = rrd_info_push(cd, sprintf_alloc("ds[%s].type",
rrd.ds_def[i].ds_nam),