lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-08 17:42:12 +03:00
Code Activity

test-container: Fix "unused code" warnings on HURD

Browse Source 
Comment out bits of code that are only used when we *have* pid
namespaces, to avoid "unused code" warnings.

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

Message-Id: <xno817tnds.fsf@greed.delorie.com>
This commit is contained in:
DJ Delorie
2022-04-11 15:45:35 -04:00
committed by Samuel Thibault
parent ac5f5a92ed
commit d2263bf50a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
support/test-container.c
View File

@@ -230,6 +230,7 @@ concat (const char *str, ...)
return bufs[n]; return bufs[n];
} }
#ifdef CLONE_NEWNS
/* Like the above, but put spaces between words. Caller frees. */ /* Like the above, but put spaces between words. Caller frees. */
static char * static char *
concat_words (char **words, int num_words) concat_words (char **words, int num_words)
@@ -255,6 +256,7 @@ concat_words (char **words, int num_words)
return rv; return rv;
} }
#endif
/* Try to mount SRC onto DEST. */ /* Try to mount SRC onto DEST. */
static void static void
@@ -756,7 +758,9 @@ main (int argc, char **argv)
/* If set, the test runs as root instead of the user running the testsuite. */ /* If set, the test runs as root instead of the user running the testsuite. */
int be_su = 0; int be_su = 0;
int require_pidns = 0; int require_pidns = 0;
#ifdef CLONE_NEWNS
const char *pidns_comment = NULL; const char *pidns_comment = NULL;
#endif
int do_proc_mounts = 0; int do_proc_mounts = 0;
int UMAP; int UMAP;
int GMAP; int GMAP;
@@ -1046,8 +1050,10 @@ main (int argc, char **argv)
else if (nt >= 1 && strcmp (the_words[0], "pidns") == 0) else if (nt >= 1 && strcmp (the_words[0], "pidns") == 0)
{ {
require_pidns = 1; require_pidns = 1;
#ifdef CLONE_NEWNS
if (nt > 1) if (nt > 1)
pidns_comment = concat_words (the_words + 1, nt - 1); pidns_comment = concat_words (the_words + 1, nt - 1);
#endif
} }
else if (nt == 3 && strcmp (the_words[0], "mkdirp") == 0) else if (nt == 3 && strcmp (the_words[0], "mkdirp") == 0)
{ {