Merge branch 'collectd-4.4'

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index c47e867..8f1974f 100644 (file)
--- 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);