(Trivial) Whitespace cleanup.

svn path=/trunk/; revision=34790
This commit is contained in:
Bill Meier 2010-11-05 14:27:18 +00:00
parent 1f2f2e918e
commit 332954fd87
1 changed files with 100 additions and 100 deletions

View File

@ -32,7 +32,7 @@
/* verifier */
#define NFS3_COOKIEVERFSIZE 8
#define NFS3_CREATEVERFSIZE 8
#define NFS3_WRITEVERFSIZE 8
#define NFS3_WRITEVERFSIZE 8
/* for ftype3 */
#define NF3REG 1
@ -46,127 +46,127 @@
/*
* NFSv4 error codes used in code, as opposed to UI
*/
#define NFS4_OK 0
#define NFS4ERR_DENIED 10010
#define NFS4_OK 0
#define NFS4ERR_DENIED 10010
#define NFS4ERR_CLID_INUSE 10017
/*
* NFSv4 file types
*/
#define NF4REG 1
#define NF4DIR 2
#define NF4BLK 3
#define NF4CHR 4
#define NF4LNK 5
#define NF4SOCK 6
#define NF4FIFO 7
#define NF4ATTRDIR 8
#define NF4NAMEDATTR 9
#define NF4REG 1
#define NF4DIR 2
#define NF4BLK 3
#define NF4CHR 4
#define NF4LNK 5
#define NF4SOCK 6
#define NF4FIFO 7
#define NF4ATTRDIR 8
#define NF4NAMEDATTR 9
/*
* Since NFSv4 "operations" are handled differently than previous NFS
* versions, these tokens are necessary.
*/
#define NFS4_OP_ACCESS 3
#define NFS4_OP_CLOSE 4
#define NFS4_OP_COMMIT 5
#define NFS4_OP_CREATE 6
#define NFS4_OP_DELEGPURGE 7
#define NFS4_OP_DELEGRETURN 8
#define NFS4_OP_GETATTR 9
#define NFS4_OP_GETFH 10
#define NFS4_OP_LINK 11
#define NFS4_OP_LOCK 12
#define NFS4_OP_LOCKT 13
#define NFS4_OP_LOCKU 14
#define NFS4_OP_LOOKUP 15
#define NFS4_OP_LOOKUPP 16
#define NFS4_OP_NVERIFY 17
#define NFS4_OP_OPEN 18
#define NFS4_OP_OPENATTR 19
#define NFS4_OP_OPEN_CONFIRM 20
#define NFS4_OP_OPEN_DOWNGRADE 21
#define NFS4_OP_PUTFH 22
#define NFS4_OP_PUTPUBFH 23
#define NFS4_OP_PUTROOTFH 24
#define NFS4_OP_READ 25
#define NFS4_OP_READDIR 26
#define NFS4_OP_READLINK 27
#define NFS4_OP_REMOVE 28
#define NFS4_OP_RENAME 29
#define NFS4_OP_RENEW 30
#define NFS4_OP_RESTOREFH 31
#define NFS4_OP_SAVEFH 32
#define NFS4_OP_SECINFO 33
#define NFS4_OP_SETATTR 34
#define NFS4_OP_SETCLIENTID 35
#define NFS4_OP_SETCLIENTID_CONFIRM 36
#define NFS4_OP_VERIFY 37
#define NFS4_OP_WRITE 38
#define NFS4_OP_RELEASE_LOCKOWNER 39
#define NFS4_OP_ACCESS 3
#define NFS4_OP_CLOSE 4
#define NFS4_OP_COMMIT 5
#define NFS4_OP_CREATE 6
#define NFS4_OP_DELEGPURGE 7
#define NFS4_OP_DELEGRETURN 8
#define NFS4_OP_GETATTR 9
#define NFS4_OP_GETFH 10
#define NFS4_OP_LINK 11
#define NFS4_OP_LOCK 12
#define NFS4_OP_LOCKT 13
#define NFS4_OP_LOCKU 14
#define NFS4_OP_LOOKUP 15
#define NFS4_OP_LOOKUPP 16
#define NFS4_OP_NVERIFY 17
#define NFS4_OP_OPEN 18
#define NFS4_OP_OPENATTR 19
#define NFS4_OP_OPEN_CONFIRM 20
#define NFS4_OP_OPEN_DOWNGRADE 21
#define NFS4_OP_PUTFH 22
#define NFS4_OP_PUTPUBFH 23
#define NFS4_OP_PUTROOTFH 24
#define NFS4_OP_READ 25
#define NFS4_OP_READDIR 26
#define NFS4_OP_READLINK 27
#define NFS4_OP_REMOVE 28
#define NFS4_OP_RENAME 29
#define NFS4_OP_RENEW 30
#define NFS4_OP_RESTOREFH 31
#define NFS4_OP_SAVEFH 32
#define NFS4_OP_SECINFO 33
#define NFS4_OP_SETATTR 34
#define NFS4_OP_SETCLIENTID 35
#define NFS4_OP_SETCLIENTID_CONFIRM 36
#define NFS4_OP_VERIFY 37
#define NFS4_OP_WRITE 38
#define NFS4_OP_RELEASE_LOCKOWNER 39
/* Minor version 1 */
#define NFS4_OP_BACKCHANNEL_CTL 40
#define NFS4_OP_BIND_CONN_TO_SESSION 41
#define NFS4_OP_EXCHANGE_ID 42
#define NFS4_OP_CREATE_SESSION 43
#define NFS4_OP_DESTROY_SESSION 44
#define NFS4_OP_FREE_STATEID 45
#define NFS4_OP_GET_DIR_DELEGATION 46
#define NFS4_OP_GETDEVINFO 47
#define NFS4_OP_GETDEVLIST 48
#define NFS4_OP_LAYOUTCOMMIT 49
#define NFS4_OP_LAYOUTGET 50
#define NFS4_OP_LAYOUTRETURN 51
#define NFS4_OP_SECINFO_NO_NAME 52
#define NFS4_OP_SEQUENCE 53
#define NFS4_OP_SET_SSV 54
#define NFS4_OP_TEST_STATEID 55
#define NFS4_OP_WANT_DELEGATION 56
#define NFS4_OP_DESTROY_CLIENTID 57
#define NFS4_OP_RECLAIM_COMPLETE 58
#define NFS4_OP_BACKCHANNEL_CTL 40
#define NFS4_OP_BIND_CONN_TO_SESSION 41
#define NFS4_OP_EXCHANGE_ID 42
#define NFS4_OP_CREATE_SESSION 43
#define NFS4_OP_DESTROY_SESSION 44
#define NFS4_OP_FREE_STATEID 45
#define NFS4_OP_GET_DIR_DELEGATION 46
#define NFS4_OP_GETDEVINFO 47
#define NFS4_OP_GETDEVLIST 48
#define NFS4_OP_LAYOUTCOMMIT 49
#define NFS4_OP_LAYOUTGET 50
#define NFS4_OP_LAYOUTRETURN 51
#define NFS4_OP_SECINFO_NO_NAME 52
#define NFS4_OP_SEQUENCE 53
#define NFS4_OP_SET_SSV 54
#define NFS4_OP_TEST_STATEID 55
#define NFS4_OP_WANT_DELEGATION 56
#define NFS4_OP_DESTROY_CLIENTID 57
#define NFS4_OP_RECLAIM_COMPLETE 58
#define NFS4_OP_ILLEGAL 10044
#define NFS4_OP_ILLEGAL 10044
/*
* NFSv41 callback ops
*/
#define NFS4_OP_CB_GETATTR 3
#define NFS4_OP_CB_RECALL 4
#define NFS4_OP_CB_LAYOUTRECALL 5
#define NFS4_OP_CB_NOTIFY 6
#define NFS4_OP_CB_PUSH_DELEG 7
#define NFS4_OP_CB_RECALL_ANY 8
#define NFS4_OP_CB_RECALLABLE_OBJ_AVAIL 9
#define NFS4_OP_CB_RECALL_SLOT 10
#define NFS4_OP_CB_SEQUENCE 11
#define NFS4_OP_CB_WANTS_CANCELLED 12
#define NFS4_OP_CB_NOTIFY_LOCK 13
#define NFS4_OP_CB_NOTIFY_DEVICEID 14
#define NFS4_OP_CB_ILLEGAL 10044
#define NFS4_OP_CB_GETATTR 3
#define NFS4_OP_CB_RECALL 4
#define NFS4_OP_CB_LAYOUTRECALL 5
#define NFS4_OP_CB_NOTIFY 6
#define NFS4_OP_CB_PUSH_DELEG 7
#define NFS4_OP_CB_RECALL_ANY 8
#define NFS4_OP_CB_RECALLABLE_OBJ_AVAIL 9
#define NFS4_OP_CB_RECALL_SLOT 10
#define NFS4_OP_CB_SEQUENCE 11
#define NFS4_OP_CB_WANTS_CANCELLED 12
#define NFS4_OP_CB_NOTIFY_LOCK 13
#define NFS4_OP_CB_NOTIFY_DEVICEID 14
#define NFS4_OP_CB_ILLEGAL 10044
/* for write */
#define UNSTABLE 0
#define UNSTABLE 0
#define DATA_SYNC 1
#define FILE_SYNC 2
/* for create */
#define UNCHECKED 0
#define GUARDED 1
#define GUARDED 1
#define EXCLUSIVE 2
/* for create4 */
#define UNCHECKED4 0
#define GUARDED4 1
#define EXCLUSIVE4 2
#define UNCHECKED4 0
#define GUARDED4 1
#define EXCLUSIVE4 2
#define EXCLUSIVE4_1 3
/* for access mask */
#define NFS_ACCESS_MASK_READ 0x01
#define NFS_ACCESS_MASK_LOOKUP 0x02
#define NFS_ACCESS_MASK_MODIFY 0x04
#define NFS_ACCESS_MASK_EXTEND 0x08
#define NFS_ACCESS_MASK_DELETE 0x10
#define NFS_ACCESS_MASK_EXECUTE 0x20
#define NFS_ACCESS_MASK_READ 0x01
#define NFS_ACCESS_MASK_LOOKUP 0x02
#define NFS_ACCESS_MASK_MODIFY 0x04
#define NFS_ACCESS_MASK_EXTEND 0x08
#define NFS_ACCESS_MASK_DELETE 0x10
#define NFS_ACCESS_MASK_EXECUTE 0x20
/* pNFS layout types */
#define LAYOUT4_NFSV4_1_FILES 1
@ -181,16 +181,16 @@ extern int dissect_nfs_fh3(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_
const char *name, guint32 *hash);
int dissect_nfs_post_op_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
const char* name);
const char* name);
void nfs_name_snoop_add_name(int xid, tvbuff_t *tvb, int name_offset, int name_len, int parent_offset, int parent_len, char *name);
extern gboolean nfs_fhandle_reqrep_matching;
typedef struct nfs_fhandle_data {
int len;
const unsigned char *fh;
tvbuff_t *tvb;
int len;
const unsigned char *fh;
tvbuff_t *tvb;
} nfs_fhandle_data_t;
void dissect_fhandle_hidden(packet_info *pinfo, proto_tree *tree, int frame);
@ -198,13 +198,13 @@ typedef int (diss_p)(tvbuff_t *tvb, int offset, proto_tree *tree, int hf);
/* Used in packet-nfsacl.c for NFS_ACL dissection */
extern int dissect_fattr(tvbuff_t *tvb, int offset, proto_tree *tree,
const char* name);
const char* name);
extern proto_tree* display_access_items(tvbuff_t* tvb, int offset, packet_info* pinfo, proto_tree* tree,
guint32 amask, char mtype, int version, GString* optext, char* label);
guint32 amask, char mtype, int version, GString* optext, char* label);
extern int dissect_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree* tree,
int version, GString *optext);
int version, GString *optext);
extern gint hf_nfs_nfsstat;