From 331e8029131e2108eee5984788036ec818158525 Mon Sep 17 00:00:00 2001
From: "Roger A. Light" <roger@atchoo.org>
Date: Thu, 22 Dec 2022 23:04:48 +0000
Subject: [PATCH] Rename mosquitto_client_msg -> mosquitto__client_msg

---
 apps/db_dump/stubs.c            |  4 +--
 lib/mosquitto_internal.h        |  6 ++--
 src/database.c                  | 52 ++++++++++++++++-----------------
 src/handle_connect.c            |  4 +--
 src/mosquitto_broker_internal.h | 16 +++++-----
 src/persist_read.c              |  4 +--
 src/persist_write.c             |  4 +--
 src/plugin_persist.c            |  6 ++--
 test/unit/persist_read_stubs.c  |  4 +--
 test/unit/persist_write_stubs.c |  6 ++--
 test/unit/subs_stubs.c          |  6 ++--
 11 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/apps/db_dump/stubs.c b/apps/db_dump/stubs.c
index adaa2e6b..2a5ace95 100644
--- a/apps/db_dump/stubs.c
+++ b/apps/db_dump/stubs.c
@@ -26,8 +26,8 @@ int retain__store(const char *topic, struct mosquitto__base_msg *base_msg, char
 
 int sub__add(struct mosquitto *context, const struct mosquitto_subscription *sub) { UNUSED(context); UNUSED(sub); return 0; }
 
-void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg) { UNUSED(msg_data); UNUSED(msg); }
+void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg) { UNUSED(msg_data); UNUSED(msg); }
 
-void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg) { UNUSED(msg_data); UNUSED(msg); }
+void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg) { UNUSED(msg_data); UNUSED(msg); }
 
 int session_expiry__add_from_persistence(struct mosquitto *context, time_t expiry_time) { UNUSED(context); UNUSED(expiry_time); return 0; }
diff --git a/lib/mosquitto_internal.h b/lib/mosquitto_internal.h
index 88c11646..3802bfae 100644
--- a/lib/mosquitto_internal.h
+++ b/lib/mosquitto_internal.h
@@ -67,7 +67,7 @@ Contributors:
 #    include <netdb.h>
 #  endif
 #  include "uthash.h"
-struct mosquitto_client_msg;
+struct mosquitto__client_msg;
 #endif
 
 #if defined(WITH_WEBSOCKETS) && WITH_WEBSOCKETS == WS_IS_LWS
@@ -214,8 +214,8 @@ struct will_delay_list {
 
 struct mosquitto_msg_data{
 #ifdef WITH_BROKER
-	struct mosquitto_client_msg *inflight;
-	struct mosquitto_client_msg *queued;
+	struct mosquitto__client_msg *inflight;
+	struct mosquitto__client_msg *queued;
 	long inflight_bytes;
 	long inflight_bytes12;
 	int inflight_count;
diff --git a/src/database.c b/src/database.c
index 8d1803c1..61ea333b 100644
--- a/src/database.c
+++ b/src/database.c
@@ -138,7 +138,7 @@ bool db__ready_for_queue(struct mosquitto *context, int qos, struct mosquitto_ms
 }
 
 
-void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	msg_data->inflight_count++;
 	msg_data->inflight_bytes += msg->base_msg->msg.payloadlen;
@@ -148,7 +148,7 @@ void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct m
 	}
 }
 
-static void db__msg_remove_from_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+static void db__msg_remove_from_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	msg_data->inflight_count--;
 	msg_data->inflight_bytes -= msg->base_msg->msg.payloadlen;
@@ -159,7 +159,7 @@ static void db__msg_remove_from_inflight_stats(struct mosquitto_msg_data *msg_da
 }
 
 
-void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	msg_data->queued_count++;
 	msg_data->queued_bytes += msg->base_msg->msg.payloadlen;
@@ -169,7 +169,7 @@ void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mos
 	}
 }
 
-static void db__msg_remove_from_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+static void db__msg_remove_from_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	msg_data->queued_count--;
 	msg_data->queued_bytes -= msg->base_msg->msg.payloadlen;
@@ -328,7 +328,7 @@ void db__msg_store_compact(void)
 }
 
 
-static void db__message_remove_inflight(struct mosquitto *context, struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *item)
+static void db__message_remove_inflight(struct mosquitto *context, struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *item)
 {
 	if(!context || !msg_data || !item){
 		return;
@@ -346,7 +346,7 @@ static void db__message_remove_inflight(struct mosquitto *context, struct mosqui
 }
 
 
-static void db__message_remove_queued(struct mosquitto *context, struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *item)
+static void db__message_remove_queued(struct mosquitto *context, struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *item)
 {
 	if(!context || !msg_data || !item){
 		return;
@@ -366,7 +366,7 @@ static void db__message_remove_queued(struct mosquitto *context, struct mosquitt
 
 void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_data *msg_data)
 {
-	struct mosquitto_client_msg *msg;
+	struct mosquitto__client_msg *msg;
 
 	UNUSED(context);
 
@@ -384,7 +384,7 @@ void db__message_dequeue_first(struct mosquitto *context, struct mosquitto_msg_d
 
 int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state expect_state, int qos)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 	bool deleted = false;
 
 	if(!context) return MOSQ_ERR_INVAL;
@@ -446,7 +446,7 @@ int db__message_delete_outgoing(struct mosquitto *context, uint16_t mid, enum mo
 /* Only for QoS 2 messages */
 int db__message_insert_incoming(struct mosquitto *context, uint64_t cmsg_id, struct mosquitto__base_msg *base_msg, bool persist)
 {
-	struct mosquitto_client_msg *msg;
+	struct mosquitto__client_msg *msg;
 	struct mosquitto_msg_data *msg_data;
 	enum mosquitto_msg_state state = mosq_ms_invalid;
 	int rc = 0;
@@ -484,7 +484,7 @@ int db__message_insert_incoming(struct mosquitto *context, uint64_t cmsg_id, str
 	}
 #endif
 
-	msg = mosquitto__malloc(sizeof(struct mosquitto_client_msg));
+	msg = mosquitto__malloc(sizeof(struct mosquitto__client_msg));
 	if(!msg) return MOSQ_ERR_NOMEM;
 	msg->prev = NULL;
 	msg->next = NULL;
@@ -528,7 +528,7 @@ int db__message_insert_incoming(struct mosquitto *context, uint64_t cmsg_id, str
 
 int db__message_insert_outgoing(struct mosquitto *context, uint64_t cmsg_id, uint16_t mid, uint8_t qos, bool retain, struct mosquitto__base_msg *base_msg, uint32_t subscription_identifier, bool update, bool persist)
 {
-	struct mosquitto_client_msg *msg;
+	struct mosquitto__client_msg *msg;
 	struct mosquitto_msg_data *msg_data;
 	enum mosquitto_msg_state state = mosq_ms_invalid;
 	int rc = 0;
@@ -626,7 +626,7 @@ int db__message_insert_outgoing(struct mosquitto *context, uint64_t cmsg_id, uin
 	}
 #endif
 
-	msg = mosquitto__malloc(sizeof(struct mosquitto_client_msg));
+	msg = mosquitto__malloc(sizeof(struct mosquitto__client_msg));
 	if(!msg) return MOSQ_ERR_NOMEM;
 	msg->prev = NULL;
 	msg->next = NULL;
@@ -707,7 +707,7 @@ int db__message_insert_outgoing(struct mosquitto *context, uint64_t cmsg_id, uin
 
 int db__message_update_outgoing(struct mosquitto *context, uint16_t mid, enum mosquitto_msg_state state, int qos, bool persist)
 {
-	struct mosquitto_client_msg *tail;
+	struct mosquitto__client_msg *tail;
 
 	DL_FOREACH(context->msgs_out.inflight, tail){
 		if(tail->mid == mid){
@@ -725,9 +725,9 @@ int db__message_update_outgoing(struct mosquitto *context, uint16_t mid, enum mo
 }
 
 
-static void db__messages_delete_list(struct mosquitto_client_msg **head)
+static void db__messages_delete_list(struct mosquitto__client_msg **head)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 
 	DL_FOREACH_SAFE(*head, tail, tmp){
 		DL_DELETE(*head, tail);
@@ -966,7 +966,7 @@ int db__message_store(const struct mosquitto *source, struct mosquitto__base_msg
 
 int db__message_store_find(struct mosquitto *context, uint16_t mid, struct mosquitto__base_msg **base_msg)
 {
-	struct mosquitto_client_msg *tail;
+	struct mosquitto__client_msg *tail;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
@@ -992,7 +992,7 @@ int db__message_store_find(struct mosquitto *context, uint16_t mid, struct mosqu
  * retry, and to set incoming messages to expect an appropriate retry. */
 static int db__message_reconnect_reset_outgoing(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *msg, *tmp;
+	struct mosquitto__client_msg *msg, *tmp;
 
 	context->msgs_out.inflight_bytes = 0;
 	context->msgs_out.inflight_bytes12 = 0;
@@ -1059,7 +1059,7 @@ static int db__message_reconnect_reset_outgoing(struct mosquitto *context)
 /* Called on reconnect to set incoming messages to expect an appropriate retry. */
 static int db__message_reconnect_reset_incoming(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *msg, *tmp;
+	struct mosquitto__client_msg *msg, *tmp;
 
 	context->msgs_in.inflight_bytes = 0;
 	context->msgs_in.inflight_bytes12 = 0;
@@ -1128,7 +1128,7 @@ int db__message_reconnect_reset(struct mosquitto *context)
 
 int db__message_remove_incoming(struct mosquitto* context, uint16_t mid)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 
 	if(!context) return MOSQ_ERR_INVAL;
 
@@ -1148,7 +1148,7 @@ int db__message_remove_incoming(struct mosquitto* context, uint16_t mid)
 
 int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 	int retain;
 	char *topic;
 	char *source_id;
@@ -1207,7 +1207,7 @@ int db__message_release_incoming(struct mosquitto *context, uint16_t mid)
 
 void db__expire_all_messages(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *msg, *tmp;
+	struct mosquitto__client_msg *msg, *tmp;
 
 	DL_FOREACH_SAFE(context->msgs_out.inflight, msg, tmp){
 		if(msg->base_msg->msg.expiry_time && db.now_real_s > msg->base_msg->msg.expiry_time){
@@ -1238,7 +1238,7 @@ void db__expire_all_messages(struct mosquitto *context)
 }
 
 
-static int db__message_write_inflight_out_single(struct mosquitto *context, struct mosquitto_client_msg *msg)
+static int db__message_write_inflight_out_single(struct mosquitto *context, struct mosquitto__client_msg *msg)
 {
 	mosquitto_property *base_msg_props = NULL;
 	int rc;
@@ -1337,7 +1337,7 @@ static int db__message_write_inflight_out_single(struct mosquitto *context, stru
 
 int db__message_write_inflight_out_all(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 	int rc;
 
 	if(context->state != mosq_cs_active || !net__is_connected(context)){
@@ -1354,7 +1354,7 @@ int db__message_write_inflight_out_all(struct mosquitto *context)
 
 int db__message_write_inflight_out_latest(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *tail, *next;
+	struct mosquitto__client_msg *tail, *next;
 	int rc;
 
 	if(context->state != mosq_cs_active
@@ -1399,7 +1399,7 @@ int db__message_write_inflight_out_latest(struct mosquitto *context)
 
 int db__message_write_queued_in(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 	int rc;
 
 	if(context->state != mosq_cs_active){
@@ -1430,7 +1430,7 @@ int db__message_write_queued_in(struct mosquitto *context)
 
 int db__message_write_queued_out(struct mosquitto *context)
 {
-	struct mosquitto_client_msg *tail, *tmp;
+	struct mosquitto__client_msg *tail, *tmp;
 
 	if(context->state != mosq_cs_active){
 		return MOSQ_ERR_SUCCESS;
diff --git a/src/handle_connect.c b/src/handle_connect.c
index 08c6a5f5..28c31849 100644
--- a/src/handle_connect.c
+++ b/src/handle_connect.c
@@ -83,9 +83,9 @@ static char *client_id_gen(uint16_t *idlen, const char *auto_id_prefix, uint16_t
 
 /* Remove any queued messages that are no longer allowed through ACL,
  * assuming a possible change of username. */
-static void connection_check_acl(struct mosquitto *context, struct mosquitto_client_msg **head)
+static void connection_check_acl(struct mosquitto *context, struct mosquitto__client_msg **head)
 {
-	struct mosquitto_client_msg *msg_tail, *tmp;
+	struct mosquitto__client_msg *msg_tail, *tmp;
 	int access;
 
 	DL_FOREACH_SAFE((*head), msg_tail, tmp){
diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
index 3c1ffafb..b098b216 100644
--- a/src/mosquitto_broker_internal.h
+++ b/src/mosquitto_broker_internal.h
@@ -419,9 +419,9 @@ struct mosquitto__base_msg{
 	bool stored;
 };
 
-struct mosquitto_client_msg{
-	struct mosquitto_client_msg *prev;
-	struct mosquitto_client_msg *next;
+struct mosquitto__client_msg{
+	struct mosquitto__client_msg *prev;
+	struct mosquitto__client_msg *next;
 	struct mosquitto__base_msg *base_msg;
 	uint64_t cmsg_id;
 	uint32_t subscription_identifier;
@@ -745,8 +745,8 @@ int db__message_write_inflight_out_all(struct mosquitto *context);
 int db__message_write_inflight_out_latest(struct mosquitto *context);
 int db__message_write_queued_out(struct mosquitto *context);
 int db__message_write_queued_in(struct mosquitto *context);
-void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg);
-void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg);
+void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg);
+void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg);
 uint64_t db__new_msg_id(void);
 void db__expire_all_messages(struct mosquitto *context);
 
@@ -869,9 +869,9 @@ void plugin_persist__handle_client_delete(struct mosquitto *context);
 void plugin_persist__handle_client_update(struct mosquitto *context);
 void plugin_persist__handle_subscription_add(struct mosquitto *context, const struct mosquitto_subscription *sub);
 void plugin_persist__handle_subscription_delete(struct mosquitto *context, char *sub);
-void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto_client_msg *cmsg);
-void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto_client_msg *cmsg);
-void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto_client_msg *cmsg);
+void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto__client_msg *cmsg);
+void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto__client_msg *cmsg);
+void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto__client_msg *cmsg);
 void plugin_persist__handle_base_msg_add(struct mosquitto__base_msg *base_msg);
 void plugin_persist__handle_base_msg_delete(struct mosquitto__base_msg *base_msg);
 void plugin_persist__handle_retain_msg_set(struct mosquitto__base_msg *base_msg);
diff --git a/src/persist_read.c b/src/persist_read.c
index fcc8a616..cbbc7d5d 100644
--- a/src/persist_read.c
+++ b/src/persist_read.c
@@ -116,7 +116,7 @@ int persist__read_string(FILE *db_fptr, char **str)
 
 static int persist__client_msg_restore(struct P_client_msg *chunk)
 {
-	struct mosquitto_client_msg *cmsg;
+	struct mosquitto__client_msg *cmsg;
 	struct mosquitto__base_msg *msg;
 	struct mosquitto *context;
 	struct mosquitto_msg_data *msg_data;
@@ -133,7 +133,7 @@ static int persist__client_msg_restore(struct P_client_msg *chunk)
 		return 0;
 	}
 
-	cmsg = mosquitto__calloc(1, sizeof(struct mosquitto_client_msg));
+	cmsg = mosquitto__calloc(1, sizeof(struct mosquitto__client_msg));
 	if(!cmsg){
 		log__printf(NULL, MOSQ_LOG_ERR, "Error: Out of memory.");
 		return MOSQ_ERR_NOMEM;
diff --git a/src/persist_write.c b/src/persist_write.c
index ff381155..a0e168e6 100644
--- a/src/persist_write.c
+++ b/src/persist_write.c
@@ -38,10 +38,10 @@ Contributors:
 #include "misc_mosq.h"
 #include "util_mosq.h"
 
-static int persist__client_messages_save(FILE *db_fptr, struct mosquitto *context, struct mosquitto_client_msg *queue)
+static int persist__client_messages_save(FILE *db_fptr, struct mosquitto *context, struct mosquitto__client_msg *queue)
 {
 	struct P_client_msg chunk;
-	struct mosquitto_client_msg *cmsg;
+	struct mosquitto__client_msg *cmsg;
 	int rc;
 
 	assert(db_fptr);
diff --git a/src/plugin_persist.c b/src/plugin_persist.c
index 362ee1a5..d0308802 100644
--- a/src/plugin_persist.c
+++ b/src/plugin_persist.c
@@ -183,7 +183,7 @@ void plugin_persist__handle_subscription_delete(struct mosquitto *context, char
 }
 
 
-void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	struct mosquitto_evt_persist_client_msg event_data;
 	struct mosquitto__callback *cb_base;
@@ -215,7 +215,7 @@ void plugin_persist__handle_client_msg_add(struct mosquitto *context, const stru
 }
 
 
-void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	struct mosquitto_evt_persist_client_msg event_data;
 	struct mosquitto__callback *cb_base;
@@ -245,7 +245,7 @@ void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const s
 }
 
 
-void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	struct mosquitto_evt_persist_client_msg event_data;
 	struct mosquitto__callback *cb_base;
diff --git a/test/unit/persist_read_stubs.c b/test/unit/persist_read_stubs.c
index e9181ae0..a2a4af6f 100644
--- a/test/unit/persist_read_stubs.c
+++ b/test/unit/persist_read_stubs.c
@@ -201,13 +201,13 @@ void callback__on_disconnect(struct mosquitto *mosq, int rc, const mosquitto_pro
 	UNUSED(props);
 }
 
-void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+void db__msg_add_to_inflight_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	UNUSED(msg_data);
 	UNUSED(msg);
 }
 
-void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto_client_msg *msg)
+void db__msg_add_to_queued_stats(struct mosquitto_msg_data *msg_data, struct mosquitto__client_msg *msg)
 {
 	UNUSED(msg_data);
 	UNUSED(msg);
diff --git a/test/unit/persist_write_stubs.c b/test/unit/persist_write_stubs.c
index eed0d24b..07237e3c 100644
--- a/test/unit/persist_write_stubs.c
+++ b/test/unit/persist_write_stubs.c
@@ -189,17 +189,17 @@ void context__send_will(struct mosquitto *context)
 	UNUSED(context);
 }
 
-void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);
 }
-void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);
 }
-void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);
diff --git a/test/unit/subs_stubs.c b/test/unit/subs_stubs.c
index 5c2688c9..1a274b72 100644
--- a/test/unit/subs_stubs.c
+++ b/test/unit/subs_stubs.c
@@ -186,17 +186,17 @@ int util__random_bytes(void *bytes, int count)
 	return MOSQ_ERR_SUCCESS;
 }
 
-void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_add(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);
 }
-void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_delete(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);
 }
-void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto_client_msg *cmsg)
+void plugin_persist__handle_client_msg_update(struct mosquitto *context, const struct mosquitto__client_msg *cmsg)
 {
 	UNUSED(context);
 	UNUSED(cmsg);