X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrd_info.c;h=f53a752ee29e7755daae0caeb43b750f66f28462;hb=46d2e915a9f864304ee107f9ea35a60b01d3e378;hp=f9c4604274ab80325c679512e30b04f7f619c2e1;hpb=ea8c705cc27ef33dee2cc6561ed51e16ddc5d0a9;p=rrdtool.git

diff --git a/src/rrd_info.c b/src/rrd_info.c
index f9c4604..f53a752 100644
--- a/src/rrd_info.c
+++ b/src/rrd_info.c
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * RRDtool 1.2.99907080300  Copyright by Tobi Oetiker, 1997-2007
+ * RRDtool 1.3rc7  Copyright by Tobi Oetiker, 1997-2008
  *****************************************************************************
  * rrd_info  Get Information about the configuration of an RRD
  *****************************************************************************/
@@ -20,18 +20,14 @@ char     *sprintf_alloc(
     char *fmt,
     ...)
 {
-#ifdef HAVE_VSNPRINTF
-    int       maxlen = 50;
-#else
-    int       maxlen = 1000;
-#endif
+    int       maxlen = 1024 + strlen(fmt);
     char     *str = NULL;
     va_list   argp;
-    str = malloc(sizeof(char) * (strlen(fmt) + maxlen));
+    str = malloc(sizeof(char) * (maxlen + 1));
     if (str != NULL) {
         va_start(argp, fmt);
 #ifdef HAVE_VSNPRINTF
-        vsnprintf(str, maxlen - 1, fmt, argp);
+        vsnprintf(str, maxlen, fmt, argp);
 #else
         vsprintf(str, fmt, argp);
 #endif
@@ -73,8 +69,9 @@ info_t
         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);
-        memcpy(next->value.u_blo.ptr,value.u_blo.ptr,value.u_blo.size);
+        next->value.u_blo.ptr =
+            malloc(sizeof(unsigned char) * value.u_blo.size);
+        memcpy(next->value.u_blo.ptr, value.u_blo.ptr, value.u_blo.size);
         break;
     }
     return (next);
@@ -333,8 +330,6 @@ info_t   *rrd_info_r(
 void info_print(
     info_t *data)
 {
-    long      image_length = 0;
-
     while (data) {
         printf("%s = ", data->key);
 
@@ -354,7 +349,7 @@ void info_print(
         case RD_I_STR:
             printf("\"%s\"\n", data->value.u_str);
             break;
-        case RD_I_BLO:            
+        case RD_I_BLO:
             printf("BLOB_SIZE:%lu\n", data->value.u_blo.size);
             fwrite(data->value.u_blo.ptr, data->value.u_blo.size, 1, stdout);
             break;