[systemd-commits] src/journal src/libsystemd-bus

[Lennart Poettering]

 src/journal/microhttpd-util.c  |    1 -
 src/libsystemd-bus/bus-error.c |    2 --
 src/libsystemd-bus/bus-error.h |    5 +++--
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 9bfa2c029d4367406bda9b8984e579e0b06b3b2b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sun Dec 15 23:43:47 2013 +0100

    bus: _printf_ attributes should be on prototypes not function definitions for non-static functions

diff --git a/src/journal/microhttpd-util.c b/src/journal/microhttpd-util.c
index 5675af4..c45d0df 100644
--- 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"
-_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) {
diff --git a/src/libsystemd-bus/bus-error.c b/src/libsystemd-bus/bus-error.c
index 2d1e80d..25eaf0e 100644
--- 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);
 }
 
-_printf_(3,0)
 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;
 }
 
-_printf_(3,0)
 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 f442e95..f6b9824 100644
--- 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 "macro.h"
 
 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);