aboutsummaryrefslogtreecommitdiff
path: root/nuttx/sched/mq_open.c
diff options
context:
space:
mode:
authorpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
committerpx4dev <px4@purgatory.org>2013-01-11 02:14:43 -0800
commitf127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch)
tree91daf599eae326f2207d0fbd9ede34b51eca1812 /nuttx/sched/mq_open.c
parent48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff)
downloadpx4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.gz
px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.bz2
px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.zip
Manually fixup merge botches via direct comparison with NuttX r5447.
Diffstat (limited to 'nuttx/sched/mq_open.c')
-rw-r--r--nuttx/sched/mq_open.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/nuttx/sched/mq_open.c b/nuttx/sched/mq_open.c
index 5e1b9b137..89d80f072 100644
--- a/nuttx/sched/mq_open.c
+++ b/nuttx/sched/mq_open.c
@@ -113,7 +113,6 @@ mqd_t mq_open(const char *mq_name, int oflags, ...)
FAR msgq_t *msgq;
mqd_t mqdes = NULL;
va_list arg; /* Points to each un-named argument */
- mode_t mode; /* MQ creation mode parameter (ignored) */
struct mq_attr *attr; /* MQ creation attributes */
int namelen; /* Length of MQ name */
@@ -170,7 +169,7 @@ mqd_t mq_open(const char *mq_name, int oflags, ...)
*/
va_start(arg, oflags);
- mode = va_arg(arg, mode_t);
+ (void)va_arg(arg, mode_t); /* MQ creation mode parameter (ignored) */
attr = va_arg(arg, struct mq_attr*);
/* Initialize the new named message queue */