mirror of
https://github.com/the-tcpdump-group/tcpdump.git
synced 2024-11-23 18:14:29 +08:00
s/nfstype/nfs_type/ to avoid conflict with system header files
This commit is contained in:
parent
c3da12efe5
commit
d171e52e94
2
nfs.h
2
nfs.h
@ -245,7 +245,7 @@
|
||||
|
||||
/* File types */
|
||||
typedef enum { NFNON=0, NFREG=1, NFDIR=2, NFBLK=3, NFCHR=4, NFLNK=5,
|
||||
NFSOCK=6, NFFIFO=7 } nfstype;
|
||||
NFSOCK=6, NFFIFO=7 } nfs_type;
|
||||
|
||||
/* Structs for common parts of the rpc's */
|
||||
/*
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.79 2000-07-16 14:32:48 itojun Exp $ (LBL)";
|
||||
"@(#) $Header: /tcpdump/master/tcpdump/print-nfs.c,v 1.80 2000-07-29 08:05:04 assar Exp $ (LBL)";
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
@ -407,7 +407,7 @@ nfsreq_print(register const u_char *bp, u_int length,
|
||||
{
|
||||
register const struct rpc_msg *rp;
|
||||
register const u_int32_t *dp;
|
||||
nfstype type;
|
||||
nfs_type type;
|
||||
int v3;
|
||||
u_int32_t proc;
|
||||
struct nfsv3_sattr sa3;
|
||||
@ -561,7 +561,7 @@ nfsreq_print(register const u_char *bp, u_int length,
|
||||
if ((dp = parsereq(rp, length)) != 0 &&
|
||||
(dp = parsefhn(dp, v3)) != 0) {
|
||||
TCHECK(*dp);
|
||||
type = (nfstype)ntohl(*dp++);
|
||||
type = (nfs_type)ntohl(*dp++);
|
||||
if ((dp = parse_sattr3(dp, &sa3)) == 0)
|
||||
break;
|
||||
printf(" %s", tok2str(type2str, "unk-ft %d", type));
|
||||
|
Loading…
Reference in New Issue
Block a user