X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Famqp.c;h=9eb51653b9306ea1c0fa48971e253f942f098e57;hb=e4324858a82a0623b5069555b624f203660a25ed;hp=7a91ba1122453006a4903ca374d7c437355ad7e9;hpb=a396da422740caf336a6d594515e8d80de6f440a;p=collectd.git

diff --git a/src/amqp.c b/src/amqp.c
index 7a91ba11..9eb51653 100644
--- a/src/amqp.c
+++ b/src/amqp.c
@@ -28,11 +28,11 @@
 
 #include "collectd.h"
 
-#include "common.h"
 #include "plugin.h"
-#include "utils_cmd_putval.h"
-#include "utils_format_graphite.h"
-#include "utils_format_json.h"
+#include "utils/cmds/putval.h"
+#include "utils/common/common.h"
+#include "utils/format_graphite/format_graphite.h"
+#include "utils/format_json/format_json.h"
 
 #include <amqp.h>
 #include <amqp_framing.h>
@@ -112,7 +112,7 @@ static const char *def_password = "guest";
 static const char *def_exchange = "amq.fanout";
 
 static pthread_t *subscriber_threads;
-static size_t subscriber_threads_num = 0;
+static size_t subscriber_threads_num;
 static bool subscriber_threads_running = true;
 
 #define CONF(c, f) (((c)->f != NULL) ? (c)->f : def_##f)
@@ -396,7 +396,7 @@ static int camqp_setup_queue(camqp_config_t *conf) /* {{{ */
 
 static int camqp_connect(camqp_config_t *conf) /* {{{ */
 {
-  static time_t last_connect_time = 0;
+  static time_t last_connect_time;
 
   amqp_rpc_reply_t reply;
   int status;