From ba5f8eb448c15ed070fdd45ca4c72380a1c985a1 Mon Sep 17 00:00:00 2001 From: Norbert Heusser Date: Wed, 21 Dec 2022 10:33:55 +0000 Subject: [PATCH] Cleanup of include guard defines Signed-off-by: Norbert Heusser --- client/client_shared.h | 4 ++-- common/password_mosq.h | 4 ++-- lib/http_client.h | 5 +++++ plugins/common/plugin_common.h | 4 ++-- test/broker/c/mosquitto_plugin_v2.h | 4 ++-- test/old/msgsps_common.h | 5 +++++ 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/client/client_shared.h b/client/client_shared.h index b3aeda5a..51cd022a 100644 --- a/client/client_shared.h +++ b/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 diff --git a/common/password_mosq.h b/common/password_mosq.h index 8b6436de..5da336e6 100644 --- a/common/password_mosq.h +++ b/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 diff --git a/lib/http_client.h b/lib/http_client.h index c5abbddb..54f0e46e 100644 --- a/lib/http_client.h +++ b/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 diff --git a/plugins/common/plugin_common.h b/plugins/common/plugin_common.h index 895bf4c9..2a777492 100644 --- a/plugins/common/plugin_common.h +++ b/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 #include "mosquitto_broker.h" diff --git a/test/broker/c/mosquitto_plugin_v2.h b/test/broker/c/mosquitto_plugin_v2.h index f6ed10e1..f59bf973 100644 --- a/test/broker/c/mosquitto_plugin_v2.h +++ b/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 diff --git a/test/old/msgsps_common.h b/test/old/msgsps_common.h index ccd3fa89..09b32fde 100644 --- a/test/old/msgsps_common.h +++ b/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 +