X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_info.c;h=9b2363f850b3b143579789da7186435189494547;hb=e3d98af81f19a3b538921265392d61100b0f83e2;hp=679b02402dfcfa8e68aa663d5459d201890eb0d6;hpb=a12627275ff8487174cbb907a066f62a00b6ae44;p=rrdtool.git diff --git a/src/rrd_info.c b/src/rrd_info.c index 679b024..9b2363f 100644 --- a/src/rrd_info.c +++ b/src/rrd_info.c @@ -24,7 +24,7 @@ char *sprintf_alloc( int maxlen = 1024 + strlen(fmt); char *str = NULL; va_list argp; - str = malloc(sizeof(char) * (maxlen + 1)); + str = (char*)malloc(sizeof(char) * (maxlen + 1)); if (str != NULL) { va_start(argp, fmt); #ifdef HAVE_VSNPRINTF @@ -45,7 +45,7 @@ rrd_info_t { 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; @@ -62,13 +62,13 @@ rrd_info_t 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; } @@ -146,6 +146,7 @@ rrd_info_t *rrd_info_r( 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; @@ -163,6 +164,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_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;