From a5d9986cbd7c6875a779cb28ff3b91cc5b29a373 Mon Sep 17 00:00:00 2001
From: Roger Light <roger@atchoo.org>
Date: Sun, 21 Mar 2021 22:50:48 +0000
Subject: [PATCH] More compiler warning fixes.

---
 client/client_shared.h                     | 7 +++++--
 plugins/dynamic-security/Makefile          | 2 +-
 plugins/dynamic-security/json_help.c       | 1 +
 plugins/dynamic-security/plugin.c          | 4 ++--
 plugins/dynamic-security/rolelist.c        | 4 ++--
 plugins/dynamic-security/roles.c           | 2 +-
 plugins/dynamic-security/sub_matches_sub.c | 2 ++
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/client/client_shared.h b/client/client_shared.h
index 156c7f6868..49484ff682 100644
--- a/client/client_shared.h
+++ b/client/client_shared.h
@@ -27,6 +27,10 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #  include <sys/time.h>
 #endif
 
+#ifndef __GNUC__
+#define __attribute__(attrib)
+#endif
+
 /* pub_client.c modes */
 #define MSGMODE_NONE 0
 #define MSGMODE_CMD 1
@@ -136,6 +140,5 @@ int client_connect(struct mosquitto *mosq, struct mosq_config *cfg);
 
 int cfg_parse_property(struct mosq_config *cfg, int argc, char *argv[], int *idx);
 
-void err_printf(const struct mosq_config *cfg, const char *fmt, ...);
-
+void err_printf(const struct mosq_config *cfg, const char *fmt, ...) __attribute__((format(printf, 2, 3)));
 #endif
diff --git a/plugins/dynamic-security/Makefile b/plugins/dynamic-security/Makefile
index 9ef728b108..7ef77b7b57 100644
--- a/plugins/dynamic-security/Makefile
+++ b/plugins/dynamic-security/Makefile
@@ -3,7 +3,7 @@ include ../../config.mk
 .PHONY : all binary check clean reallyclean test install uninstall
 
 PLUGIN_NAME=mosquitto_dynamic_security
-LOCAL_CPPFLAGS=-I../../src/
+LOCAL_CPPFLAGS=-I../../src/ -DWITH_CJSON
 
 OBJS=	\
 		acl.o \
diff --git a/plugins/dynamic-security/json_help.c b/plugins/dynamic-security/json_help.c
index e0c8178b1b..5331d3f940 100644
--- a/plugins/dynamic-security/json_help.c
+++ b/plugins/dynamic-security/json_help.c
@@ -23,6 +23,7 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "json_help.h"
 #include "mosquitto.h"
 
 
diff --git a/plugins/dynamic-security/plugin.c b/plugins/dynamic-security/plugin.c
index d5a8cf0610..27c3904d9e 100644
--- a/plugins/dynamic-security/plugin.c
+++ b/plugins/dynamic-security/plugin.c
@@ -131,7 +131,7 @@ static int dynsec_control_callback(int event, void *event_data, void *userdata)
 	return MOSQ_ERR_SUCCESS;
 }
 
-int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
+static int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
 {
 	cJSON *j_actions, *j_action, *j_acltype, *j_allow;
 	bool allow;
@@ -174,7 +174,7 @@ int dynsec__process_set_default_acl_access(cJSON *j_responses, struct mosquitto
 }
 
 
-int dynsec__process_get_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
+static int dynsec__process_get_default_acl_access(cJSON *j_responses, struct mosquitto *context, cJSON *command, char *correlation_data)
 {
 	cJSON *tree, *jtmp, *j_data, *j_acls, *j_acl;
 	const char *admin_clientid, *admin_username;
diff --git a/plugins/dynamic-security/rolelist.c b/plugins/dynamic-security/rolelist.c
index a8c93a96a8..2bc1f16372 100644
--- a/plugins/dynamic-security/rolelist.c
+++ b/plugins/dynamic-security/rolelist.c
@@ -51,7 +51,7 @@ static int rolelist_cmp(void *a, void *b)
 }
 
 
-void dynsec_rolelist__free_item(struct dynsec__rolelist **base_rolelist, struct dynsec__rolelist *rolelist)
+static void dynsec_rolelist__free_item(struct dynsec__rolelist **base_rolelist, struct dynsec__rolelist *rolelist)
 {
 	HASH_DELETE(hh, *base_rolelist, rolelist);
 	mosquitto_free(rolelist->rolename);
@@ -67,7 +67,7 @@ void dynsec_rolelist__cleanup(struct dynsec__rolelist **base_rolelist)
 	}
 }
 
-int dynsec_rolelist__remove_role(struct dynsec__rolelist **base_rolelist, const struct dynsec__role *role)
+static int dynsec_rolelist__remove_role(struct dynsec__rolelist **base_rolelist, const struct dynsec__role *role)
 {
 	struct dynsec__rolelist *found_rolelist;
 
diff --git a/plugins/dynamic-security/roles.c b/plugins/dynamic-security/roles.c
index fb11677028..4d5accfc6c 100644
--- a/plugins/dynamic-security/roles.c
+++ b/plugins/dynamic-security/roles.c
@@ -209,7 +209,7 @@ static int insert_acl_cmp(struct dynsec__acl *a, struct dynsec__acl *b)
 }
 
 
-int dynsec_roles__acl_load(cJSON *j_acls, const char *key, struct dynsec__acl **acllist)
+static int dynsec_roles__acl_load(cJSON *j_acls, const char *key, struct dynsec__acl **acllist)
 {
 	cJSON *j_acl, *j_type, *jtmp;
 	struct dynsec__acl *acl;
diff --git a/plugins/dynamic-security/sub_matches_sub.c b/plugins/dynamic-security/sub_matches_sub.c
index fb9139025b..5f5d55a66f 100644
--- a/plugins/dynamic-security/sub_matches_sub.c
+++ b/plugins/dynamic-security/sub_matches_sub.c
@@ -21,6 +21,8 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include <stdlib.h>
 #include <string.h>
 
+#include "dynamic_security.h"
+
 static char *strtok_hier(char *str, char **saveptr)
 {
 	char *c;