diff options
| author | otto <> | 2004-02-16 19:41:12 +0000 |
|---|---|---|
| committer | otto <> | 2004-02-16 19:41:12 +0000 |
| commit | 0e9a672f0ef59215a3c880a7c883953f7a3dfad2 (patch) | |
| tree | 47941b80d5b5adf5c4482e1b302ce0a452e1ec38 /src/lib/libc/net/ethers.c | |
| parent | 1617c4271e2064de608b1d25e4d8b49ea0b00007 (diff) | |
| download | openbsd-0e9a672f0ef59215a3c880a7c883953f7a3dfad2.tar.gz openbsd-0e9a672f0ef59215a3c880a7c883953f7a3dfad2.tar.bz2 openbsd-0e9a672f0ef59215a3c880a7c883953f7a3dfad2.zip | |
remove redundant code, u_int8_t cannot be > 0xff
ok deraadt@ millert@
Diffstat (limited to 'src/lib/libc/net/ethers.c')
| -rw-r--r-- | src/lib/libc/net/ethers.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/lib/libc/net/ethers.c b/src/lib/libc/net/ethers.c index 899022a622..2c1e562245 100644 --- a/src/lib/libc/net/ethers.c +++ b/src/lib/libc/net/ethers.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ethers.c,v 1.16 2003/06/17 21:56:24 millert Exp $ */ | 1 | /* $OpenBSD: ethers.c,v 1.17 2004/02/16 19:41:12 otto Exp $ */ |
| 2 | 2 | ||
| 3 | /* | 3 | /* |
| 4 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> | 4 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> |
| @@ -23,7 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #if defined(LIBC_SCCS) && !defined(lint) | 25 | #if defined(LIBC_SCCS) && !defined(lint) |
| 26 | static char rcsid[] = "$OpenBSD: ethers.c,v 1.16 2003/06/17 21:56:24 millert Exp $"; | 26 | static char rcsid[] = "$OpenBSD: ethers.c,v 1.17 2004/02/16 19:41:12 otto Exp $"; |
| 27 | #endif /* LIBC_SCCS and not lint */ | 27 | #endif /* LIBC_SCCS and not lint */ |
| 28 | 28 | ||
| 29 | #include <sys/types.h> | 29 | #include <sys/types.h> |
| @@ -54,13 +54,6 @@ ether_ntoa(e) | |||
| 54 | { | 54 | { |
| 55 | static char a[] = "xx:xx:xx:xx:xx:xx"; | 55 | static char a[] = "xx:xx:xx:xx:xx:xx"; |
| 56 | 56 | ||
| 57 | if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF || | ||
| 58 | e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF || | ||
| 59 | e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) { | ||
| 60 | errno = EINVAL; | ||
| 61 | return (NULL); | ||
| 62 | } | ||
| 63 | |||
| 64 | (void)snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x", | 57 | (void)snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x", |
| 65 | e->ether_addr_octet[0], e->ether_addr_octet[1], | 58 | e->ether_addr_octet[0], e->ether_addr_octet[1], |
| 66 | e->ether_addr_octet[2], e->ether_addr_octet[3], | 59 | e->ether_addr_octet[2], e->ether_addr_octet[3], |
| @@ -119,13 +112,6 @@ ether_ntohost(hostname, e) | |||
| 119 | int trylen; | 112 | int trylen; |
| 120 | #endif | 113 | #endif |
| 121 | 114 | ||
| 122 | if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF || | ||
| 123 | e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF || | ||
| 124 | e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) { | ||
| 125 | errno = EINVAL; | ||
| 126 | return (-1); | ||
| 127 | } | ||
| 128 | |||
| 129 | #ifdef YP | 115 | #ifdef YP |
| 130 | snprintf(trybuf, sizeof trybuf, "%x:%x:%x:%x:%x:%x", | 116 | snprintf(trybuf, sizeof trybuf, "%x:%x:%x:%x:%x:%x", |
| 131 | e->ether_addr_octet[0], e->ether_addr_octet[1], | 117 | e->ether_addr_octet[0], e->ether_addr_octet[1], |