diff options
| author | fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 1998-09-15 19:46:59 +0000 |
| commit | 03014afd0377fb8957d9c87572c96a6096b14d45 (patch) | |
| tree | 06d0bbbc70fe36db13ceefd086607351b3abea15 /contrib/tcpdump/parsenfsfh.c | |
| parent | 577b5b88b39bedc51620403e37d7e98cceb75351 (diff) | |
| download | FreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.zip FreeBSD-src-03014afd0377fb8957d9c87572c96a6096b14d45.tar.gz | |
Merge tcpdump 3.4
PR: bin/7877
Diffstat (limited to 'contrib/tcpdump/parsenfsfh.c')
| -rw-r--r-- | contrib/tcpdump/parsenfsfh.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/contrib/tcpdump/parsenfsfh.c b/contrib/tcpdump/parsenfsfh.c index bd5e690..8a9d78a 100644 --- a/contrib/tcpdump/parsenfsfh.c +++ b/contrib/tcpdump/parsenfsfh.c @@ -9,14 +9,16 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: parsenfsfh.c,v 1.12 96/12/10 23:25:50 leres Exp $ (LBL)"; + "@(#) $Header: parsenfsfh.c,v 1.14 97/06/15 13:20:27 leres Exp $ (LBL)"; #endif #include <sys/types.h> #include <sys/time.h> #include <ctype.h> +#ifdef HAVE_MEMORY_H #include <memory.h> +#endif #include <stdio.h> #include <string.h> @@ -313,13 +315,14 @@ int ourself; /* true if file handle was generated on this host */ if (sizeof(*fsidp) >= 14) { if (sizeof(*fsidp) > 14) memset((char *)fsidp, 0, sizeof(*fsidp)); - memcpy((char *)fsidp, fh, 14); /* just use the whole thing */ + /* just use the whole thing */ + memcpy((char *)fsidp, (char *)fh, 14); } else { u_int32_t tempa[4]; /* at least 16 bytes, maybe more */ memset((char *)tempa, 0, sizeof(tempa)); - memcpy((char *)tempa, fh, 14); /* ensure alignment */ + memcpy((char *)tempa, (char *)fh, 14); /* ensure alignment */ fsidp->Fsid_dev.Minor = tempa[0] + (tempa[1]<<1); fsidp->Fsid_dev.Major = tempa[2] + (tempa[3]<<1); fsidp->fsid_code = 0; |
