diff options
author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2006-03-21 15:37:16 +0000 |
---|---|---|
committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2006-03-21 15:37:16 +0000 |
commit | ab96eeabe8f319206346df2f486e01caabbfd8f4 (patch) | |
tree | 6a044a277848f8d42cf8a314d701efea03241963 /lib/libc/inet/inet_cidr_pton.c | |
parent | 03970c5728f7f53ce03efacc0cf12ef383d7cdda (diff) | |
download | src-ab96eeabe8f319206346df2f486e01caabbfd8f4.tar.gz src-ab96eeabe8f319206346df2f486e01caabbfd8f4.zip |
- Merge our local changes.
- Exclude unnecessary functions for us.
Notes
Notes:
svn path=/head/; revision=156956
Diffstat (limited to 'lib/libc/inet/inet_cidr_pton.c')
-rw-r--r-- | lib/libc/inet/inet_cidr_pton.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libc/inet/inet_cidr_pton.c b/lib/libc/inet/inet_cidr_pton.c index 5bfef71ba721..3089eb95dafc 100644 --- a/lib/libc/inet/inet_cidr_pton.c +++ b/lib/libc/inet/inet_cidr_pton.c @@ -18,6 +18,8 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.2.2.1.8.2 2004/03/17 00:29:46 marka Exp $"; #endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD$"); #include "port_before.h" @@ -27,7 +29,7 @@ static const char rcsid[] = "$Id: inet_cidr_pton.c,v 1.2.2.1.8.2 2004/03/17 00:2 #include <arpa/nameser.h> #include <arpa/inet.h> -#include <isc/assertions.h> +#include <assert.h> #include <ctype.h> #include <errno.h> #include <stdio.h> @@ -92,7 +94,7 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, int *pbits, int ipv6) { tmp = 0; do { n = strchr(digits, ch) - digits; - INSIST(n >= 0 && n <= 9); + assert(n >= 0 && n <= 9); tmp *= 10; tmp += n; if (tmp > 255) |