From cb982ea8df1b2a6a0bc8dd61c132646853c10b76 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 2 Oct 2018 11:16:15 -0600
Subject: [PATCH] apps/nshlib:  Eliminate more new warnings found in build
 testing.

---
 nshlib/nsh.h         | 3 +--
 nshlib/nsh_envcmds.c | 2 ++
 nshlib/nsh_parse.c   | 7 +++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nshlib/nsh.h b/nshlib/nsh.h
index 424fc3788..76868d8d6 100644
--- a/nshlib/nsh.h
+++ b/nshlib/nsh.h
@@ -1478,8 +1478,7 @@ FAR char *nsh_trimspaces(FAR char *str);
  ****************************************************************************/
 
 #ifdef CONFIG_NSH_VARS
-FAR const char *nsh_getvar(FAR struct nsh_vtbl_s *vtbl,
-                          FAR const char *name);
+FAR char *nsh_getvar(FAR struct nsh_vtbl_s *vtbl, FAR const char *name);
 #ifndef CONFIG_NSH_DISABLE_SET
 int nsh_setvar(FAR struct nsh_vtbl_s *vtbl, FAR const char *name,
                FAR const char *value);
diff --git a/nshlib/nsh_envcmds.c b/nshlib/nsh_envcmds.c
index 6f28b3200..a7f56a693 100644
--- a/nshlib/nsh_envcmds.c
+++ b/nshlib/nsh_envcmds.c
@@ -460,7 +460,9 @@ int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #ifndef CONFIG_NSH_DISABLE_UNSET
 int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
+#if defined(CONFIG_NSH_VARS) || !defined(CONFIG_DISABLE_ENVIRON)
   int status;
+#endif
   int ret = OK;
 
 #if defined(CONFIG_NSH_VARS)
diff --git a/nshlib/nsh_parse.c b/nshlib/nsh_parse.c
index a0ec6f9cd..2ad616c78 100644
--- a/nshlib/nsh_parse.c
+++ b/nshlib/nsh_parse.c
@@ -159,7 +159,7 @@ static FAR char *nsh_strchr(FAR const char *str, int ch);
 #endif
 
 #ifdef NSH_HAVE_VARS
-static FAR const char *nsh_envexpand(FAR struct nsh_vtbl_s *vtbl,
+static FAR char *nsh_envexpand(FAR struct nsh_vtbl_s *vtbl,
                FAR char *varname);
 #endif
 
@@ -1014,8 +1014,7 @@ static FAR char *nsh_strchr(FAR const char *str, int ch)
  ****************************************************************************/
 
 #ifdef NSH_HAVE_VARS
-static FAR const char *nsh_envexpand(FAR struct nsh_vtbl_s *vtbl,
-                                     FAR char *varname)
+static FAR char *nsh_envexpand(FAR struct nsh_vtbl_s *vtbl, FAR char *varname)
 {
   /* Check for built-in variables */
 
@@ -1032,7 +1031,7 @@ static FAR const char *nsh_envexpand(FAR struct nsh_vtbl_s *vtbl,
     }
   else
     {
-      FAR const char *value;
+      FAR char *value;
 
 #ifdef CONFIG_NSH_VARS
       /* Not a built-in? Return the value of the NSH variable with this