cleanup: function attribute 'format'

Function attributes should be located after the declaration.

Change-Id: I1c1622b3102f4a9d2fc5df35b5dfc290abac48aa
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/demo-tracef/demo-vtracef.c b/doc/examples/demo-tracef/demo-vtracef.c
index dc094ce470be987f80d05abd7b8cfdf51e984757..8fe8bb36d27a4bd55da56ac4d0b1d5fa1155f24d 100644 (file)
--- a/doc/examples/demo-tracef/demo-vtracef.c
+++ b/doc/examples/demo-tracef/demo-vtracef.c
@@ -11,7 +11,10 @@
 
 #include <lttng/tracef.h>
 
-__attribute__((format(printf, 1, 2)))
+static
+void print_debug(const char* msg, ...)
+       __attribute__((format(printf, 1, 2)));
+static
 void print_debug(const char* msg, ...)
 {
        va_list ap;

diff --git a/doc/examples/demo-tracelog/demo-vtracelog.c b/doc/examples/demo-tracelog/demo-vtracelog.c
index eed8677c4d4beb67da7dac7d2fa215cbd118a47d..c396a3002c7aed57faa1bf1dcc36842441976a86 100644 (file)
--- a/doc/examples/demo-tracelog/demo-vtracelog.c
+++ b/doc/examples/demo-tracelog/demo-vtracelog.c
@@ -11,7 +11,10 @@
 
 #include <lttng/tracelog.h>
 
-__attribute__((format(printf, 1, 2)))
+static
+void print_err(const char* msg, ...)
+       __attribute__((format(printf, 1, 2)));
+static
 void print_err(const char* msg, ...)
 {
        va_list ap;

diff --git a/include/lttng/tracef.h b/include/lttng/tracef.h
index 2b57ca8c38406ae586bdd4ef8c530add556375f5..1b455063915863f645fcc6e6d2d479fb03a60856 100644 (file)
--- a/include/lttng/tracef.h
+++ b/include/lttng/tracef.h
@@ -14,12 +14,12 @@ extern "C" {
 #endif
 
 extern
-__attribute__((format(printf, 1, 2)))
-void _lttng_ust_tracef(const char *fmt, ...);
+void _lttng_ust_tracef(const char *fmt, ...)
+       __attribute__((format(printf, 1, 2)));
 
 extern
-__attribute__((format(printf, 1, 0)))
-void _lttng_ust_vtracef(const char *fmt, va_list ap);
+void _lttng_ust_vtracef(const char *fmt, va_list ap)
+       __attribute__((format(printf, 1, 0)));
 
 #define tracef(fmt, ...)                                               \
        do {                                                            \

diff --git a/include/lttng/tracelog.h b/include/lttng/tracelog.h
index e80f23813b250cb58244128b15d7a8293674ce17..336911f4d5b243befd7c3a611a312fdce0138991 100644 (file)
--- a/include/lttng/tracelog.h
+++ b/include/lttng/tracelog.h
@@ -14,12 +14,14 @@ extern "C" {
 #endif
 
 #define TP_TRACELOG_CB_TEMPLATE(level)                                 \
-       __attribute__ ((format(printf, 4, 5)))                          \
        extern void _lttng_ust_tracelog_##level(const char *file,       \
-               int line, const char *func, const char *fmt, ...);      \
-       __attribute__ ((format(printf, 4, 0)))                          \
+               int line, const char *func, const char *fmt, ...)       \
+               __attribute__ ((format(printf, 4, 5)));                 \
+                                                                       \
        extern void _lttng_ust_vtracelog_##level(const char *file,      \
-               int line, const char *func, const char *fmt, va_list ap);
+               int line, const char *func, const char *fmt,            \
+               va_list ap)                                             \
+               __attribute__ ((format(printf, 4, 0)));
 
 TP_TRACELOG_CB_TEMPLATE(TRACE_EMERG);
 TP_TRACELOG_CB_TEMPLATE(TRACE_ALERT);

diff --git a/liblttng-ust/tracef.c b/liblttng-ust/tracef.c
index 0ce6d11f441e5c63bdd5ccb18093bcc88f232a27..f9f8274d476e9e1c0ea8e89df9dbc7657bd84caa 100644 (file)
--- a/liblttng-ust/tracef.c
+++ b/liblttng-ust/tracef.c
@@ -12,7 +12,10 @@
 #define TRACEPOINT_DEFINE
 #include "lttng-ust-tracef-provider.h"
 
-static inline __attribute__((always_inline, format(printf, 1, 0)))
+static inline
+void __lttng_ust_vtracef(const char *fmt, va_list ap)
+       __attribute__((always_inline, format(printf, 1, 0)));
+static inline
 void __lttng_ust_vtracef(const char *fmt, va_list ap)
 {
        char *msg;
@@ -28,15 +31,15 @@ end:
        return;
 }
 
-__attribute__((format(printf, 1, 0)))
-void _lttng_ust_vtracef(const char *fmt, va_list ap);
+void _lttng_ust_vtracef(const char *fmt, va_list ap)
+       __attribute__((format(printf, 1, 0)));
 void _lttng_ust_vtracef(const char *fmt, va_list ap)
 {
        __lttng_ust_vtracef(fmt, ap);
 }
 
-__attribute__((format(printf, 1, 2)))
-void _lttng_ust_tracef(const char *fmt, ...);
+void _lttng_ust_tracef(const char *fmt, ...)
+       __attribute__((format(printf, 1, 2)));
 void _lttng_ust_tracef(const char *fmt, ...)
 {
        va_list ap;

diff --git a/liblttng-ust/tracelog.c b/liblttng-ust/tracelog.c
index 1f18853ff1b49c78c4898b17f4ef30362994a005..307e0fce2fe434a3e55e00b6b6d3d52eb5ed588d 100644 (file)
--- a/liblttng-ust/tracelog.c
+++ b/liblttng-ust/tracelog.c
@@ -13,7 +13,13 @@
 #include "lttng-ust-tracelog-provider.h"
 
 #define TRACELOG_CB(level) \
-       static inline __attribute__((always_inline, format(printf, 4, 0))) \
+       static inline \
+       void __lttng_ust_vtracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, va_list ap) \
+               __attribute__((always_inline, format(printf, 4, 0))); \
+       \
+       static inline \
        void __lttng_ust_vtracelog_##level(const char *file, \
                        int line, const char *func, \
                        const char *fmt, va_list ap) \
@@ -32,7 +38,11 @@
                return; \
        } \
        \
-       __attribute__ ((format(printf, 4, 0))) \
+       void _lttng_ust_vtracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, va_list ap) \
+               __attribute__ ((format(printf, 4, 0))); \
+       \
        void _lttng_ust_vtracelog_##level(const char *file, \
                        int line, const char *func, \
                        const char *fmt, va_list ap) \
@@ -40,7 +50,11 @@
                __lttng_ust_vtracelog_##level(file, line, func, fmt, ap); \
        } \
        \
-       __attribute__ ((format(printf, 4, 5))) \
+       void _lttng_ust_tracelog_##level(const char *file, \
+                       int line, const char *func, \
+                       const char *fmt, ...) \
+               __attribute__ ((format(printf, 4, 5))); \
+       \
        void _lttng_ust_tracelog_##level(const char *file, \
                        int line, const char *func, \
                        const char *fmt, ...) \