diff options
| author | fenner <fenner@FreeBSD.org> | 1998-09-15 19:31:43 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 1998-09-15 19:31:43 +0000 |
| commit | eba95a7c80ca78a1aab3295884a272ed03ae80ab (patch) | |
| tree | 3aff83cde4c60bfbff0d4a92e35416e45b637477 /contrib/libpcap/nametoaddr.c | |
| parent | 487207a9c43f463427c6007dee1bfb94d66ec21f (diff) | |
| download | FreeBSD-src-eba95a7c80ca78a1aab3295884a272ed03ae80ab.zip FreeBSD-src-eba95a7c80ca78a1aab3295884a272ed03ae80ab.tar.gz | |
Merge libpcap version 0.4
PR: bin/7877
Diffstat (limited to 'contrib/libpcap/nametoaddr.c')
| -rw-r--r-- | contrib/libpcap/nametoaddr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c index fc17a30..7b744c8 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,7 +24,7 @@ #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> @@ -345,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); } |
