summaryrefslogtreecommitdiff
path: root/nuttx/sched/mq_timedreceive.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-03-29 23:43:54 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2007-03-29 23:43:54 +0000
commitc8604fef7bb4043e36726d7eeaa6afd068012334 (patch)
tree01704d0c0a00ed61530cb1fcd840808ae6996531 /nuttx/sched/mq_timedreceive.c
parent79749b135bef212fe96e7d17ade0bb65a14f8340 (diff)
downloadpx4-nuttx-c8604fef7bb4043e36726d7eeaa6afd068012334.tar.gz
px4-nuttx-c8604fef7bb4043e36726d7eeaa6afd068012334.tar.bz2
px4-nuttx-c8604fef7bb4043e36726d7eeaa6afd068012334.zip
Fix bugs detected by timed mqueue test.
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@178 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/sched/mq_timedreceive.c')
-rw-r--r--nuttx/sched/mq_timedreceive.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/sched/mq_timedreceive.c b/nuttx/sched/mq_timedreceive.c
index 39fafdc7d..45aa6a813 100644
--- a/nuttx/sched/mq_timedreceive.c
+++ b/nuttx/sched/mq_timedreceive.c
@@ -248,22 +248,22 @@ ssize_t mq_timedreceive(mqd_t mqdes, void *msg, size_t msglen,
* disabled here so that this time stays valid until the wait begins.
*/
- ret = clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
+ int result = clock_abstime2ticks(CLOCK_REALTIME, abstime, &ticks);
/* If the time has already expired and the message queue is empty,
* return immediately.
*/
- if (ret == OK && ticks <= 0)
+ if (result == OK && ticks <= 0)
{
- ret = ETIMEDOUT;
+ result = ETIMEDOUT;
}
/* Handle any time-related errors */
- if (ret != OK)
+ if (result != OK)
{
- *get_errno_ptr() = ret;
+ *get_errno_ptr() = result;
irqrestore(saved_state);
sched_unlock();
wd_delete(wdog);