tree-wide: s/__unused/__lxc_unused/g

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/compiler.h b/src/lxc/compiler.h
index 2774c6334dc7781ff995b13f81076c45bb95b306..ad9ac9033aabc3940819eb3b42e67d7761fc5179 100644 (file)
--- a/src/lxc/compiler.h
+++ b/src/lxc/compiler.h
@@ -47,9 +47,9 @@
 
 /* This attribute is required to silence clang warnings */
 #if defined(__GNUC__)
-#define __unused __attribute__ ((unused))
+#define __lxc_unused __attribute__ ((unused))
 #else
-#define __unused
+#define __lxc_unused
 #endif
 
 #define __cgfsng_ops

diff --git a/src/lxc/log.h b/src/lxc/log.h
index b5df492fecc0bb686b2c86b1c33f326bcebc2338..db4129493ddecda3f88dcfbcf52ba8fe97a32916 100644 (file)
--- a/src/lxc/log.h
+++ b/src/lxc/log.h
@@ -238,10 +238,10 @@ static inline void __lxc_log(const struct lxc_log_category *category,
  */
 #define lxc_log_priority_define(acategory, LEVEL)                              \
                                                                                \
-__unused __attribute__ ((format (printf, 2, 3)))                               \
+__lxc_unused __attribute__ ((format (printf, 2, 3)))                           \
 static inline void LXC_##LEVEL(struct lxc_log_locinfo *, const char *, ...);   \
                                                                                \
-__unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,       \
+__lxc_unused static inline void LXC_##LEVEL(struct lxc_log_locinfo* locinfo,   \
                                           const char* format, ...)             \
 {                                                                              \
        if (lxc_log_priority_is_enabled(acategory, LXC_LOG_LEVEL_##LEVEL)) {    \

diff --git a/src/lxc/start.c b/src/lxc/start.c
index 3dd96bc354e9b0f16b3ebb65997800efdf2f18b3..851518b116b0d6da28b2fc784d6212dfb7f76254 100644 (file)
--- a/src/lxc/start.c
+++ b/src/lxc/start.c
@@ -1119,7 +1119,7 @@ void lxc_abort(const char *name, struct lxc_handler *handler)
 static int do_start(void *data)
 {
        struct lxc_handler *handler = data;
-       __unused __do_close_prot_errno int data_sock0 = handler->data_sock[0],
+       __lxc_unused __do_close_prot_errno int data_sock0 = handler->data_sock[0],
                                           data_sock1 = handler->data_sock[1];
        __do_close_prot_errno int status_fd = -EBADF;
        int ret;