X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=cb1005e8dffaa0537737183d338fc7278040fd3e;hb=d3db12b73a1c3c17a2dfc0ba96ec99490088c957;hp=12f002cf5baba8d3a77b6285e63cca253e04d6a8;hpb=d189964960c406ddaff60e47b4ae01fcc38bec45;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 12f002cf..cb1005e8 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -339,7 +339,7 @@ static int plugin_load_file (char *file, uint32_t flags)
 
 		ssnprintf (errbuf, sizeof (errbuf),
 				"lt_dlopen (\"%s\") failed: %s. "
-				"The most common cause for this problem are "
+				"The most common cause for this problem is "
 				"missing dependencies. Use ldd(1) to check "
 				"the dependencies of the plugin "
 				"/ shared object.",
@@ -895,7 +895,6 @@ int plugin_load (char const *plugin_name, uint32_t flags)
 	const char *dir;
 	char  filename[BUFSIZE] = "";
 	char  typename[BUFSIZE];
-	int   typename_len;
 	int   ret;
 	struct stat    statbuf;
 	struct dirent *de;
@@ -935,7 +934,6 @@ int plugin_load (char const *plugin_name, uint32_t flags)
 		WARNING ("plugin_load: Filename too long: \"%s.so\"", plugin_name);
 		return (-1);
 	}
-	typename_len = strlen (typename);
 
 	if ((dh = opendir (dir)) == NULL)
 	{
@@ -947,7 +945,7 @@ int plugin_load (char const *plugin_name, uint32_t flags)
 
 	while ((de = readdir (dh)) != NULL)
 	{
-		if (strncasecmp (de->d_name, typename, typename_len))
+		if (strcasecmp (de->d_name, typename))
 			continue;
 
 		status = ssnprintf (filename, sizeof (filename),
@@ -1217,6 +1215,27 @@ int plugin_register_shutdown (const char *name,
 				(void *) callback, /* user_data = */ NULL));
 } /* int plugin_register_shutdown */
 
+static void plugin_free_data_sets (void)
+{
+	void *key;
+	void *value;
+
+	if (data_sets == NULL)
+		return;
+
+	while (c_avl_pick (data_sets, &key, &value) == 0)
+	{
+		data_set_t *ds = value;
+		/* key is a pointer to ds->type */
+
+		sfree (ds->ds);
+		sfree (ds);
+	}
+
+	c_avl_destroy (data_sets);
+	data_sets = NULL;
+} /* void plugin_free_data_sets */
+
 int plugin_register_data_set (const data_set_t *ds)
 {
 	data_set_t *ds_copy;
@@ -1764,6 +1783,7 @@ void plugin_shutdown_all (void)
 	destroy_all_callbacks (&list_log);
 
 	plugin_free_loaded ();
+	plugin_free_data_sets ();
 } /* void plugin_shutdown_all */
 
 int plugin_dispatch_missing (const value_list_t *vl) /* {{{ */