diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:21:21 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 17:21:21 +1100 |
| commit | c7e05d679a8fdbc7cfa2eefb54f9fcb84ff715ae (patch) | |
| tree | 410029507d6411396f9e419fe725053c1737bf5a /openbsd-compat/inet_aton.c | |
| parent | 0a149d19d3ca291c33f449c304d4b0c5601c127a (diff) | |
- (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9.
Diffstat (limited to 'openbsd-compat/inet_aton.c')
| -rw-r--r-- | openbsd-compat/inet_aton.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c index 355bf6bc..130597e1 100644 --- a/openbsd-compat/inet_aton.c +++ b/openbsd-compat/inet_aton.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $ */ +/* $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $ */ /* * Copyright (c) 1983, 1990, 1993 @@ -55,15 +55,6 @@ #if !defined(HAVE_INET_ATON) -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; -static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $"; -#else -static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $"; -#endif -#endif /* LIBC_SCCS and not lint */ - #include <sys/types.h> #include <sys/param.h> #include <netinet/in.h> @@ -76,8 +67,7 @@ static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert E * The value returned is in network order. */ in_addr_t -inet_addr(cp) - register const char *cp; +inet_addr(const char *cp) { struct in_addr val; @@ -97,11 +87,11 @@ inet_addr(cp) int inet_aton(const char *cp, struct in_addr *addr) { - register u_int32_t val; - register int base, n; - register char c; - unsigned int parts[4]; - register unsigned int *pp = parts; + u_int32_t val; + int base, n; + char c; + u_int parts[4]; + u_int *pp = parts; c = *cp; for (;;) { |