Sun Jan 4 04:22:53 2009 UTC ()
fix return type.


(christos)
diff -r1.1.2.1 -r1.1.2.2 src/lib/libc/compat/sys/compat_mqueue.c
cvs diff -r1.1.2.1 -r1.1.2.2 src/lib/libc/compat/sys/compat_mqueue.c (expand / switch to unified diff)

--- src/lib/libc/compat/sys/compat_mqueue.c 2008/11/09 20:00:20 1.1.2.1
+++ src/lib/libc/compat/sys/compat_mqueue.c 2009/01/04 04:22:53 1.1.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: compat_mqueue.c,v 1.1.2.1 2008/11/09 20:00:20 christos Exp $ */ 1/* $NetBSD: compat_mqueue.c,v 1.1.2.2 2009/01/04 04:22:53 christos Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2008 The NetBSD Foundation, Inc. 4 * Copyright (c) 2008 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Christos Zoulas. 8 * by Christos Zoulas.
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -27,27 +27,27 @@ @@ -27,27 +27,27 @@
27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 27 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 28 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 29 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 30 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 31 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 32 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 33 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 34 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 35 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
36 * POSSIBILITY OF SUCH DAMAGE. 36 * POSSIBILITY OF SUCH DAMAGE.
37 */ 37 */
38#include <sys/cdefs.h> 38#include <sys/cdefs.h>
39#if defined(LIBC_SCCS) && !defined(lint) 39#if defined(LIBC_SCCS) && !defined(lint)
40__RCSID("$NetBSD: compat_mqueue.c,v 1.1.2.1 2008/11/09 20:00:20 christos Exp $"); 40__RCSID("$NetBSD: compat_mqueue.c,v 1.1.2.2 2009/01/04 04:22:53 christos Exp $");
41#endif /* LIBC_SCCS and not lint */ 41#endif /* LIBC_SCCS and not lint */
42 42
43#include "namespace.h" 43#include "namespace.h"
44#define __LIBC12_SOURCE__ 44#define __LIBC12_SOURCE__
45#include <sys/time.h> 45#include <sys/time.h>
46#include <compat/sys/time.h> 46#include <compat/sys/time.h>
47#include <mqueue.h> 47#include <mqueue.h>
48#include <compat/include/mqueue.h> 48#include <compat/include/mqueue.h>
49 49
50__warn_references(mq_timedreceive, 50__warn_references(mq_timedreceive,
51 "warning: reference to compatibility mq_timedreceive(); include <mqueue.h> to generate correct reference") 51 "warning: reference to compatibility mq_timedreceive(); include <mqueue.h> to generate correct reference")
52__warn_references(mq_timedsend, 52__warn_references(mq_timedsend,
53 "warning: reference to compatibility mq_timedsend(); include <mqueue.h> to generate correct reference") 53 "warning: reference to compatibility mq_timedsend(); include <mqueue.h> to generate correct reference")
@@ -62,25 +62,25 @@ __weak_alias(_sys_mq_timedsend, _mq_time @@ -62,25 +62,25 @@ __weak_alias(_sys_mq_timedsend, _mq_time
62ssize_t 62ssize_t
63mq_timedreceive(mqd_t mq, char * __restrict name, size_t len, 63mq_timedreceive(mqd_t mq, char * __restrict name, size_t len,
64 unsigned * __restrict buf, const struct timespec50 * __restrict ts50) 64 unsigned * __restrict buf, const struct timespec50 * __restrict ts50)
65{ 65{
66 struct timespec ts, *tsp; 66 struct timespec ts, *tsp;
67 67
68 if (ts50) 68 if (ts50)
69 timespec50_to_timespec(ts50, tsp = &ts); 69 timespec50_to_timespec(ts50, tsp = &ts);
70 else 70 else
71 tsp = NULL; 71 tsp = NULL;
72 return __mq_timedreceive50(mq, name, len, buf, tsp); 72 return __mq_timedreceive50(mq, name, len, buf, tsp);
73} 73}
74 74
75ssize_t 75int
76mq_timedsend(mqd_t mq, const char *name, size_t len, 76mq_timedsend(mqd_t mq, const char *name, size_t len,
77 unsigned buf, const struct timespec50 *ts50) 77 unsigned buf, const struct timespec50 *ts50)
78{ 78{
79 struct timespec ts, *tsp; 79 struct timespec ts, *tsp;
80 80
81 if (ts50) 81 if (ts50)
82 timespec50_to_timespec(ts50, tsp = &ts); 82 timespec50_to_timespec(ts50, tsp = &ts);
83 else 83 else
84 tsp = NULL; 84 tsp = NULL;
85 return __mq_timedsend50(mq, name, len, buf, tsp); 85 return __mq_timedsend50(mq, name, len, buf, tsp);
86} 86}