From 47d55c28dc3786da7028496df0bdefcbf2dc13df Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 4 Sep 2014 10:28:38 -0600 Subject: [PATCH] Mostly cosmetic changes --- arch/arm/src/armv7-a/arm_schedulesigaction.c | 2 +- drivers/serial/serial.c | 1 + libc/stdio/lib_rawsostream.c | 6 ++++-- sched/signal/sig_deliver.c | 3 +-- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/src/armv7-a/arm_schedulesigaction.c b/arch/arm/src/armv7-a/arm_schedulesigaction.c index 1a6d88b056..dfdf5235f3 100644 --- a/arch/arm/src/armv7-a/arm_schedulesigaction.c +++ b/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/drivers/serial/serial.c b/drivers/serial/serial.c index b2b4cccc29..6a48b4fda8 100644 --- a/drivers/serial/serial.c +++ b/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/libc/stdio/lib_rawsostream.c b/libc/stdio/lib_rawsostream.c index 7d971a36a9..82db850f78 100644 --- a/libc/stdio/lib_rawsostream.c +++ b/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/sched/signal/sig_deliver.c b/sched/signal/sig_deliver.c index eff0d4e597..c91a10e403 100644 --- a/sched/signal/sig_deliver.c +++ b/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(); } -