From 035842b3edd40379e372306d3ecab8decd0a76e1 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 25 May 2019 12:13:27 -0600 Subject: [PATCH] Fix an error and more warnings found in build testing. --- drivers/input/ajoystick.c | 1 - fs/nxffs/nxffs_dump.c | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/input/ajoystick.c b/drivers/input/ajoystick.c index 1fb26195ea8..8a237adf72e 100644 --- a/drivers/input/ajoystick.c +++ b/drivers/input/ajoystick.c @@ -229,7 +229,6 @@ static void ajoy_enable(FAR struct ajoy_upperhalf_s *priv) break; } } -#endif /* OR in the signal events */ diff --git a/fs/nxffs/nxffs_dump.c b/fs/nxffs/nxffs_dump.c index fb290479f39..024f42aaa3c 100644 --- a/fs/nxffs/nxffs_dump.c +++ b/fs/nxffs/nxffs_dump.c @@ -76,8 +76,10 @@ struct nxffs_blkinfo_s * Private Data ****************************************************************************/ +#if defined(CONFIG_DEBUG_FEATURES) && defined(CONFIG_DEBUG_FS) static const char g_hdrformat[] = " BLOCK:OFFS TYPE STATE LENGTH\n"; static const char g_format[] = " %5d:%-5d %s %s %5d\n"; +#endif /**************************************************************************** * Private Functions @@ -351,7 +353,7 @@ static inline void nxffs_analyze(FAR struct nxffs_blkinfo_s *blkinfo) blkinfo->geo.blocksize); } - /* Serach for Inode and data block headers. */ + /* Search for Inode and data block headers. */ inndx = 0; datndx = 0;