From 584284adc389f4378e7a2a3dde4962bb72d48f4e Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 5 Jul 2015 08:42:00 -0600 Subject: [PATCH] NSH uname, Use unknown if board name is not known --- nshlib/nsh_syscmds.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/nshlib/nsh_syscmds.c b/nshlib/nsh_syscmds.c index 27eccc91e..54a6d8261 100644 --- a/nshlib/nsh_syscmds.c +++ b/nshlib/nsh_syscmds.c @@ -53,13 +53,13 @@ #ifdef CONFIG_ARCH_BOARD_CUSTOM # ifndef CONFIG_ARCH_BOARD_CUSTOM_NAME -# define BOARD_NAME "" +# define BOARD_NAME g_unknown # else # define BOARD_NAME CONFIG_ARCH_BOARD_CUSTOM_NAME # endif #else # ifndef CONFIG_ARCH_BOARD -# define BOARD_NAME "" +# define BOARD_NAME g_unknown # else # define BOARD_NAME CONFIG_ARCH_BOARD # endif @@ -81,25 +81,11 @@ UNAME_MACHINE | UNAME_PLATFORM) #endif -/**************************************************************************** - * Private Types - ****************************************************************************/ - -/**************************************************************************** - * Private Function Prototypes - ****************************************************************************/ - /**************************************************************************** * Private Data ****************************************************************************/ -/**************************************************************************** - * Public Data - ****************************************************************************/ - -/**************************************************************************** - * Private Functions - ****************************************************************************/ +static const char g_unknown[] = "unknown"; /**************************************************************************** * Public Functions @@ -242,7 +228,7 @@ int cmd_reboot(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) #ifndef CONFIG_NSH_DISABLE_UNAME int cmd_uname(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { - FAR char *str; + FAR const char *str; struct utsname info; unsigned int set; int option; @@ -367,7 +353,7 @@ int cmd_uname(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) break; case 6: /* Print "unknown" */ - str = "unknown"; + str = g_unknown; break; default: