src/daemon/plugin.h: Change "values_len" to type "size_t".

[collectd.git] / src / daemon / plugin.c

diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c
index ea9d2e9..60bc2ae 100644 (file)
--- a/src/daemon/plugin.c
+++ b/src/daemon/plugin.c
@@ -1625,11 +1625,11 @@ int plugin_unregister_flush (const char *name)
                char *flush_name;
 
                flush_name = plugin_flush_callback_name (name);
-               if (flush_name == NULL)
-                       return (-1);
-
-               plugin_unregister_read(flush_name);
-               sfree(flush_name);
+               if (flush_name != NULL)
+               {
+                       plugin_unregister_read(flush_name);
+                       sfree(flush_name);
+               }
        }
 
        return plugin_unregister (list_flush, name);
@@ -2137,8 +2137,8 @@ static int plugin_dispatch_values_internal (value_list_t *vl)
        if (ds->ds_num != vl->values_len)
        {
                ERROR ("plugin_dispatch_values: ds->type = %s: "
-                               "(ds->ds_num = %i) != "
-                               "(vl->values_len = %i)",
+                               "(ds->ds_num = %zu) != "
+                               "(vl->values_len = %zu)",
                                ds->type, ds->ds_num, vl->values_len);
                return (-1);
        }