[Minor] enable Wmissing-format-attribute

diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
index 2dcad92ef4d50e921933f5b6c425ea4ce81eae33..fe6735c354dd58f077bd1209e41ab0bbe6ca331e 100644 (file)
--- a/cmake/CompilerWarnings.cmake
+++ b/cmake/CompilerWarnings.cmake
@@ -11,6 +11,7 @@ CHECK_C_COMPILER_FLAG(-Wstrict-prototypes SUPPORT_WSTRICT_PROTOTYPES)
 CHECK_C_COMPILER_FLAG(-pedantic SUPPORT_PEDANTIC_FLAG)
 CHECK_C_COMPILER_FLAG(-Wno-unused-const-variable SUPPORT_WNO_UNUSED_CONST)
 CHECK_C_COMPILER_FLAG(-Wmissing-noreturn SUPPORT_WMISSING_NORETURN)
+CHECK_C_COMPILER_FLAG(-Wmissing-format-attribute SUPPORT_WMISSING_FORMAT_ATTRIBUTE)
 # GCC 6 specific
 CHECK_C_COMPILER_FLAG(-Wnull-dereference SUPPORT_WNULL_DEREFERENCE)
 CHECK_C_COMPILER_FLAG(-Wduplicated-cond SUPPORT_WDUPLICATED_COND)
@@ -71,6 +72,9 @@ ENDIF(SUPPORT_WIMPLICIT_FALLTHROUGH)
 IF(SUPPORT_WMISSING_NORETURN)
     ADD_COMPILE_OPTIONS("-Wmissing-noreturn")
 ENDIF(SUPPORT_WMISSING_NORETURN)
+IF(SUPPORT_WMISSING_FORMAT_ATTRIBUTE)
+    ADD_COMPILE_OPTIONS("-Wmissing-format-attribute")
+ENDIF(SUPPORT_WMISSING_FORMAT_ATTRIBUTE)
 
 CHECK_C_COMPILER_FLAG(-fPIC SUPPORT_FPIC)
 IF(SUPPORT_FPIC)

diff --git a/contrib/hiredis/async.h b/contrib/hiredis/async.h
index 3d20241c6e117412d5f24d6c0374576aa649b906..40a5a49c83e6e1f715b4dc41ab3178cddc505e5a 100644 (file)
--- a/contrib/hiredis/async.h
+++ b/contrib/hiredis/async.h
@@ -119,7 +119,13 @@ void redisAsyncHandleWrite(redisAsyncContext *ac);
 
 /* Command functions for an async context. Write the command to the
  * output buffer and register the provided callback. */
+#ifdef __GNUC__
+__attribute__((format(printf, 4, 0)))
+#endif
 int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap);
+#ifdef __GNUC__
+__attribute__((format(printf, 4, 5)))
+#endif
 int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...);
 int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen);
 int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len);

diff --git a/contrib/hiredis/hiredis.h b/contrib/hiredis/hiredis.h
index 153bfd7a63c2cf90388f6dc61253b0d28955d973..6b531b9105453526d6fd46c204d52e41da2e4ca8 100644 (file)
--- a/contrib/hiredis/hiredis.h
+++ b/contrib/hiredis/hiredis.h
@@ -125,7 +125,13 @@ redisReader *redisReaderCreate(void);
 void freeReplyObject(void *reply);
 
 /* Functions to format a command according to the protocol. */
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 0)))
+#endif
 int redisvFormatCommand(char **target, const char *format, va_list ap);
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 3)))
+#endif
 int redisFormatCommand(char **target, const char *format, ...);
 int redisFormatCommandArgv(char **target, int argc, const char **argv, const size_t *argvlen);
 int redisFormatSdsCommandArgv(sds *target, int argc, const char ** argv, const size_t *argvlen);
@@ -204,7 +210,13 @@ int redisAppendFormattedCommand(redisContext *c, const char *cmd, size_t len);
 
 /* Write a command to the output buffer. Use these functions in blocking mode
  * to get a pipeline of commands. */
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 0)))
+#endif
 int redisvAppendCommand(redisContext *c, const char *format, va_list ap);
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 3)))
+#endif
 int redisAppendCommand(redisContext *c, const char *format, ...);
 int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
 
@@ -213,7 +225,13 @@ int redisAppendCommandArgv(redisContext *c, int argc, const char **argv, const s
  * NULL if there was an error in performing the request, otherwise it will
  * return the reply. In a non-blocking context, it is identical to calling
  * only redisAppendCommand and will always return NULL. */
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 0)))
+#endif
 void *redisvCommand(redisContext *c, const char *format, va_list ap);
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 3)))
+#endif
 void *redisCommand(redisContext *c, const char *format, ...);
 void *redisCommandArgv(redisContext *c, int argc, const char **argv, const size_t *argvlen);
 

diff --git a/contrib/hiredis/sds.h b/contrib/hiredis/sds.h
index 19a2abd317fd4e3a6d3f157f3adc745a23fbc484..a494f2efc5d50ee26b78e469c94d841881410440 100644 (file)
--- a/contrib/hiredis/sds.h
+++ b/contrib/hiredis/sds.h
@@ -71,6 +71,9 @@ sds sdscatsds(sds s, const sds t);
 sds sdscpylen(sds s, const char *t, size_t len);
 sds sdscpy(sds s, const char *t);
 
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 0)))
+#endif
 sds sdscatvprintf(sds s, const char *fmt, va_list ap);
 #ifdef __GNUC__
 sds sdscatprintf(sds s, const char *fmt, ...)

diff --git a/contrib/librdns/dns_private.h b/contrib/librdns/dns_private.h
index f734e231201b605ab007bfad75a3ef896f3930c4..3f0bee43728d01c477ed27d0ba16569311d01870 100644 (file)
--- a/contrib/librdns/dns_private.h
+++ b/contrib/librdns/dns_private.h
@@ -138,6 +138,9 @@ struct rdns_resolver {
        struct rdns_plugin *curve_plugin;
        struct rdns_fake_reply *fake_elts;
 
+#ifdef __GNUC__
+       __attribute__((format(printf, 4, 0)))
+#endif
        rdns_log_function logger;
        void *log_data;
        enum rdns_log_level log_level;

diff --git a/contrib/librdns/logger.h b/contrib/librdns/logger.h
index f9c33bbe4c9cce0f94b6e2d264bf4e635410992f..80728763e6e2b12199bed00f44ed3ba2d6d204fe 100644 (file)
--- a/contrib/librdns/logger.h
+++ b/contrib/librdns/logger.h
@@ -26,10 +26,16 @@
 #include <stdarg.h>
 #include "dns_private.h"
 
+#ifdef __GNUC__
+__attribute__((format(printf, 4, 0)))
+#endif
 void rdns_logger_internal (void *log_data, enum rdns_log_level level,
                const char *function, const char *format,
                va_list args);
 
+#ifdef __GNUC__
+__attribute__((format(printf, 4, 5)))
+#endif
 void rdns_logger_helper (struct rdns_resolver *resolver,
                enum rdns_log_level level,
                const char *function, const char *format, ...);

diff --git a/contrib/librdns/resolver.c b/contrib/librdns/resolver.c
index aec0e938131b27c3bbc4ba14bb5933c175cca543..98807f38ecff6257d860179a10d6753cfb95a9a8 100644 (file)
--- a/contrib/librdns/resolver.c
+++ b/contrib/librdns/resolver.c
@@ -758,14 +758,14 @@ rdns_make_request_full (
                        type = req->requested_names[i].type;
                        if (queries > 1) {
                                if (!rdns_add_rr (req, cur_name, clen, type, &comp)) {
-                                       rdns_err ("cannot add rr", cur_name);
+                                       rdns_err ("cannot add rr");
                                        REF_RELEASE (req);
                                        rnds_compression_free (comp);
                                        return NULL;
                                }
                        } else {
                                if (!rdns_add_rr (req, cur_name, clen, type, NULL)) {
-                                       rdns_err ("cannot add rr", cur_name);
+                                       rdns_err ("cannot add rr");
                                        REF_RELEASE (req);
                                        rnds_compression_free (comp);
                                        return NULL;
@@ -1125,4 +1125,4 @@ void rdns_resolver_set_fake_reply (struct rdns_resolver *resolver,
 
                HASH_ADD (hh, resolver->fake_elts, key, sizeof (*srch) + len, fake_rep);
        }
-}
\ No newline at end of file
+}

diff --git a/contrib/replxx/include/replxx.h b/contrib/replxx/include/replxx.h
index cb1c917b45e1ee1bcc9adc523b46a18b95bc9454..4bdad512775e4d66dd11421fdd2c77a668bb6451 100644 (file)
--- a/contrib/replxx/include/replxx.h
+++ b/contrib/replxx/include/replxx.h
@@ -356,6 +356,9 @@ REPLXX_IMPEXP void replxx_set_state( Replxx*, ReplxxState* state );
  *
  * \param fmt - printf style format.
  */
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 3)))
+#endif
 REPLXX_IMPEXP int replxx_print( Replxx*, char const* fmt, ... );
 
 /*! \brief Schedule an emulated key press event.

diff --git a/contrib/replxx/include/replxx.hxx b/contrib/replxx/include/replxx.hxx
index 3fe90e670af3b419b8702dfc60fa416758dac698..1401ea27c91ada666965a5e917ab2e70161cd091 100644 (file)
--- a/contrib/replxx/include/replxx.hxx
+++ b/contrib/replxx/include/replxx.hxx
@@ -370,6 +370,9 @@ public:
         *
         * \param fmt - printf style format.
         */
+#ifdef __GNUC__
+       __attribute__((format(printf, 2, 3)))
+#endif
        void print( char const* fmt, ... );
 
        /*! \brief Schedule an emulated key press event.

diff --git a/contrib/uthash/utstring.h b/contrib/uthash/utstring.h
index f11f34b77e755a9ea2b5d71ae0d382533a08c0f3..6130fac534a32695207c3503bf92ac4380e2105a 100644 (file)
--- a/contrib/uthash/utstring.h
+++ b/contrib/uthash/utstring.h
@@ -120,6 +120,9 @@ do {                                                             \
 
 #define utstring_body(s) ((s)->d)
 
+#ifdef __GNUC__
+__attribute__((format(printf, 2, 0)))
+#endif
 _UNUSED_ static void utstring_printf_va(UT_string *s, const char *fmt, va_list ap) {
    int n;
    va_list cp;

diff --git a/src/libstat/backends/redis_backend.c b/src/libstat/backends/redis_backend.c
index 107af34900ee90e22eaeb1951ec2a211a9771be6..392f1704ef007b71c8cab7a7e0c995c6408c57be 100644 (file)
--- a/src/libstat/backends/redis_backend.c
+++ b/src/libstat/backends/redis_backend.c
@@ -372,6 +372,12 @@ rspamd_redis_maybe_auth (struct redis_stat_ctx *ctx, redisAsyncContext *redis)
        }
 }
 
+// the `b` conversion type character is unknown to gcc
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat"
+#pragma GCC diagnostic ignored "-Wformat-extra-args"
+#endif
 static rspamd_fstring_t *
 rspamd_redis_tokens_to_query (struct rspamd_task *task,
                struct redis_stat_runtime *rt,
@@ -625,6 +631,9 @@ rspamd_redis_tokens_to_query (struct rspamd_task *task,
 
        return out;
 }
+#ifdef __GNUC__
+#pragma GCC diagnostic pop
+#endif
 
 static void
 rspamd_redis_store_stat_signature (struct rspamd_task *task,