Merge pull request #2712 from NorbertHeusser/cleanup-include-guards

Cleanup of include guard defines

client/client_shared.h

@@ -16,8 +16,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
-#ifndef CLIENT_CONFIG_H
-#define CLIENT_CONFIG_H
+#ifndef CLIENT_SHARED_H
+#define CLIENT_SHARED_H
 
 #include <stdio.h>
 

common/password_mosq.h

@@ -1,5 +1,5 @@
-#ifndef PASSWORD_COMMON_H
-#define PASSWORD_COMMON_H
+#ifndef PASSWORD_MOSQ_H
+#define PASSWORD_MOSQ_H
 /*
 Copyright (c) 2012-2021 Roger Light <roger@atchoo.org>
 

lib/http_client.h

@@ -16,6 +16,9 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
+#ifndef HTTP_CLIENT_H
+#define HTTP_CLIENT_H
+
 #include "config.h"
 
 #if defined(WITH_WEBSOCKETS) && WITH_WEBSOCKETS == WS_IS_BUILTIN
@@ -28,3 +31,5 @@ int http_c__context_cleanup(struct mosquitto *context);
 int http_c__read(struct mosquitto *mosq);
 
 #endif
+
+#endif 

plugins/common/plugin_common.h

@@ -1,5 +1,5 @@
-#ifndef PLUGIN_SHARED_H
-#define PLUGIN_SHARED_H
+#ifndef PLUGIN_COMMON_H
+#define PLUGIN_COMMON_H
 
 #include <cjson/cJSON.h>
 #include "mosquitto_broker.h"

test/broker/c/mosquitto_plugin_v2.h

@@ -14,8 +14,8 @@ Contributors:
    Roger Light - initial implementation and documentation.
 */
 
-#ifndef MOSQUITTO_PLUGIN_H
-#define MOSQUITTO_PLUGIN_H
+#ifndef MOSQUITTO_PLUGIN_V2_H
+#define MOSQUITTO_PLUGIN_V2_H
 
 #define MOSQ_AUTH_PLUGIN_VERSION 2
 

test/old/msgsps_common.h

@@ -1,3 +1,6 @@
+#ifndef MSGSPS_COMMON_H
+#define MSGSPS_COMMON_H
+
 #define HOST "127.0.0.1"
 #define PORT 1883
 
@@ -5,3 +8,5 @@
 #define SUB_QOS 1
 #define MESSAGE_SIZE 1024L
 
+#endif
+