summaryrefslogtreecommitdiffstats
path: root/contrib/libpcap/nametoaddr.c
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>2002-06-21 01:38:14 +0000
committerfenner <fenner@FreeBSD.org>2002-06-21 01:38:14 +0000
commit1982c98f747d7933ea5df54af0ef04f33d5626e6 (patch)
tree82ace5d446319843a2e3131677bf40d84ec656b3 /contrib/libpcap/nametoaddr.c
parentb8f074bf7dfede04fc792ddf5b8025dd111ed4f9 (diff)
downloadFreeBSD-src-1982c98f747d7933ea5df54af0ef04f33d5626e6.zip
FreeBSD-src-1982c98f747d7933ea5df54af0ef04f33d5626e6.tar.gz
Merge libpcap 0.7.1
MFC after: 2 weeks
Diffstat (limited to 'contrib/libpcap/nametoaddr.c')
-rw-r--r--contrib/libpcap/nametoaddr.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 437caac..3043a58 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -26,7 +26,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.57.2.1 2001/01/17 18:21:56 guy Exp $ (LBL)";
+ "@(#) $Header: /tcpdump/master/libpcap/nametoaddr.c,v 1.60 2001/07/28 22:56:35 guy Exp $ (LBL)";
#endif
#ifdef HAVE_CONFIG_H
@@ -324,7 +324,7 @@ pcap_ether_aton(const char *s)
if (*s == ':')
s += 1;
d = xdtoi(*s++);
- if (isxdigit(*s)) {
+ if (isxdigit((unsigned char)*s)) {
d <<= 4;
d |= xdtoi(*s++);
}
@@ -415,5 +415,6 @@ __pcap_nametodnaddr(const char *name)
#else
bpf_error("decnet name support not included, '%s' cannot be translated\n",
name);
+ return(0);
#endif
}
OpenPOWER on IntegriCloud