X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fdaemon%2Fplugin.c;h=60bc2aeb87db634e9c74b050d126228b615f6617;hb=f19159854c272e5a8bb9f6915c456cf3a0f2d20e;hp=ea9d2e932aa0ba8accd9f7b74972761982c80a5f;hpb=5d591599384bec7bcad2ce4c1453e43c67512c9f;p=collectd.git diff --git a/src/daemon/plugin.c b/src/daemon/plugin.c index ea9d2e93..60bc2aeb 100644 --- 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); }