From 2b86765dfa37f9b447fe983967c1dcbc712a4989 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Tue, 6 Mar 2018 14:32:18 +1030 Subject: discover: Fix unused function warning clang errors out about an unused have_busybox function: discover/paths.c:44:13: error: unused function 'have_busybox' [-Werror,-Wunused-function] static bool have_busybox(void) ^ Move have_busybox() to inside the #ifndef PETITBOOT_TEST scope to eliminate the warning and avoid having #ifdefs in load_url_async(). Signed-off-by: Joel Stanley Signed-off-by: Samuel Mendoza-Jonas [Moved definition into #ifndef PETITBOOT_TEST instead of using #ifdef at the call site] --- discover/paths.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/discover/paths.c b/discover/paths.c index 24e978b..c5b5778 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -41,15 +41,6 @@ struct load_task { void *async_data; }; -static inline bool have_busybox(void) -{ -#ifdef WITH_BUSYBOX - return true; -#else - return false; -#endif -} - const char *mount_base(void) { return DEVICE_MOUNT_BASE; @@ -71,6 +62,12 @@ char *join_paths(void *alloc_ctx, const char *a, const char *b) #ifndef PETITBOOT_TEST +#ifdef WITH_BUSYBOX +static inline bool have_busybox(void) { return true; } +#else +static inline bool have_busybox(void) { return false; } +#endif + static char *local_name(void *ctx) { char *ret, tmp[] = "/tmp/pb-XXXXXX"; -- cgit v1.2.1