From e136f3a64e97fbfb416732759646a2d5c9d31bb9 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 13 Sep 2012 19:33:47 +0000 Subject: [PATCH] Changes needed for clean ez80 compile with ZDS toolchain git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5147 42af7a65-404d-4744-a932-0658087f49c3 --- nshlib/nsh_consolemain.c | 3 ++- nshlib/nsh_mntcmds.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nshlib/nsh_consolemain.c b/nshlib/nsh_consolemain.c index baf2e74b4..6b51be470 100644 --- a/nshlib/nsh_consolemain.c +++ b/nshlib/nsh_consolemain.c @@ -97,9 +97,10 @@ int nsh_consolemain(int argc, char *argv[]) { FAR struct console_stdio_s *pstate = nsh_newconsole(); - DEBUGASSERT(pstate); int ret; + DEBUGASSERT(pstate); + /* If we are using a USB serial console, then we will have to wait for the * USB to be connected to the host. */ diff --git a/nshlib/nsh_mntcmds.c b/nshlib/nsh_mntcmds.c index 027046c77..690d027ca 100644 --- a/nshlib/nsh_mntcmds.c +++ b/nshlib/nsh_mntcmds.c @@ -199,6 +199,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) FAR char *target; FAR char *filesystem = NULL; bool badarg = false; + int option; int ret; /* The mount command behaves differently if no parameters are provided */ @@ -214,7 +215,6 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * logic just sets 'badarg' and continues. */ - int option; while ((option = getopt(argc, argv, ":t:")) != ERROR) { switch (option)