bus: _printf_ attributes should be on prototypes not function definitions for non...

diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c
index 5675af4a19068afabcb3852ca3eda2c573fcd055..c45d0df722c0d708bfd8338232bd9634364182ab 100644 (file)
--- a/src/journal/microhttpd-util.c
+++ b/src/journal/microhttpd-util.c
@@ -29,7 +29,6 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"

-_printf_(2,0)

 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         _cleanup_free_ char *f;
         if (asprintf(&f, "microhttpd: %s", fmt) <= 0) {
 void microhttpd_logger(void *arg, const char *fmt, va_list ap) {
         _cleanup_free_ char *f;
         if (asprintf(&f, "microhttpd: %s", fmt) <= 0) {

diff --git a/src/libsystemd-bus/bus-error.c b/src/libsystemd-bus/bus-error.c
index 2d1e80dc0609e952687d5d9e55bf6a059acdca89..25eaf0eee4961563535afc95b55e1ced63145169 100644 (file)
--- a/src/libsystemd-bus/bus-error.c
+++ b/src/libsystemd-bus/bus-error.c
@@ -250,7 +250,6 @@ finish:
         return -bus_error_name_to_errno(name);
 }
 
         return -bus_error_name_to_errno(name);
 }
 

-_printf_(3,0)

 int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_list ap) {
 
         if (!name)
 int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_list ap) {
 
         if (!name)


@@ -464,7 +463,6 @@ _public_ int sd_bus_error_set_errno(sd_bus_error *e, int error) {
         return -error;
 }
 
         return -error;
 }
 

-_printf_(3,0)

 int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap) {
         int r;
 
 int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap) {
         int r;
 

diff --git a/src/libsystemd-bus/bus-error.h b/src/libsystemd-bus/bus-error.h
index f442e953e008423d951cc29992aec824289f4c92..f6b9824c9591a5077d25e54368ffc255c6c2b0e1 100644 (file)
--- a/src/libsystemd-bus/bus-error.h
+++ b/src/libsystemd-bus/bus-error.h
@@ -24,10 +24,11 @@
 #include <stdbool.h>
 
 #include "sd-bus.h"
 #include <stdbool.h>
 
 #include "sd-bus.h"

+#include "macro.h"

 
 bool bus_error_is_dirty(sd_bus_error *e);
 
 const char *bus_error_message(const sd_bus_error *e, int error);
 
 
 bool bus_error_is_dirty(sd_bus_error *e);
 
 const char *bus_error_message(const sd_bus_error *e, int error);
 

-int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_list ap);
-int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap);
+int bus_error_setfv(sd_bus_error *e, const char *name, const char *format, va_list ap) _printf_(3,0);
+int bus_error_set_errnofv(sd_bus_error *e, int error, const char *format, va_list ap) _printf_(3,0);