X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fplugin.c;h=2b5a34da22138324e1df1ee40d5cd4ef9c016931;hb=150924b271e21387ad1929e2373cc6e0772dc351;hp=83ee8e6ce30e76a17dbafdcd7cbd8b4a4f8d2c4f;hpb=9d682b256a32bf2d88d3b32eb89e71623fdc83b3;p=collectd.git

diff --git a/src/plugin.c b/src/plugin.c
index 83ee8e6c..2b5a34da 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -149,14 +149,14 @@ static int plugin_load_file (char *file)
 	{
 		const char *error = lt_dlerror ();
 
-		ERROR ("lt_dlopen failed: %s", error);
-		fprintf (stderr, "lt_dlopen failed: %s\n", error);
+		ERROR ("lt_dlopen (%s) failed: %s", file, error);
+		fprintf (stderr, "lt_dlopen (%s) failed: %s\n", file, error);
 		return (1);
 	}
 
 	if ((reg_handle = (void (*) (void)) lt_dlsym (dlh, "module_register")) == NULL)
 	{
-		WARNING ("Couldn't find symbol ``module_register'' in ``%s'': %s\n",
+		WARNING ("Couldn't find symbol `module_register' in `%s': %s\n",
 				file, lt_dlerror ());
 		lt_dlclose (dlh);
 		return (-1);
@@ -665,24 +665,6 @@ void plugin_read_all (void)
 	pthread_mutex_unlock (&read_lock);
 } /* void plugin_read_all */
 
-void plugin_flush_all (int timeout)
-{
-	int (*callback) (int timeout, const char *identifier);
-	llentry_t *le;
-
-	if (list_flush == NULL)
-		return;
-
-	le = llist_head (list_flush);
-	while (le != NULL)
-	{
-		callback = (int (*) (int, const char *)) le->value;
-		le = le->next;
-
-		(*callback) (timeout, NULL);
-	}
-} /* void plugin_flush_all */
-
 int plugin_flush (const char *plugin, int timeout, const char *identifier)
 {
   int (*callback) (int timeout, const char *identifier);
@@ -695,7 +677,7 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
   while (le != NULL)
   {
     if ((plugin != NULL)
-	&& (strcmp (plugin, le->key) != 0))
+        && (strcmp (plugin, le->key) != 0))
     {
       le = le->next;
       continue;
@@ -709,12 +691,6 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
   return (0);
 } /* int plugin_flush */
 
-/* FIXME: Remove this function once the perl plugin has been updated. */
-int plugin_flush_one (int timeout, const char *name)
-{
-  return (plugin_flush (name, timeout, NULL));
-} /* int plugin_flush_one */
-
 void plugin_shutdown_all (void)
 {
 	int (*callback) (void);
@@ -897,9 +873,9 @@ const data_set_t *plugin_get_ds (const char *name)
 } /* data_set_t *plugin_get_ds */
 
 static int plugin_notification_meta_add (notification_t *n,
-		const char *name,
-		enum notification_meta_type_e type,
-		const void *value)
+    const char *name,
+    enum notification_meta_type_e type,
+    const void *value)
 {
   notification_meta_t *meta;
   notification_meta_t *tail;
@@ -1024,19 +1000,19 @@ int plugin_notification_meta_copy (notification_t *dst,
   {
     if (meta->type == NM_TYPE_STRING)
       plugin_notification_meta_add_string (dst, meta->name,
-	  meta->value_string);
+          meta->value_string);
     else if (meta->type == NM_TYPE_SIGNED_INT)
       plugin_notification_meta_add_signed_int (dst, meta->name,
-	  meta->value_signed_int);
+          meta->value_signed_int);
     else if (meta->type == NM_TYPE_UNSIGNED_INT)
       plugin_notification_meta_add_unsigned_int (dst, meta->name,
-	  meta->value_unsigned_int);
+          meta->value_unsigned_int);
     else if (meta->type == NM_TYPE_DOUBLE)
       plugin_notification_meta_add_double (dst, meta->name,
-	  meta->value_double);
+          meta->value_double);
     else if (meta->type == NM_TYPE_BOOLEAN)
       plugin_notification_meta_add_boolean (dst, meta->name,
-	  meta->value_boolean);
+          meta->value_boolean);
   }
 
   return (0);