diff options
author | otto <> | 2005-03-25 13:24:12 +0000 |
---|---|---|
committer | otto <> | 2005-03-25 13:24:12 +0000 |
commit | 2f490723a2e673b2457f65c4b06cacb7d700a3e8 (patch) | |
tree | c9dcd3a58da3f7404d9e626fe10abdd67c384fba /src/lib/libc/net/linkaddr.c | |
parent | 9a03506f8308b6023a12f108a2072feb958607a6 (diff) | |
download | openbsd-2f490723a2e673b2457f65c4b06cacb7d700a3e8.tar.gz openbsd-2f490723a2e673b2457f65c4b06cacb7d700a3e8.tar.bz2 openbsd-2f490723a2e673b2457f65c4b06cacb7d700a3e8.zip |
ansify. ok deraadt@ moritz@
Diffstat (limited to 'src/lib/libc/net/linkaddr.c')
-rw-r--r-- | src/lib/libc/net/linkaddr.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/lib/libc/net/linkaddr.c b/src/lib/libc/net/linkaddr.c index ee45ff767d..fcb0164ca4 100644 --- a/src/lib/libc/net/linkaddr.c +++ b/src/lib/libc/net/linkaddr.c | |||
@@ -28,7 +28,7 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | #if defined(LIBC_SCCS) && !defined(lint) | 30 | #if defined(LIBC_SCCS) && !defined(lint) |
31 | static char rcsid[] = "$OpenBSD: linkaddr.c,v 1.3 2003/06/02 20:18:35 millert Exp $"; | 31 | static char rcsid[] = "$OpenBSD: linkaddr.c,v 1.4 2005/03/25 13:24:12 otto Exp $"; |
32 | #endif /* LIBC_SCCS and not lint */ | 32 | #endif /* LIBC_SCCS and not lint */ |
33 | 33 | ||
34 | #include <sys/types.h> | 34 | #include <sys/types.h> |
@@ -48,13 +48,11 @@ static char rcsid[] = "$OpenBSD: linkaddr.c,v 1.3 2003/06/02 20:18:35 millert Ex | |||
48 | #define LETTER (4*3) | 48 | #define LETTER (4*3) |
49 | 49 | ||
50 | void | 50 | void |
51 | link_addr(addr, sdl) | 51 | link_addr(const char *addr, struct sockaddr_dl *sdl) |
52 | register const char *addr; | ||
53 | register struct sockaddr_dl *sdl; | ||
54 | { | 52 | { |
55 | register char *cp = sdl->sdl_data; | 53 | char *cp = sdl->sdl_data; |
56 | char *cplim = sdl->sdl_len + (char *)sdl; | 54 | char *cplim = sdl->sdl_len + (char *)sdl; |
57 | register int byte = 0, state = NAMING, new; | 55 | int byte = 0, state = NAMING, new; |
58 | 56 | ||
59 | bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1); | 57 | bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1); |
60 | sdl->sdl_family = AF_LINK; | 58 | sdl->sdl_family = AF_LINK; |
@@ -119,13 +117,12 @@ link_addr(addr, sdl) | |||
119 | static char hexlist[] = "0123456789abcdef"; | 117 | static char hexlist[] = "0123456789abcdef"; |
120 | 118 | ||
121 | char * | 119 | char * |
122 | link_ntoa(sdl) | 120 | link_ntoa(const struct sockaddr_dl *sdl) |
123 | register const struct sockaddr_dl *sdl; | ||
124 | { | 121 | { |
125 | static char obuf[64]; | 122 | static char obuf[64]; |
126 | register char *out = obuf; | 123 | char *out = obuf; |
127 | register int i; | 124 | int i; |
128 | register u_char *in = (u_char *)LLADDR(sdl); | 125 | u_char *in = (u_char *)LLADDR(sdl); |
129 | u_char *inlim = in + sdl->sdl_alen; | 126 | u_char *inlim = in + sdl->sdl_alen; |
130 | int firsttime = 1; | 127 | int firsttime = 1; |
131 | 128 | ||