From af0819f942fc85919fe9e81a9e990b0f9bf50ca2 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 10 Nov 2013 03:20:04 +0000 Subject: Add data parameter to dissect_function_t in vsff structure. The intention here is to use it to replace some pinfo->private_data. I didn't realize how expansive this change would be, so committing it now before replacing the pinfo->private_data, so if something needs to be reverted, all of this is not lost. svn path=/trunk/; revision=53213 --- epan/dissectors/packet-nfsacl.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'epan/dissectors/packet-nfsacl.c') diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c index 8707027c75..15b4511095 100644 --- a/epan/dissectors/packet-nfsacl.c +++ b/epan/dissectors/packet-nfsacl.c @@ -224,7 +224,7 @@ static const value_string nfsacl1_proc_vals[] = { static int dissect_nfsacl2_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_mask(tvb, offset, tree); @@ -233,7 +233,7 @@ dissect_nfsacl2_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -254,7 +254,7 @@ dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_secattr(tvb, offset, pinfo, tree); @@ -264,7 +264,7 @@ dissect_nfsacl2_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -282,7 +282,7 @@ dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); @@ -291,7 +291,7 @@ dissect_nfsacl2_getattr_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_nfs2_fattr(tvb, offset, tree, "attr"); @@ -300,7 +300,7 @@ dissect_nfsacl2_getattr_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 *acc_request, amask; rpc_call_info_value *civ; @@ -321,7 +321,7 @@ dissect_nfsacl2_access_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; @@ -342,7 +342,7 @@ dissect_nfsacl2_access_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl2_getxattrdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_rpc_bool(tvb, tree, hf_nfsacl_create, offset); @@ -352,7 +352,7 @@ dissect_nfsacl2_getxattrdir_call(tvbuff_t *tvb, int offset, static int dissect_nfsacl2_getxattrdir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 status; @@ -398,7 +398,7 @@ static const value_string nfsacl2_proc_vals[] = { static int dissect_nfsacl3_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL); offset = dissect_nfsacl_mask(tvb, offset, tree); @@ -408,7 +408,7 @@ dissect_nfsacl3_getacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status; proto_item *entry_item = NULL; @@ -444,7 +444,7 @@ dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { proto_item *acl_item = NULL; @@ -469,7 +469,7 @@ dissect_nfsacl3_setacl_call(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, - proto_tree *tree) + proto_tree *tree, void* data _U_) { guint32 status = tvb_get_ntohl(tvb, offset + 0); @@ -486,7 +486,7 @@ dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, static int dissect_nfsacl3_getxattrdir_call(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL); @@ -497,7 +497,7 @@ dissect_nfsacl3_getxattrdir_call(tvbuff_t *tvb, int offset, static int dissect_nfsacl3_getxattrdir_reply(tvbuff_t *tvb, int offset, - packet_info *pinfo _U_, proto_tree *tree) + packet_info *pinfo _U_, proto_tree *tree, void* data _U_) { guint32 status; -- cgit v1.2.3