diff options
author | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2009-12-29 21:34:25 +0000 |
commit | fa585019a79ebcb4e0202b1c33f87ff1c5c9ce1c (patch) | |
tree | 28fc9a13eaab935e4de055b561b333d67387a934 /openbsd-compat/inet_aton.c | |
parent | 04942aa41fa94ec6f2c3ce1d348f600f31bb7c78 (diff) | |
parent | 3e2e0ac10674d77618c4c7339e18b83ced247492 (diff) |
import openssh-4.3p2-gsskex-20060223.patch
Diffstat (limited to 'openbsd-compat/inet_aton.c')
-rw-r--r-- | openbsd-compat/inet_aton.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c index c141bcc68..130597e14 100644 --- a/openbsd-compat/inet_aton.c +++ b/openbsd-compat/inet_aton.c | |||
@@ -1,6 +1,4 @@ | |||
1 | /* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */ | 1 | /* $OpenBSD: inet_addr.c,v 1.9 2005/08/06 20:30:03 espie Exp $ */ |
2 | |||
3 | /* $OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $ */ | ||
4 | 2 | ||
5 | /* | 3 | /* |
6 | * Copyright (c) 1983, 1990, 1993 | 4 | * Copyright (c) 1983, 1990, 1993 |
@@ -51,19 +49,12 @@ | |||
51 | * --Copyright-- | 49 | * --Copyright-- |
52 | */ | 50 | */ |
53 | 51 | ||
52 | /* OPENBSD ORIGINAL: lib/libc/net/inet_addr.c */ | ||
53 | |||
54 | #include "includes.h" | 54 | #include "includes.h" |
55 | 55 | ||
56 | #if !defined(HAVE_INET_ATON) | 56 | #if !defined(HAVE_INET_ATON) |
57 | 57 | ||
58 | #if defined(LIBC_SCCS) && !defined(lint) | ||
59 | #if 0 | ||
60 | static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; | ||
61 | static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $"; | ||
62 | #else | ||
63 | static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.7 2003/06/02 20:18:35 millert Exp $"; | ||
64 | #endif | ||
65 | #endif /* LIBC_SCCS and not lint */ | ||
66 | |||
67 | #include <sys/types.h> | 58 | #include <sys/types.h> |
68 | #include <sys/param.h> | 59 | #include <sys/param.h> |
69 | #include <netinet/in.h> | 60 | #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 | |||
76 | * The value returned is in network order. | 67 | * The value returned is in network order. |
77 | */ | 68 | */ |
78 | in_addr_t | 69 | in_addr_t |
79 | inet_addr(cp) | 70 | inet_addr(const char *cp) |
80 | register const char *cp; | ||
81 | { | 71 | { |
82 | struct in_addr val; | 72 | struct in_addr val; |
83 | 73 | ||
@@ -97,11 +87,11 @@ inet_addr(cp) | |||
97 | int | 87 | int |
98 | inet_aton(const char *cp, struct in_addr *addr) | 88 | inet_aton(const char *cp, struct in_addr *addr) |
99 | { | 89 | { |
100 | register u_int32_t val; | 90 | u_int32_t val; |
101 | register int base, n; | 91 | int base, n; |
102 | register char c; | 92 | char c; |
103 | unsigned int parts[4]; | 93 | u_int parts[4]; |
104 | register unsigned int *pp = parts; | 94 | u_int *pp = parts; |
105 | 95 | ||
106 | c = *cp; | 96 | c = *cp; |
107 | for (;;) { | 97 | for (;;) { |