projects
/
rrdtool.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added gettext.h to dist
[rrdtool.git]
/
src
/
rrd_info.c
diff --git
a/src/rrd_info.c
b/src/rrd_info.c
index
679b024
..
73407a9
100644
(file)
--- a/
src/rrd_info.c
+++ b/
src/rrd_info.c
@@
-21,10
+21,14
@@
char *sprintf_alloc(
char *fmt,
...)
{
char *fmt,
...)
{
- int maxlen = 1024 + strlen(fmt);
char *str = NULL;
va_list argp;
char *str = NULL;
va_list argp;
- str = malloc(sizeof(char) * (maxlen + 1));
+#ifdef HAVE_VASPRINTF
+ va_start( argp, fmt );
+ vasprintf( &str, fmt, argp );
+#else
+ int maxlen = 1024 + strlen(fmt);
+ str = (char*)malloc(sizeof(char) * (maxlen + 1));
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
if (str != NULL) {
va_start(argp, fmt);
#ifdef HAVE_VSNPRINTF
@@
-33,6
+37,7
@@
char *sprintf_alloc(
vsprintf(str, fmt, argp);
#endif
}
vsprintf(str, fmt, argp);
#endif
}
+#endif // HAVE_VASPRINTF
va_end(argp);
return str;
}
va_end(argp);
return str;
}
@@
-45,7
+50,7
@@
rrd_info_t
{
rrd_info_t *next;
{
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->next = (rrd_info_t *) 0;
if (info)
info->next = next;
@@
-62,13
+67,13
@@
rrd_info_t
next->value.u_int = value.u_int;
break;
case RD_I_STR:
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 =
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;
}
memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
break;
}
@@
-146,6
+151,7
@@
rrd_info_t *rrd_info_r(
enum cf_en current_cf;
enum dst_en current_ds;
enum cf_en current_cf;
enum dst_en current_ds;
+ rrd_init(&rrd);
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL)
goto err_free;
rrd_file = rrd_open(filename, &rrd, RRD_READONLY);
if (rrd_file == NULL)
goto err_free;
@@
-163,6
+169,9
@@
rrd_info_t *rrd_info_r(
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.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_str = rrd.ds_def[i].dst;
for (i = 0; i < rrd.stat_head->ds_cnt; i++) {
info.u_str = rrd.ds_def[i].dst;