Varnish plugin: more concise formatting of plugin instance.

[collectd.git] / src / varnish.c

diff --git a/src/varnish.c b/src/varnish.c
index 6716231..df36cd1 100644 (file)
--- a/src/varnish.c
+++ b/src/varnish.c
@@ -164,12 +164,11 @@ static int varnish_submit (const char *plugin_instance, /* {{{ */
 
        sstrncpy(vl.plugin, "varnish", sizeof(vl.plugin));
 
-       if (plugin_instance != NULL) {
-               sstrncpy (vl.plugin_instance, plugin_instance,
-                               sizeof (vl.plugin_instance));
-               strncat(vl.plugin_instance, "-", 1);
-               strncat(vl.plugin_instance, category, sizeof(category));
-       }
+       if (plugin_instance == NULL)
+               plugin_instance = "default";
+
+       ssnprintf(vl.plugin_instance, sizeof (vl.plugin_instance),
+               "%s-%s", plugin_instance, category);
 
        sstrncpy(vl.type, type, sizeof(vl.type));