diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 10:28:38 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-04 10:28:38 -0600 |
| commit | beca146a95df1d058b5cf2e8fc3f9fd776c33116 (patch) | |
| tree | 1315a353c954b3a02b6784c8198041477afedfae /nuttx | |
| parent | 972c183c21e5554ee61caeffe2fab56305fc3f70 (diff) | |
| download | px4-nuttx-beca146a95df1d058b5cf2e8fc3f9fd776c33116.tar.gz px4-nuttx-beca146a95df1d058b5cf2e8fc3f9fd776c33116.tar.bz2 px4-nuttx-beca146a95df1d058b5cf2e8fc3f9fd776c33116.zip | |
Mostly cosmetic changes
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c | 2 | ||||
| -rw-r--r-- | nuttx/drivers/serial/serial.c | 1 | ||||
| -rw-r--r-- | nuttx/libc/stdio/lib_rawsostream.c | 6 | ||||
| -rw-r--r-- | nuttx/sched/signal/sig_deliver.c | 3 |
4 files changed, 7 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c b/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c index 1a6d88b05..dfdf5235f 100644 --- a/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c +++ b/nuttx/arch/arm/src/armv7-a/arm_schedulesigaction.c @@ -75,7 +75,7 @@ * This function is called by the OS when one or more * signal handling actions have been queued for execution. * The architecture specific code must configure things so - * that the 'igdeliver' callback is executed on the thread + * that the 'sigdeliver' callback is executed on the thread * specified by 'tcb' as soon as possible. * * This function may be called from interrupt handling logic. diff --git a/nuttx/drivers/serial/serial.c b/nuttx/drivers/serial/serial.c index b2b4cccc2..6a48b4fda 100644 --- a/nuttx/drivers/serial/serial.c +++ b/nuttx/drivers/serial/serial.c @@ -427,6 +427,7 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer, ret = uart_putxmitchar(dev, '\r', oktoblock); if (ret < 0) { + nwritten = ret; break; } } diff --git a/nuttx/libc/stdio/lib_rawsostream.c b/nuttx/libc/stdio/lib_rawsostream.c index 7d971a36a..82db850f7 100644 --- a/nuttx/libc/stdio/lib_rawsostream.c +++ b/nuttx/libc/stdio/lib_rawsostream.c @@ -54,8 +54,9 @@ static void rawoutstream_putc(FAR struct lib_outstream_s *this, int ch) { FAR struct lib_rawoutstream_s *rthis = (FAR struct lib_rawoutstream_s *)this; - int nwritten; char buffer = ch; + int nwritten; + int errcode; DEBUGASSERT(this && rthis->fd >= 0); @@ -77,9 +78,10 @@ static void rawoutstream_putc(FAR struct lib_outstream_s *this, int ch) * return values from write(). */ + errcode = get_errno(); DEBUGASSERT(nwritten < 0); } - while (get_errno() == EINTR); + while (errcode == EINTR); } /**************************************************************************** diff --git a/nuttx/sched/signal/sig_deliver.c b/nuttx/sched/signal/sig_deliver.c index eff0d4e59..c91a10e40 100644 --- a/nuttx/sched/signal/sig_deliver.c +++ b/nuttx/sched/signal/sig_deliver.c @@ -51,7 +51,7 @@ #include "signal/signal.h" /**************************************************************************** - * Definitions + * Pre-processor Definitions ****************************************************************************/ /**************************************************************************** @@ -184,4 +184,3 @@ void sig_deliver(FAR struct tcb_s *stcb) stcb->pterrno = saved_errno; sched_unlock(); } - |