From 44b601bc79e46722bc0f0862ee0ce34a2284ef11 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 16 Oct 2013 03:17:09 +0200
Subject: macro: clean up usage of gcc attributes

Always use our own macros, and name all our own macros the same style.
---
 src/journal/journal-send.c    | 2 +-
 src/journal/journald-server.h | 2 +-
 src/journal/microhttpd-util.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/journal')

diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index d00e26f1eb..52f9905c4e 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -111,7 +111,7 @@ _public_ int sd_journal_printv(int priority, const char *format, va_list ap) {
         return sd_journal_sendv(iov, 2);
 }
 
-_printf_attr_(1, 0) static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct iovec **_iov) {
+_printf_(1, 0) static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct iovec **_iov) {
         PROTECT_ERRNO;
         int r, n = 0, i = 0, j;
         struct iovec *iov = NULL;
diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h
index 10e9958be0..069cd173c8 100644
--- a/src/journal/journald-server.h
+++ b/src/journal/journald-server.h
@@ -128,7 +128,7 @@ typedef struct Server {
 #define N_IOVEC_OBJECT_FIELDS 11
 
 void server_dispatch_message(Server *s, struct iovec *iovec, unsigned n, unsigned m, struct ucred *ucred, struct timeval *tv, const char *label, size_t label_len, const char *unit_id, int priority, pid_t object_pid);
-void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_attr_(3,4);
+void server_driver_message(Server *s, sd_id128_t message_id, const char *format, ...) _printf_(3,4);
 
 /* gperf lookup function */
 const struct ConfigPerfItem* journald_gperf_lookup(const char *key, unsigned length);
diff --git a/src/journal/microhttpd-util.h b/src/journal/microhttpd-util.h
index 20ad76990c..74d1668bdf 100644
--- a/src/journal/microhttpd-util.h
+++ b/src/journal/microhttpd-util.h
@@ -25,4 +25,4 @@
 
 #include "macro.h"
 
-void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_attr_(2, 0);
+void microhttpd_logger(void *arg, const char *fmt, va_list ap) _printf_(2, 0);
-- 
cgit v1.2.3-54-g00ecf