From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 7 Dec 2019 22:47:16 +0000 (+0100)
Subject: tree-wide: s/__unused/__lxc_unused/g
X-Git-Tag: lxc-4.0.0~78^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=53675a8d1fcd34ae0316e7e75f5ec72449c7bfd8;p=thirdparty%2Flxc.git

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 2774c6334..ad9ac9033 100644
--- 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 b5df492fe..db4129493 100644
--- 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 3dd96bc35..851518b11 100644
--- 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;