src/plugin.[ch]: Removed legacy function plugin_flush_one().

[collectd.git] / src / plugin.c

diff --git a/src/plugin.c b/src/plugin.c
index bf8fb08..c47e867 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -665,28 +665,9 @@ void plugin_read_all (void)
        pthread_mutex_unlock (&read_lock);
 } /* void plugin_read_all */
 
-int plugin_flush_one (int timeout, const char *name)
-{
-       int (*callback) (int);
-       llentry_t *le;
-       int status;
-
-       if (list_flush == NULL)
-               return (-1);
-
-       le = llist_search (list_flush, name);
-       if (le == NULL)
-               return (-1);
-       callback = (int (*) (int)) le->value;
-
-       status = (*callback) (timeout);
-
-       return (status);
-} /* int plugin_flush_ont */
-
 void plugin_flush_all (int timeout)
 {
-       int (*callback) (int);
+       int (*callback) (int timeout, const char *identifier);
        llentry_t *le;
 
        if (list_flush == NULL)
@@ -695,10 +676,10 @@ void plugin_flush_all (int timeout)
        le = llist_head (list_flush);
        while (le != NULL)
        {
-               callback = (int (*) (int)) le->value;
+               callback = (int (*) (int, const char *)) le->value;
                le = le->next;
 
-               (*callback) (timeout);
+               (*callback) (timeout, NULL);
        }
 } /* void plugin_flush_all */
 
@@ -715,12 +696,15 @@ int plugin_flush (const char *plugin, int timeout, const char *identifier)
   {
     if ((plugin != NULL)
        && (strcmp (plugin, le->key) != 0))
+    {
+      le = le->next;
       continue;
+    }
 
     callback = (int (*) (int, const char *)) le->value;
-    le = le->next;
-
     (*callback) (timeout, identifier);
+
+    le = le->next;
   }
   return (0);
 } /* int plugin_flush */