X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Fgmond.c;h=03dedcca606249c7b771f7511dd75f5c8a427a9a;hp=3312f96e898cae7bd9ef77345cd5cf0cac4f2f27;hb=54619dc85fd308b21ed09a0271e5c7383c7921b9;hpb=bbf34ecad8e0d8e50fd44cd3c4433b76385564ce

diff --git a/src/gmond.c b/src/gmond.c
index 3312f96e..03dedcca 100644
--- a/src/gmond.c
+++ b/src/gmond.c
@@ -26,9 +26,9 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_avltree.h"
+#include "utils/avltree/avltree.h"
+#include "utils/common/common.h"
 
 #if HAVE_NETDB_H
 #include <netdb.h>
@@ -397,8 +397,8 @@ static staging_entry_t *staging_entry_get(const char *host, /* {{{ */
   if (staging_tree == NULL)
     return NULL;
 
-  snprintf(key, sizeof(key), "%s/%s/%s", host, type,
-           (type_instance != NULL) ? type_instance : "");
+  ssnprintf(key, sizeof(key), "%s/%s/%s", host, type,
+            (type_instance != NULL) ? type_instance : "");
 
   se = NULL;
   status = c_avl_get(staging_tree, key, (void *)&se);