From ee1b1da4bed45ca200d6403c64a4345d00e17a23 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 29 Nov 2015 14:41:34 -0600 Subject: [PATCH] Fix some errors/warnings detected by nuttx/tools/testbuild.sh --- examples/configdata/configdata_main.c | 4 +++- examples/nxffs/nxffs_main.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c index 1f3047aff..91aba2579 100644 --- a/examples/configdata/configdata_main.c +++ b/examples/configdata/configdata_main.c @@ -169,6 +169,7 @@ static void configdata_showmemusage(struct mallinfo *mmbefore, * Name: configdata_loopmemusage ****************************************************************************/ +#ifndef CONFIG_EXAMPLES_CONFIGDATA_SILENT static void configdata_loopmemusage(void) { /* Get the current memory usage */ @@ -192,6 +193,7 @@ static void configdata_loopmemusage(void) memcpy(&g_mmprevious, &g_mmafter, sizeof(struct mallinfo)); #endif } +#endif /**************************************************************************** * Name: configdata_endmemusage @@ -565,7 +567,7 @@ static int configdata_getnextdeleted(void) * Name: configdata_cleardeleted ****************************************************************************/ -static int configdata_cleardeleted(void) +static void configdata_cleardeleted(void) { int nextdeleted; int x; diff --git a/examples/nxffs/nxffs_main.c b/examples/nxffs/nxffs_main.c index ddc15ee88..117af7caf 100644 --- a/examples/nxffs/nxffs_main.c +++ b/examples/nxffs/nxffs_main.c @@ -660,7 +660,7 @@ static int nxffs_delfiles(void) { /* Test for wrap-around */ - if (j >= CONFIG_EXAMPLES_FSTEST_MAXOPEN) + if (j >= CONFIG_EXAMPLES_NXFFS_MAXOPEN) { j = 0; }