From 8f5b37069693594422dfaacdece0acd54dd9ecc7 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Mar 2022 17:18:56 +0000 Subject: Silence -Wunused-but-set-variable with clang This variable is only used for lifetime tracking (autocleanup), but clang warns on that. Signed-off-by: Simon McVittie --- bubblewrap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bubblewrap.c b/bubblewrap.c index be6b81a..b17ff99 100644 --- a/bubblewrap.c +++ b/bubblewrap.c @@ -2552,7 +2552,7 @@ main (int argc, struct stat sbuf; uint64_t val; int res UNUSED; - cleanup_free char *args_data = NULL; + cleanup_free char *args_data UNUSED = NULL; int intermediate_pids_sockets[2] = {-1, -1}; /* Handle --version early on before we try to acquire/drop -- cgit v1.2.1 From d4554fcf252657df854d4ad29a7f0041306bd5c2 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 22 Mar 2022 17:21:30 +0000 Subject: utils: Silence -Wunused-parameter with clang, Meson, and SELinux disabled These parameters are unused if SELinux happens to be disabled. Signed-off-by: Simon McVittie --- utils.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils.c b/utils.c index 117da31..693273b 100644 --- a/utils.c +++ b/utils.c @@ -82,7 +82,7 @@ die (const char *format, ...) } void -die_unless_label_valid (const char *label) +die_unless_label_valid (UNUSED const char *label) { #ifdef HAVE_SELINUX if (is_selinux_enabled () == 1) @@ -854,7 +854,7 @@ pivot_root (const char * new_root, const char * put_old) } char * -label_mount (const char *opt, const char *mount_label) +label_mount (const char *opt, UNUSED const char *mount_label) { #ifdef HAVE_SELINUX if (mount_label) @@ -871,7 +871,7 @@ label_mount (const char *opt, const char *mount_label) } int -label_create_file (const char *file_label) +label_create_file (UNUSED const char *file_label) { #ifdef HAVE_SELINUX if (is_selinux_enabled () > 0 && file_label) @@ -881,7 +881,7 @@ label_create_file (const char *file_label) } int -label_exec (const char *exec_label) +label_exec (UNUSED const char *exec_label) { #ifdef HAVE_SELINUX if (is_selinux_enabled () > 0 && exec_label) -- cgit v1.2.1