/*****************************************************************************
- * RRDtool 1.3.2 Copyright by Tobi Oetiker, 1997-2008
+ * RRDtool 1.4.3 Copyright by Tobi Oetiker, 1997-2010
*****************************************************************************
* rrd_info Get Information about the configuration of an RRD
*****************************************************************************/
char *fmt,
...)
{
- int maxlen = 1024 + strlen(fmt);
char *str = NULL;
va_list argp;
- str = malloc(sizeof(char) * (maxlen + 1));
+#ifdef HAVE_VASPRINTF
+ 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));
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
vsprintf(str, fmt, argp);
#endif
}
+#endif /* HAVE_VASPRINTF */
va_end(argp);
return str;
}
{
rrd_info_t *next;
- next = malloc(sizeof(*next));
+ next = (rrd_info_t*)malloc(sizeof(*next));
next->next = (rrd_info_t *) 0;
if (info)
info->next = next;
next->value.u_int = value.u_int;
break;
case RD_I_STR:
- next->value.u_str = malloc(sizeof(char) * (strlen(value.u_str) + 1));
+ next->value.u_str = (char*)malloc(sizeof(char) * (strlen(value.u_str) + 1));
strcpy(next->value.u_str, value.u_str);
break;
case RD_I_BLO:
next->value.u_blo.size = value.u_blo.size;
next->value.u_blo.ptr =
- malloc(sizeof(unsigned char) * value.u_blo.size);
+ (unsigned char *)malloc(sizeof(unsigned char) * value.u_blo.size);
memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
break;
}
info.u_cnt = rrd.live_head->last_up;
cd = rrd_info_push(cd, sprintf_alloc("last_update"), RD_I_CNT, info);
+ info.u_cnt = rrd_get_header_size(&rrd);
+ cd = rrd_info_push(cd, sprintf_alloc("header_size"), RD_I_CNT, info);
+
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),