Code

Oops. Use the new string and free it when done
authorScott Sanders <scott@jssjr.com>
Sun, 2 Oct 2011 23:41:06 +0000 (19:41 -0400)
committerScott Sanders <scott@jssjr.com>
Sun, 2 Oct 2011 23:41:06 +0000 (19:41 -0400)
src/write_graphite.c

index 2d80dbb7bb7baddedc091162cd537bc23d6dfbd0..9f7e5e74c75cbafba981e1caaee3c2c9d3a8eac6 100644 (file)
@@ -371,7 +371,7 @@ static int wg_format_name (char *ret, int ret_len,
                         prefix, n_hostname, plugin, type);
             else
                 status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s",
-                        prefix, n_hostname, plugin, type, ds_name);
+                        prefix, n_hostname, plugin, type, n_ds_name);
         }
         else
         {
@@ -382,7 +382,7 @@ static int wg_format_name (char *ret, int ret_len,
             else
                 status = ssnprintf (ret, ret_len, "%s.%s.%s.%s-%s.%s",
                         prefix, n_hostname, plugin, type,
-                        type_instance, ds_name);
+                        type_instance, n_ds_name);
         }
     }
     else
@@ -396,7 +396,7 @@ static int wg_format_name (char *ret, int ret_len,
             else
                 status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s.%s",
                         prefix, n_hostname, plugin,
-                        plugin_instance, type, ds_name);
+                        plugin_instance, type, n_ds_name);
         }
         else
         {
@@ -407,11 +407,12 @@ static int wg_format_name (char *ret, int ret_len,
             else
                 status = ssnprintf (ret, ret_len, "%s.%s.%s.%s.%s-%s.%s",
                         prefix, n_hostname, plugin,
-                        plugin_instance, type, type_instance, ds_name);
+                        plugin_instance, type, type_instance, n_ds_name);
         }
     }
 
     sfree(n_hostname);
+    sfree(n_ds_name);
 
     if ((status < 1) || (status >= ret_len))
         return (-1);