X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fconfigfile.c;h=b1030fe939098ce818bb44e88a87c7137164df14;hb=e628f39838a67b40d52dfb8425b4d8474fbd0550;hp=2afef4f024e402a2cc94bd7f02744e599fac440a;hpb=cacaa2126020832df99fa6423147bd3de6d4faae;p=collectd.git

diff --git a/src/configfile.c b/src/configfile.c
index 2afef4f0..b1030fe9 100644
--- a/src/configfile.c
+++ b/src/configfile.c
@@ -276,7 +276,7 @@ static int dispatch_value_plugin (const char *plugin, oconfig_item_t *ci)
 	buffer_ptr = buffer + 1;
 
 	return (cf_dispatch (plugin, ci->key, buffer_ptr));
-} /* int plugin_conf_dispatch */
+} /* int dispatch_value_plugin */
 
 static int dispatch_value (const oconfig_item_t *ci)
 {
@@ -327,7 +327,7 @@ static int dispatch_block_plugin (oconfig_item_t *ci)
 		if (ci->children[i].children == NULL)
 			dispatch_value_plugin (name, ci->children + i);
 		else
-			{DEBUG ("No nested config blocks allow for this plugin.");}
+			{DEBUG ("No nested config blocks allowed for this plugin.");}
 	}
 
 	return (0);
@@ -887,7 +887,11 @@ int cf_read (char *filename)
 			dispatch_block (conf->children + i);
 	}
 
+	oconfig_free (conf);
+
+	/* Read the default types.db if no `TypesDB' option was given. */
 	if (cf_default_typesdb)
-		read_types_list (PLUGINDIR"/types.db"); /* FIXME: Configure path */
+		read_types_list (PLUGINDIR"/types.db");
+
 	return (0);
 } /* int cf_read */