Merge pull request #3329 from efuss/fix-3311

[collectd.git] / src / curl.c

diff --git a/src/curl.c b/src/curl.c
index 950e30b..7eb4805 100644 (file)
--- a/src/curl.c
+++ b/src/curl.c
@@ -23,10 +23,10 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_curl_stats.h"
-#include "utils_match.h"
+#include "utils/common/common.h"
+#include "utils/curl_stats/curl_stats.h"
+#include "utils/match/match.h"
 #include "utils_time.h"
 
 #include <curl/curl.h>
@@ -445,7 +445,8 @@ static int cc_config_add_page(oconfig_item_t *ci) /* {{{ */
       status = cf_util_get_string(child, &af);
       if (status != 0 || af == NULL) {
         WARNING("curl plugin: Cannot parse value of `%s' "
-                "for instance `%s'.", child->key, page->instance);
+                "for instance `%s'.",
+                child->key, page->instance);
       } else if (strcasecmp("any", af) == 0) {
         page->address_family = CURL_IPRESOLVE_WHATEVER;
       } else if (strcasecmp("ipv4", af) == 0) {
@@ -462,7 +463,8 @@ static int cc_config_add_page(oconfig_item_t *ci) /* {{{ */
                   "Using fallback `any'.");
       } else {
         WARNING("curl plugin: Unsupported value of `%s' "
-                "for instance `%s'.", child->key, page->instance);
+                "for instance `%s'.",
+                child->key, page->instance);
         status = -1;
       }
     } else if (strcasecmp("User", child->key) == 0)
@@ -539,7 +541,8 @@ static int cc_config_add_page(oconfig_item_t *ci) /* {{{ */
   plugin_register_complex_read(/* group = */ NULL, cb_name, cc_read_page,
                                interval,
                                &(user_data_t){
-                                   .data = page, .free_func = cc_web_page_free,
+                                   .data = page,
+                                   .free_func = cc_web_page_free,
                                });
   sfree(cb_name);