X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fwrite_http.c;h=a7bb2e0f40600917685605df709a95bc7b98d885;hb=a9f509bacfda6be6882527a16563f260e4373246;hp=41615d3f0ccbd0be9c1cefba46708a4ace10e680;hpb=d061c270fabc5dba961cf2b94ebe968e9a89b899;p=collectd.git diff --git a/src/write_http.c b/src/write_http.c index 41615d3f..a7bb2e0f 100644 --- a/src/write_http.c +++ b/src/write_http.c @@ -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);