change log for rtems (2010-09-01)
rtems-vc at rtems.org
rtems-vc at rtems.org
Wed Sep 1 12:10:23 UTC 2010
*ralf*:
2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
PR 1696/networking:
* libnetworking/arpa/inet.h: Partial update from FreeBSD.
#include <rtems/endian.h>.
Remove addr2ascii, ascii2addr.
M 1.2623 cpukit/ChangeLog
M 1.7 cpukit/libnetworking/arpa/inet.h
diff -u rtems/cpukit/ChangeLog:1.2622 rtems/cpukit/ChangeLog:1.2623
--- rtems/cpukit/ChangeLog:1.2622 Wed Sep 1 06:08:30 2010
+++ rtems/cpukit/ChangeLog Wed Sep 1 06:12:37 2010
@@ -1,5 +1,12 @@
2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
+ PR 1696/networking:
+ * libnetworking/arpa/inet.h: Partial update from FreeBSD.
+ #include <rtems/endian.h>.
+ Remove addr2ascii, ascii2addr.
+
+2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* libnetworking/libc/addr2ascii.c,
libnetworking/libc/ascii2addr.c,
libnetworking/libc/addr2ascii.3: Remove.
diff -u rtems/cpukit/libnetworking/arpa/inet.h:1.6 rtems/cpukit/libnetworking/arpa/inet.h:1.7
--- rtems/cpukit/libnetworking/arpa/inet.h:1.6 Thu May 10 02:29:13 2007
+++ rtems/cpukit/libnetworking/arpa/inet.h Wed Sep 1 06:12:37 2010
@@ -1,7 +1,9 @@
/*
+ * ++Copyright++ 1983, 1993
+ * -
* Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
+ * The Regents of the University of California. All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -10,14 +12,10 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +29,7 @@
* SUCH DAMAGE.
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
@@ -47,10 +45,14 @@
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
- *
+ * -
+ * --Copyright--
+ */
+
+/*%
* @(#)inet.h 8.1 (Berkeley) 6/2/93
- * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.25 2002/08/21 16:19:56 mike Exp $
+ * $Id$
+ * $FreeBSD: src/include/arpa/inet.h,v 1.33 2010/07/06 03:48:46 maxim Exp $
*/
/*
@@ -60,11 +62,14 @@
#ifndef _ARPA_INET_H_
#define _ARPA_INET_H_
-/* External definitions for functions in inet(3), addr2ascii(3) */
+/* External definitions for functions in inet(3). */
#include <rtems/bsd/sys/cdefs.h>
#include <rtems/bsdnet/_types.h>
+/* Required for byteorder(3) functions. */
+#include <rtems/endian.h>
+
#define INET_ADDRSTRLEN 16
#define INET6_ADDRSTRLEN 46
@@ -97,20 +102,23 @@
#if !defined(__rtems__) /* RTEMS -- Why rename these? */
/* XXX all new diversions!! argh!! */
#if __BSD_VISIBLE
-#define inet_addr __inet_addr
-#define inet_aton __inet_aton
-#define inet_lnaof __inet_lnaof
-#define inet_makeaddr __inet_makeaddr
-#define inet_neta __inet_neta
-#define inet_netof __inet_netof
-#define inet_network __inet_network
-#define inet_net_ntop __inet_net_ntop
-#define inet_net_pton __inet_net_pton
-#define inet_ntoa __inet_ntoa
-#define inet_pton __inet_pton
-#define inet_ntop __inet_ntop
-#define inet_nsap_addr __inet_nsap_addr
-#define inet_nsap_ntoa __inet_nsap_ntoa
+#define inet_addr __inet_addr
+#define inet_aton __inet_aton
+#define inet_lnaof __inet_lnaof
+#define inet_makeaddr __inet_makeaddr
+#define inet_neta __inet_neta
+#define inet_netof __inet_netof
+#define inet_network __inet_network
+#define inet_net_ntop __inet_net_ntop
+#define inet_net_pton __inet_net_pton
+#define inet_cidr_ntop __inet_cidr_ntop
+#define inet_cidr_pton __inet_cidr_pton
+#define inet_ntoa __inet_ntoa
+#define inet_ntoa_r __inet_ntoa_r
+#define inet_pton __inet_pton
+#define inet_ntop __inet_ntop
+#define inet_nsap_addr __inet_nsap_addr
+#define inet_nsap_ntoa __inet_nsap_ntoa
#endif /* __BSD_VISIBLE */
#endif /* __rtems__ */
@@ -119,11 +127,9 @@
char *inet_ntoa(struct in_addr);
const char *inet_ntop(int, const void * __restrict, char * __restrict,
socklen_t);
-int inet_pton(int, const char * __restrict, void * __restrict);
+int inet_pton(int, const char * __restrict, void * __restrict);
#if __BSD_VISIBLE
-int ascii2addr(int, const char *, void *);
-char *addr2ascii(int, const void *, int, char *);
int inet_aton(const char *, struct in_addr *);
in_addr_t inet_lnaof(struct in_addr);
struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
*ralf*:
2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
* libnetworking/libc/addr2ascii.c,
libnetworking/libc/ascii2addr.c,
libnetworking/libc/addr2ascii.3: Remove.
* libnetworking/Makefile.am: Reflect changes above.
M 1.2346.2.66 cpukit/ChangeLog
M 1.96.2.1 cpukit/libnetworking/Makefile.am
R 1.2 cpukit/libnetworking/libc/addr2ascii.3
R 1.4 cpukit/libnetworking/libc/addr2ascii.c
R 1.4 cpukit/libnetworking/libc/ascii2addr.c
diff -u rtems/cpukit/ChangeLog:1.2346.2.65 rtems/cpukit/ChangeLog:1.2346.2.66
--- rtems/cpukit/ChangeLog:1.2346.2.65 Fri Aug 27 12:43:18 2010
+++ rtems/cpukit/ChangeLog Wed Sep 1 06:17:38 2010
@@ -1,3 +1,10 @@
+2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
+
+ * libnetworking/libc/addr2ascii.c,
+ libnetworking/libc/ascii2addr.c,
+ libnetworking/libc/addr2ascii.3: Remove.
+ * libnetworking/Makefile.am: Reflect changes above.
+
2010-08-27 Joel Sherrill <joel.sherrilL at OARcorp.com>
PR 1693/filesystem
diff -u rtems/cpukit/libnetworking/Makefile.am:1.96 rtems/cpukit/libnetworking/Makefile.am:1.96.2.1
--- rtems/cpukit/libnetworking/Makefile.am:1.96 Sun Sep 6 15:32:06 2009
+++ rtems/cpukit/libnetworking/Makefile.am Wed Sep 1 06:17:39 2010
@@ -156,7 +156,7 @@
include_HEADERS += ifaddrs.h
-libc_a_SOURCES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \
+libc_a_SOURCES = libc/base64.c \
libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \
libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \
libc/getnetbynis.c libc/getnetnamadr.c libc/getproto.c \
@@ -181,7 +181,7 @@
libc/inet_net_ntop.c libc/inet_net_pton.c libc/ns_addr.c \
libc/ns_ntoa.c
-libc_mans = libc/addr2ascii.3 libc/byteorder.3 libc/ethers.3 \
+libc_mans = libc/byteorder.3 libc/ethers.3 \
libc/gethostbyname.3 libc/getnetent.3 libc/getprotoent.3 \
libc/getservent.3 libc/inet.3 libc/linkaddr.3 libc/ns.3 \
libc/rcmd.3 libc/resolver.3
*ralf* (on branch rtems-4-10-branch):
2010-08-09 Ralf Corsépius <ralf.corsepius at rtems.org>
* posix/include/aio.h, posix/src/aio_return.c:
Let aio_return return ssize_t (Mandated by POSIX).
M 1.2346.2.67 cpukit/ChangeLog
M 1.6.6.1 cpukit/libnetworking/arpa/inet.h
diff -u rtems/cpukit/ChangeLog:1.2346.2.66 rtems/cpukit/ChangeLog:1.2346.2.67
--- rtems/cpukit/ChangeLog:1.2346.2.66 Wed Sep 1 06:17:38 2010
+++ rtems/cpukit/ChangeLog Wed Sep 1 06:18:34 2010
@@ -1,5 +1,12 @@
2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
+ PR 1696/networking:
+ * libnetworking/arpa/inet.h: Partial update from FreeBSD.
+ #include <rtems/endian.h>.
+ Remove addr2ascii, ascii2addr.
+
+2010-09-01 Ralf Corsépius <ralf.corsepius at rtems.org>
+
* libnetworking/libc/addr2ascii.c,
libnetworking/libc/ascii2addr.c,
libnetworking/libc/addr2ascii.3: Remove.
diff -u rtems/cpukit/libnetworking/arpa/inet.h:1.6 rtems/cpukit/libnetworking/arpa/inet.h:1.6.6.1
--- rtems/cpukit/libnetworking/arpa/inet.h:1.6 Thu May 10 02:29:13 2007
+++ rtems/cpukit/libnetworking/arpa/inet.h Wed Sep 1 06:18:34 2010
@@ -1,7 +1,9 @@
/*
+ * ++Copyright++ 1983, 1993
+ * -
* Copyright (c) 1983, 1993
- * The Regents of the University of California. All rights reserved.
- *
+ * The Regents of the University of California. All rights reserved.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -10,14 +12,10 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -31,7 +29,7 @@
* SUCH DAMAGE.
* -
* Portions Copyright (c) 1993 by Digital Equipment Corporation.
- *
+ *
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies, and that
@@ -47,10 +45,14 @@
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
* ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
* SOFTWARE.
- *
+ * -
+ * --Copyright--
+ */
+
+/*%
* @(#)inet.h 8.1 (Berkeley) 6/2/93
- * From: Id: inet.h,v 8.5 1997/01/29 08:48:09 vixie Exp $
- * $FreeBSD: src/include/arpa/inet.h,v 1.25 2002/08/21 16:19:56 mike Exp $
+ * $Id$
+ * $FreeBSD: src/include/arpa/inet.h,v 1.33 2010/07/06 03:48:46 maxim Exp $
*/
/*
@@ -60,11 +62,14 @@
#ifndef _ARPA_INET_H_
#define _ARPA_INET_H_
-/* External definitions for functions in inet(3), addr2ascii(3) */
+/* External definitions for functions in inet(3). */
#include <rtems/bsd/sys/cdefs.h>
#include <rtems/bsdnet/_types.h>
+/* Required for byteorder(3) functions. */
+#include <rtems/endian.h>
+
#define INET_ADDRSTRLEN 16
#define INET6_ADDRSTRLEN 46
@@ -97,20 +102,23 @@
#if !defined(__rtems__) /* RTEMS -- Why rename these? */
/* XXX all new diversions!! argh!! */
#if __BSD_VISIBLE
-#define inet_addr __inet_addr
-#define inet_aton __inet_aton
-#define inet_lnaof __inet_lnaof
-#define inet_makeaddr __inet_makeaddr
-#define inet_neta __inet_neta
-#define inet_netof __inet_netof
-#define inet_network __inet_network
-#define inet_net_ntop __inet_net_ntop
-#define inet_net_pton __inet_net_pton
-#define inet_ntoa __inet_ntoa
-#define inet_pton __inet_pton
-#define inet_ntop __inet_ntop
-#define inet_nsap_addr __inet_nsap_addr
-#define inet_nsap_ntoa __inet_nsap_ntoa
+#define inet_addr __inet_addr
+#define inet_aton __inet_aton
+#define inet_lnaof __inet_lnaof
+#define inet_makeaddr __inet_makeaddr
+#define inet_neta __inet_neta
+#define inet_netof __inet_netof
+#define inet_network __inet_network
+#define inet_net_ntop __inet_net_ntop
+#define inet_net_pton __inet_net_pton
+#define inet_cidr_ntop __inet_cidr_ntop
+#define inet_cidr_pton __inet_cidr_pton
+#define inet_ntoa __inet_ntoa
+#define inet_ntoa_r __inet_ntoa_r
+#define inet_pton __inet_pton
+#define inet_ntop __inet_ntop
+#define inet_nsap_addr __inet_nsap_addr
+#define inet_nsap_ntoa __inet_nsap_ntoa
#endif /* __BSD_VISIBLE */
#endif /* __rtems__ */
@@ -119,11 +127,9 @@
char *inet_ntoa(struct in_addr);
const char *inet_ntop(int, const void * __restrict, char * __restrict,
socklen_t);
-int inet_pton(int, const char * __restrict, void * __restrict);
+int inet_pton(int, const char * __restrict, void * __restrict);
#if __BSD_VISIBLE
-int ascii2addr(int, const char *, void *);
-char *addr2ascii(int, const void *, int, char *);
int inet_aton(const char *, struct in_addr *);
in_addr_t inet_lnaof(struct in_addr);
struct in_addr inet_makeaddr(in_addr_t, in_addr_t);
--
Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100901/8837581f/attachment-0001.html>
More information about the vc
mailing list