summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@collabora.com>2022-05-11 14:54:27 +0100
committerGitHub <noreply@github.com>2022-05-11 14:54:27 +0100
commitb9d0ac36e72474ee01441ec524eab0ea9f14d959 (patch)
tree63ce280e8280ce795bb1ea25537ae5f7b29ee7cb
parent5ba8fc31ca59be22160a677b0ac3e9a0b934c582 (diff)
parentd4554fcf252657df854d4ad29a7f0041306bd5c2 (diff)
downloadbubblewrap-b9d0ac36e72474ee01441ec524eab0ea9f14d959.tar.gz
Merge pull request #486 from smcv/unused
Annotate some variables as sometimes-unused
-rw-r--r--bubblewrap.c2
-rw-r--r--utils.c8
2 files changed, 5 insertions, 5 deletions
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
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)