From 0e9a672f0ef59215a3c880a7c883953f7a3dfad2 Mon Sep 17 00:00:00 2001 From: otto <> Date: Mon, 16 Feb 2004 19:41:12 +0000 Subject: remove redundant code, u_int8_t cannot be > 0xff ok deraadt@ millert@ --- src/lib/libc/net/ethers.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) (limited to 'src/lib/libc/net') 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 @@ -/* $OpenBSD: ethers.c,v 1.16 2003/06/17 21:56:24 millert Exp $ */ +/* $OpenBSD: ethers.c,v 1.17 2004/02/16 19:41:12 otto Exp $ */ /* * Copyright (c) 1998 Todd C. Miller @@ -23,7 +23,7 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: ethers.c,v 1.16 2003/06/17 21:56:24 millert Exp $"; +static char rcsid[] = "$OpenBSD: ethers.c,v 1.17 2004/02/16 19:41:12 otto Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -54,13 +54,6 @@ ether_ntoa(e) { static char a[] = "xx:xx:xx:xx:xx:xx"; - if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF || - e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF || - e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) { - errno = EINVAL; - return (NULL); - } - (void)snprintf(a, sizeof a, "%02x:%02x:%02x:%02x:%02x:%02x", e->ether_addr_octet[0], e->ether_addr_octet[1], e->ether_addr_octet[2], e->ether_addr_octet[3], @@ -119,13 +112,6 @@ ether_ntohost(hostname, e) int trylen; #endif - if (e->ether_addr_octet[0] > 0xFF || e->ether_addr_octet[1] > 0xFF || - e->ether_addr_octet[2] > 0xFF || e->ether_addr_octet[3] > 0xFF || - e->ether_addr_octet[4] > 0xFF || e->ether_addr_octet[5] > 0xFF) { - errno = EINVAL; - return (-1); - } - #ifdef YP snprintf(trybuf, sizeof trybuf, "%x:%x:%x:%x:%x:%x", e->ether_addr_octet[0], e->ether_addr_octet[1], -- cgit v1.2.3-55-g6feb