d0kuhn/mosquitto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inconsistent sign in log__printf declaration.

Browse Source
This commit is contained in:
Roger Light 2021-03-20 19:16:13 +00:00
parent 9989a3502d
commit cca41d176d
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/logging_mosq.c
View File

@ -23,11 +23,12 @@ Contributors:
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include "logging_mosq.h"
#include "mosquitto_internal.h" #include "mosquitto_internal.h"
#include "mosquitto.h" #include "mosquitto.h"
#include "memory_mosq.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; va_list va;
char *s; char *s;
@ -50,7 +51,7 @@ int log__printf(struct mosquitto *mosq, int priority, const char *fmt, ...)
va_end(va); va_end(va);
s[len-1] = '\0'; /* Ensure string is null terminated. */ 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); mosquitto__free(s);
} }

6
lib/logging_mosq.h
View File

@ -20,6 +20,10 @@ Contributors:
#include "mosquitto.h" #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 #endif

1
src/logging.c
View File

@ -34,6 +34,7 @@ Contributors:
#include <dlt/dlt.h> #include <dlt/dlt.h>
#endif #endif
#include "logging_mosq.h"
#include "mosquitto_broker_internal.h" #include "mosquitto_broker_internal.h"
#include "memory_mosq.h" #include "memory_mosq.h"
#include "misc_mosq.h" #include "misc_mosq.h"

2
src/mosquitto_broker_internal.h
View File

@ -34,6 +34,7 @@ Contributors:
#include "mosquitto_broker.h" #include "mosquitto_broker.h"
#include "mosquitto_plugin.h" #include "mosquitto_plugin.h"
#include "mosquitto.h" #include "mosquitto.h"
#include "logging_mosq.h"
#include "password_mosq.h" #include "password_mosq.h"
#include "tls_mosq.h" #include "tls_mosq.h"
#include "uthash.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__init(struct mosquitto__config *config);
int log__close(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))); void log__internal(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
/* ============================================================ /* ============================================================