summaryrefslogtreecommitdiffstats
path: root/contrib/libpcap/nametoaddr.c
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>1998-09-15 19:28:10 +0000
committerfenner <fenner@FreeBSD.org>1998-09-15 19:28:10 +0000
commitca0d84cb8bfc8789fd48ada56322a575c4a1aa68 (patch)
tree5c946e9b84405911032e77b9942372a03521a64f /contrib/libpcap/nametoaddr.c
parent737558aa98d3b86de65ff8e1fd0fe39d5debcde7 (diff)
downloadFreeBSD-src-ca0d84cb8bfc8789fd48ada56322a575c4a1aa68.zip
FreeBSD-src-ca0d84cb8bfc8789fd48ada56322a575c4a1aa68.tar.gz
Virgin import of LBL libpcap v0.4
Diffstat (limited to 'contrib/libpcap/nametoaddr.c')
-rw-r--r--contrib/libpcap/nametoaddr.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c
index 88905ff..f03c493 100644
--- a/contrib/libpcap/nametoaddr.c
+++ b/contrib/libpcap/nametoaddr.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996
+ * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998
* The Regents of the University of California. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -24,12 +24,13 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: nametoaddr.c,v 1.45 96/10/17 23:26:53 leres Exp $ (LBL)";
+ "@(#) $Header: nametoaddr.c,v 1.48 98/07/12 13:15:36 leres Exp $ (LBL)";
#endif
#include <sys/param.h>
#include <sys/types.h> /* concession to AIX */
#include <sys/socket.h>
+#include <sys/time.h>
#if __STDC__
struct mbuf;
@@ -344,7 +345,7 @@ pcap_ether_hostton(const char *name)
if (ether_hostton((char *)name, (struct ether_addr *)a) == 0) {
ap = (u_char *)malloc(6);
if (ap != NULL)
- memcpy(ap, a, 6);
+ memcpy((char *)ap, (char *)a, 6);
}
return (ap);
}
OpenPOWER on IntegriCloud