sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix an error in last commit; eliminate a warning

Browse Source
This commit is contained in:
Gregory Nutt 2016-01-06 10:14:09 -06:00
parent 186a101d2c
commit 50f44f23f2
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nshlib/nsh_console.c
View File

@ -76,7 +76,7 @@ static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl);
static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl, static ssize_t nsh_consolewrite(FAR struct nsh_vtbl_s *vtbl,
FAR const void *buffer, size_t nbytes); FAR const void *buffer, size_t nbytes);
static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl, static int nsh_consoleoutput(FAR struct nsh_vtbl_s *vtbl,
FAR const char *fmt, ...); FAR const IPTR char *fmt, ...);
static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl); static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0 #if CONFIG_NFILE_DESCRIPTORS > 0

2
nshlib/nsh_console.h
View File

@ -116,7 +116,7 @@ struct nsh_vtbl_s
#endif #endif
ssize_t (*write)(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer, ssize_t (*write)(FAR struct nsh_vtbl_s *vtbl, FAR const void *buffer,
size_t nbytes); size_t nbytes);
int (*output)(FAR struct nsh_vtbl_s *vtbl, FAR const IOBJ char *fmt, ...); int (*output)(FAR struct nsh_vtbl_s *vtbl, FAR const IPTR char *fmt, ...);
FAR char *(*linebuffer)(FAR struct nsh_vtbl_s *vtbl); FAR char *(*linebuffer)(FAR struct nsh_vtbl_s *vtbl);
#if CONFIG_NFILE_DESCRIPTORS > 0 #if CONFIG_NFILE_DESCRIPTORS > 0
void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save); void (*redirect)(FAR struct nsh_vtbl_s *vtbl, int fd, FAR uint8_t *save);

7
nshlib/nsh_fsutils.c
View File

@ -136,19 +136,20 @@ int nsh_catfile(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd,
ssize_t n = nsh_write(vtbl, buffer, nbytesread); ssize_t n = nsh_write(vtbl, buffer, nbytesread);
if (n < 0) if (n < 0)
{ {
int errval = errno; int errcode = errno;
/* EINTR is not an error (but will stop stop the cat) */ /* EINTR is not an error (but will stop stop the cat) */
#ifndef CONFIG_DISABLE_SIGNALS #ifndef CONFIG_DISABLE_SIGNALS
if (errval == EINTR) if (errcode == EINTR)
{ {
nsh_output(vtbl, g_fmtsignalrecvd, cmd); nsh_output(vtbl, g_fmtsignalrecvd, cmd);
} }
else else
#endif #endif
{ {
nsh_output(vtbl, g_fmtcmdfailed, cmd, "write", NSH_ERRNO); nsh_output(vtbl, g_fmtcmdfailed, cmd, "write",
NSH_ERRNO_OF(errcode));
} }
ret = ERROR; ret = ERROR;