Merge branch 'collectd-4.4' into collectd-4.5

[collectd.git] / src / filecount.c

diff --git a/src/filecount.c b/src/filecount.c
index 3d08cbe..55b3655 100644 (file)
--- a/src/filecount.c
+++ b/src/filecount.c
@@ -74,7 +74,7 @@ static void fc_submit_dir (const fc_directory_conf_t *dir)
   sstrncpy (vl.type, "bytes", sizeof (vl.type));
 
   plugin_dispatch_values (&vl);
-} /* void qmail_submit */
+} /* void fc_submit_dir */
 
 /*
  * Config:
@@ -98,7 +98,7 @@ static int fc_config_set_instance (fc_directory_conf_t *dir, const char *str)
   char *ptr;
   char *copy;
 
-  strncpy (buffer, str, sizeof (buffer));
+  sstrncpy (buffer, str, sizeof (buffer));
   for (ptr = buffer; *ptr != 0; ptr++)
     if (*ptr == '/')
       *ptr = '_';
@@ -342,10 +342,10 @@ static int fc_config_add_dir (oconfig_item_t *ci)
   dir->mtime = 0;
   dir->size = 0;
 
+  status = 0;
   for (i = 0; i < ci->children_num; i++)
   {
     oconfig_item_t *option = ci->children + i;
-    status = 0;
 
     if (strcasecmp ("Instance", option->key) == 0)
       status = fc_config_add_dir_instance (dir, option);
@@ -414,7 +414,7 @@ static int fc_config (oconfig_item_t *ci)
   } /* for (ci->children) */
 
   return (0);
-} /* int qmail_config */
+} /* int fc_config */
 
 static int fc_init (void)
 {