summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2017-06-16 07:31:51 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2017-06-16 07:37:25 +0200
commitb83012a9f9f1551d9d223c3126d0f43aba79db62 (patch)
tree050fadbaa46e19b7926af55a2202625100c7290a
parent3c967ca2388b57d828f16e8b55ec6ccb34824a18 (diff)
downloadrtems-libbsd-b83012a9f9f1551d9d223c3126d0f43aba79db62.tar.bz2
Remove unused inet_* weak references
This change requires a Newlib from 2017-06-12 or later.
-rw-r--r--freebsd/include/arpa/inet.h178
-rw-r--r--freebsd/lib/libc/inet/inet_addr.c2
-rw-r--r--freebsd/lib/libc/inet/inet_lnaof.c2
-rw-r--r--freebsd/lib/libc/inet/inet_makeaddr.c2
-rw-r--r--freebsd/lib/libc/inet/inet_net_ntop.c2
-rw-r--r--freebsd/lib/libc/inet/inet_net_pton.c2
-rw-r--r--freebsd/lib/libc/inet/inet_neta.c2
-rw-r--r--freebsd/lib/libc/inet/inet_netof.c2
-rw-r--r--freebsd/lib/libc/inet/inet_network.c2
-rw-r--r--freebsd/lib/libc/inet/inet_ntoa.c2
-rw-r--r--freebsd/lib/libc/inet/inet_ntop.c2
-rw-r--r--freebsd/lib/libc/inet/inet_pton.c2
12 files changed, 22 insertions, 178 deletions
diff --git a/freebsd/include/arpa/inet.h b/freebsd/include/arpa/inet.h
deleted file mode 100644
index 1078521c..00000000
--- a/freebsd/include/arpa/inet.h
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * ++Copyright++ 1983, 1993
- * -
- * Copyright (c) 1983, 1993
- * 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:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 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. 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
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * 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
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * 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
- * $Id: inet.h,v 1.3 2005/04/27 04:56:16 sra Exp $
- * $FreeBSD$
- */
-
-#ifndef _ARPA_INET_H_
-#define _ARPA_INET_H_
-
-/* External definitions for functions in inet(3). */
-
-#include <sys/cdefs.h>
-#include <sys/_types.h>
-
-/* Required for byteorder(3) functions. */
-#include <machine/endian.h>
-
-#define INET_ADDRSTRLEN 16
-#define INET6_ADDRSTRLEN 46
-
-#ifndef _UINT16_T_DECLARED
-typedef __uint16_t uint16_t;
-#define _UINT16_T_DECLARED
-#endif
-
-#ifndef _UINT32_T_DECLARED
-typedef __uint32_t uint32_t;
-#define _UINT32_T_DECLARED
-#endif
-
-#ifndef _IN_ADDR_T_DECLARED
-typedef uint32_t in_addr_t;
-#define _IN_ADDR_T_DECLARED
-#endif
-
-#ifndef _IN_PORT_T_DECLARED
-typedef uint16_t in_port_t;
-#define _IN_PORT_T_DECLARED
-#endif
-
-#if __BSD_VISIBLE
-#ifndef _SIZE_T_DECLARED
-typedef __size_t size_t;
-#define _SIZE_T_DECLARED
-#endif
-#endif
-
-/*
- * XXX socklen_t is used by a POSIX.1-2001 interface, but not required by
- * POSIX.1-2001.
- */
-#ifndef _SOCKLEN_T_DECLARED
-typedef __socklen_t socklen_t;
-#define _SOCKLEN_T_DECLARED
-#endif
-
-#ifndef _STRUCT_IN_ADDR_DECLARED
-struct in_addr {
- in_addr_t s_addr;
-};
-#define _STRUCT_IN_ADDR_DECLARED
-#endif
-
-/* 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_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 */
-
-__BEGIN_DECLS
-#ifndef _BYTEORDER_PROTOTYPED
-#define _BYTEORDER_PROTOTYPED
-uint32_t htonl(uint32_t);
-uint16_t htons(uint16_t);
-uint32_t ntohl(uint32_t);
-uint16_t ntohs(uint16_t);
-#endif
-
-in_addr_t inet_addr(const char *);
-/*const*/ 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);
-
-#if __BSD_VISIBLE
-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);
-char * inet_neta(in_addr_t, char *, size_t);
-in_addr_t inet_netof(struct in_addr);
-in_addr_t inet_network(const char *);
-char *inet_net_ntop(int, const void *, int, char *, size_t);
-int inet_net_pton(int, const char *, void *, size_t);
-char *inet_ntoa_r(struct in_addr, char *buf, socklen_t size);
-char *inet_cidr_ntop(int, const void *, int, char *, size_t);
-int inet_cidr_pton(int, const char *, void *, int *);
-unsigned inet_nsap_addr(const char *, unsigned char *, int);
-char *inet_nsap_ntoa(int, const unsigned char *, char *);
-#endif /* __BSD_VISIBLE */
-__END_DECLS
-
-#ifndef _BYTEORDER_FUNC_DEFINED
-#define _BYTEORDER_FUNC_DEFINED
-#define htonl(x) __htonl(x)
-#define htons(x) __htons(x)
-#define ntohl(x) __ntohl(x)
-#define ntohs(x) __ntohs(x)
-#endif
-
-#endif /* !_ARPA_INET_H_ */
-
-/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_addr.c b/freebsd/lib/libc/inet/inet_addr.c
index 04361b95..0be7c726 100644
--- a/freebsd/lib/libc/inet/inet_addr.c
+++ b/freebsd/lib/libc/inet/inet_addr.c
@@ -204,6 +204,7 @@ inet_aton(const char *cp, struct in_addr *addr) {
return (1);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
@@ -212,5 +213,6 @@ inet_aton(const char *cp, struct in_addr *addr) {
__weak_reference(__inet_addr, inet_addr);
#undef inet_aton
__weak_reference(__inet_aton, inet_aton);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_lnaof.c b/freebsd/lib/libc/inet/inet_lnaof.c
index 683eb1a9..8a071dfc 100644
--- a/freebsd/lib/libc/inet/inet_lnaof.c
+++ b/freebsd/lib/libc/inet/inet_lnaof.c
@@ -61,11 +61,13 @@ inet_lnaof(struct in_addr in)
return ((i)&IN_CLASSC_HOST);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_lnaof
__weak_reference(__inet_lnaof, inet_lnaof);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_makeaddr.c b/freebsd/lib/libc/inet/inet_makeaddr.c
index 47407516..024c8e27 100644
--- a/freebsd/lib/libc/inet/inet_makeaddr.c
+++ b/freebsd/lib/libc/inet/inet_makeaddr.c
@@ -64,11 +64,13 @@ inet_makeaddr(in_addr_t net, in_addr_t host)
return (a);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_makeaddr
__weak_reference(__inet_makeaddr, inet_makeaddr);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_net_ntop.c b/freebsd/lib/libc/inet/inet_net_ntop.c
index 31c04aba..48b1fd07 100644
--- a/freebsd/lib/libc/inet/inet_net_ntop.c
+++ b/freebsd/lib/libc/inet/inet_net_ntop.c
@@ -271,11 +271,13 @@ emsgsize:
return (NULL);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_net_ntop
__weak_reference(__inet_net_ntop, inet_net_ntop);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_net_pton.c b/freebsd/lib/libc/inet/inet_net_pton.c
index 2a8fc345..ba59726f 100644
--- a/freebsd/lib/libc/inet/inet_net_pton.c
+++ b/freebsd/lib/libc/inet/inet_net_pton.c
@@ -408,11 +408,13 @@ inet_net_pton(int af, const char *src, void *dst, size_t size) {
}
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_net_pton
__weak_reference(__inet_net_pton, inet_net_pton);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_neta.c b/freebsd/lib/libc/inet/inet_neta.c
index 2cab5934..aa02ec59 100644
--- a/freebsd/lib/libc/inet/inet_neta.c
+++ b/freebsd/lib/libc/inet/inet_neta.c
@@ -87,11 +87,13 @@ inet_neta(in_addr_t src, char *dst, size_t size)
return (NULL);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_neta
__weak_reference(__inet_neta, inet_neta);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_netof.c b/freebsd/lib/libc/inet/inet_netof.c
index 7770c2dd..24d9c91d 100644
--- a/freebsd/lib/libc/inet/inet_netof.c
+++ b/freebsd/lib/libc/inet/inet_netof.c
@@ -60,11 +60,13 @@ inet_netof(struct in_addr in)
return (((i)&IN_CLASSC_NET) >> IN_CLASSC_NSHIFT);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_netof
__weak_reference(__inet_netof, inet_netof);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_network.c b/freebsd/lib/libc/inet/inet_network.c
index 7bb9371f..d42c1160 100644
--- a/freebsd/lib/libc/inet/inet_network.c
+++ b/freebsd/lib/libc/inet/inet_network.c
@@ -102,11 +102,13 @@ again:
return (val);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_network
__weak_reference(__inet_network, inet_network);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_ntoa.c b/freebsd/lib/libc/inet/inet_ntoa.c
index 6d3de725..3a009569 100644
--- a/freebsd/lib/libc/inet/inet_ntoa.c
+++ b/freebsd/lib/libc/inet/inet_ntoa.c
@@ -69,6 +69,7 @@ inet_ntoa_r(struct in_addr in, char *buf, socklen_t size)
return (buf);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
@@ -76,5 +77,6 @@ inet_ntoa_r(struct in_addr in, char *buf, socklen_t size)
#undef inet_ntoa
__weak_reference(__inet_ntoa, inet_ntoa);
__weak_reference(__inet_ntoa_r, inet_ntoa_r);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_ntop.c b/freebsd/lib/libc/inet/inet_ntop.c
index 0387a14f..be2aabe2 100644
--- a/freebsd/lib/libc/inet/inet_ntop.c
+++ b/freebsd/lib/libc/inet/inet_ntop.c
@@ -196,11 +196,13 @@ inet_ntop6(const u_char *src, char *dst, socklen_t size)
return (dst);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_ntop
__weak_reference(__inet_ntop, inet_ntop);
+#endif /* __rtems__ */
/*! \file */
diff --git a/freebsd/lib/libc/inet/inet_pton.c b/freebsd/lib/libc/inet/inet_pton.c
index 3272a027..18bcd32b 100644
--- a/freebsd/lib/libc/inet/inet_pton.c
+++ b/freebsd/lib/libc/inet/inet_pton.c
@@ -216,11 +216,13 @@ inet_pton6(const char *src, u_char *dst)
return (1);
}
+#ifndef __rtems__
/*
* Weak aliases for applications that use certain private entry points,
* and fail to include <arpa/inet.h>.
*/
#undef inet_pton
__weak_reference(__inet_pton, inet_pton);
+#endif /* __rtems__ */
/*! \file */