contrib/docker: add LD_PRELOAD wrapper to fopen/open/opendir syscalls

[collectd.git] / src / write_http.c

diff --git a/src/write_http.c b/src/write_http.c
index 41615d3..b3baa55 100644 (file)
--- a/src/write_http.c
+++ b/src/write_http.c
@@ -366,7 +366,7 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
         if ((cb == NULL) || (cb->send_buffer == NULL))
                 return -1;
 
-        if (strcmp (ds->type, vl->type) == 0) {
+        if (strcmp (ds->type, vl->type) != 0) {
                 ERROR ("write_http plugin: DS type does not match "
                                 "value list type");
                 return -1;
@@ -419,6 +419,9 @@ static int wh_write_command (const data_set_t *ds, const value_list_t *vl, /* {{
         }
         assert (command_len < cb->send_buffer_free);
 
+        /* Make scan-build happy. */
+        assert (cb->send_buffer != NULL);
+
         /* `command_len + 1' because `command_len' does not include the
          * trailing null byte. Neither does `send_buffer_fill'. */
         memcpy (cb->send_buffer + cb->send_buffer_fill,
@@ -817,13 +820,10 @@ static int wh_config_node (oconfig_item_t *ci) /* {{{ */
                         callback_name, cb->location);
 
         user_data_t user_data = {
-                .data = cb
+                .data = cb,
+                .free_func = wh_callback_free,
         };
 
-        plugin_register_flush (callback_name, wh_flush, &user_data);
-
-        user_data.free_func = wh_callback_free;
-
         if (cb->send_metrics)
         {
                 plugin_register_write (callback_name, wh_write, &user_data);