Fix inconsistent sign in log__printf declaration.

eclipse · Mar 20, 2021 · cca41d1 · cca41d1
1 parent 9989a35
commit cca41d1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/lib/logging_mosq.c b/lib/logging_mosq.c
@@ -23,11 +23,12 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include <stdio.h>
 #include <string.h>
 
+#include "logging_mosq.h"
 #include "mosquitto_internal.h"
 #include "mosquitto.h"
 #include "memory_mosq.h"
 
-int log__printf(struct mosquitto *mosq, int priority, const char *fmt, ...)
+int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, ...)
 {
  va_list va;
  char *s;
@@ -50,7 +51,7 @@ int log__printf(struct mosquitto *mosq, int priority, const char *fmt, ...)
  va_end(va);
  s[len-1] = '\0'; /* Ensure string is null terminated. */
 
- mosq->on_log(mosq, mosq->userdata, priority, s);
+ mosq->on_log(mosq, mosq->userdata, (int)priority, s);
 
  mosquitto__free(s);
  }

diff --git a/lib/logging_mosq.h b/lib/logging_mosq.h
@@ -20,6 +20,10 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
 #include "mosquitto.h"
 
-int log__printf(struct mosquitto *mosq, unsigned int priority, const char *fmt, ...);
+#ifndef __GNUC__
+#define __attribute__(attrib)
+#endif
+
+int log__printf(struct mosquitto *mosq, unsigned int level, const char *fmt, ...) __attribute__((format(printf, 3, 4)));
 
 #endif
diff --git a/src/logging.c b/src/logging.c
@@ -34,6 +34,7 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include <dlt/dlt.h>
 #endif
 
+#include "logging_mosq.h"
 #include "mosquitto_broker_internal.h"
 #include "memory_mosq.h"
 #include "misc_mosq.h"

diff --git a/src/mosquitto_broker_internal.h b/src/mosquitto_broker_internal.h
@@ -34,6 +34,7 @@ SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 #include "mosquitto_broker.h"
 #include "mosquitto_plugin.h"
 #include "mosquitto.h"
+#include "logging_mosq.h"
 #include "password_mosq.h"
 #include "tls_mosq.h"
 #include "uthash.h"
@@ -709,7 +710,6 @@ int control__unregister_callback(struct mosquitto__security_options *opts, MOSQ_
  * ============================================================ */
 int log__init(struct mosquitto__config *config);
 int log__close(struct mosquitto__config *config);
-int log__printf(struct mosquitto *mosq, unsigned int level, const char *fmt, ...) __attribute__((format(printf, 3, 4)));
 void log__internal(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
 
 /* ============================================================