X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Famqp1.c;h=a7fd26be229121af860d353f0dd7de597a954907;hb=6378ec288f34ff250b2971a1452338a2b34c240a;hp=9a7b5ce36cc4c803fab4be05dc0a19d03f579382;hpb=1e5a886f3a5066766f8e94b04d01bc357feca981;p=collectd.git

diff --git a/src/amqp1.c b/src/amqp1.c
index 9a7b5ce3..a7fd26be 100644
--- a/src/amqp1.c
+++ b/src/amqp1.c
@@ -26,12 +26,12 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_putval.h"
-#include "utils_deq.h"
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
+#include "utils/deq/deq.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 #include "utils_random.h"
 
 #include <proton/condition.h>
@@ -476,7 +476,7 @@ static int amqp1_write(const data_set_t *ds, const value_list_t *vl, /* {{{ */
       ERROR("amqp1 plugin: format_json_finalize failed with status %i.",
             status);
       cd_message_free(cdm);
-      return (status);
+      return status;
     }
     cdm->mbuf.size = strlen(cdm->mbuf.start);
     if (cdm->mbuf.size >= BUFSIZE) {