Removed many senseless pinfo parameters in RPC dissection and the layers above.

svn path=/trunk/; revision=5090

1 files changed, 50 insertions, 50 deletions

diff --git a/packet-nlm.c b/packet-nlm.c
index e8297eb339..4503711eca 100644
--- a/packet-nlm.c
+++ b/packet-nlm.c
@@ -1,7 +1,7 @@
 /* packet-nlm.c
  * Routines for nlm dissection
  *
- * $Id: packet-nlm.c,v 1.23 2002/01/24 09:20:50 guy Exp $
+ * $Id: packet-nlm.c,v 1.24 2002/04/03 13:24:12 girlich Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -165,21 +165,21 @@ dissect_lock(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int version, i
 			lock_tree = proto_item_add_subtree(lock_item, ett_nlm_lock);
 	}
 
-	offset = dissect_rpc_string(tvb,pinfo,lock_tree,
+	offset = dissect_rpc_string(tvb,lock_tree,
 			hf_nlm_lock_caller_name, offset, NULL);
 	offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree,"fh");
 
-	offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
+	offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid, offset);
+	offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_svid, offset);
 
 	if (version == 4) {
-		offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset64, offset);
-		offset = dissect_rpc_uint64(tvb, pinfo, lock_tree, hf_nlm_lock_l_len64, offset);
+		offset = dissect_rpc_uint64(tvb, lock_tree, hf_nlm_lock_l_offset64, offset);
+		offset = dissect_rpc_uint64(tvb, lock_tree, hf_nlm_lock_l_len64, offset);
 	}
 	else {
-		offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_offset, offset);
-		offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_l_len, offset);
+		offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_l_offset, offset);
+		offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_l_len, offset);
 	}
 
 	return offset;
@@ -190,8 +190,8 @@ static int
 dissect_nlm_test(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree, int version)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
 	offset += 4;
 	offset = dissect_lock(tvb, pinfo, tree, version, offset);
 	return offset;
@@ -201,12 +201,12 @@ static int
 dissect_nlm_lock(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree,int version)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_block, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
 	offset = dissect_lock(tvb, pinfo, tree, version, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_state, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_reclaim, offset);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nlm_state, offset);
 	return offset;
 }
 
@@ -214,9 +214,9 @@ static int
 dissect_nlm_cancel(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree,int version)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_block, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_block, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
 	offset = dissect_lock(tvb, pinfo, tree, version, offset);
 	return offset;
 }
@@ -225,7 +225,7 @@ static int
 dissect_nlm_unlock(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree,int version)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
 	offset = dissect_lock(tvb, pinfo, tree, version, offset);
 	return offset;
 }
@@ -234,21 +234,21 @@ static int
 dissect_nlm_granted(tvbuff_t *tvb, int offset, packet_info *pinfo,
     proto_tree *tree,int version)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_exclusive, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_exclusive, offset);
 	offset = dissect_lock(tvb, pinfo, tree, version, offset);
 	return offset;
 }
 
 
 static int
-dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
     proto_tree *tree,int version)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
 
 	if (tree) {
 		lock_item = proto_tree_add_item(tree, hf_nlm_test_stat, tvb,
@@ -258,7 +258,7 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
 				ett_nlm_lock);
 	}
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_test_stat_stat,
+	offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_test_stat_stat,
 	    offset);
 
 	/* last structure is optional, only supplied for stat==1 (LOCKED) */
@@ -274,23 +274,23 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
 				ett_nlm_lock);
 	}
 
-	offset = dissect_rpc_bool(tvb, pinfo, lock_tree, hf_nlm_exclusive,
+	offset = dissect_rpc_bool(tvb, lock_tree, hf_nlm_exclusive,
 	    offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_lock_svid,
+	offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_lock_svid,
 	    offset);
-	offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner,
+	offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner,
 	    offset);
 
 	if (version == 4) {
-		offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
+		offset = dissect_rpc_uint64(tvb, lock_tree,
 		    hf_nlm_lock_l_offset64, offset);
-		offset = dissect_rpc_uint64(tvb, pinfo, lock_tree,
+		offset = dissect_rpc_uint64(tvb, lock_tree,
 		    hf_nlm_lock_l_len64, offset);
 	}
 	else {
-		offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
+		offset = dissect_rpc_uint32(tvb, lock_tree,
 		    hf_nlm_lock_l_offset, offset);
-		offset = dissect_rpc_uint32(tvb, pinfo, lock_tree,
+		offset = dissect_rpc_uint32(tvb, lock_tree,
 		    hf_nlm_lock_l_len, offset);
 	}
 
@@ -300,12 +300,12 @@ dissect_nlm_test_res(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 static int
 dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
-    proto_tree *tree,int version)
+    proto_tree *tree,int version _U_)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
 
 	if (tree) {
 		lock_item = proto_tree_add_item(tree, hf_nlm_share, tvb,
@@ -315,39 +315,39 @@ dissect_nlm_share(tvbuff_t *tvb, int offset, packet_info *pinfo,
 				ett_nlm_lock);
 	}
 
-	offset = dissect_rpc_string(tvb,pinfo,lock_tree,
+	offset = dissect_rpc_string(tvb,lock_tree,
 			hf_nlm_lock_caller_name, offset, NULL);
 	
 	offset = dissect_nfs_fh3(tvb, offset, pinfo, lock_tree, "fh");
 
-	offset = dissect_rpc_data(tvb, pinfo, lock_tree, hf_nlm_lock_owner, offset);
+	offset = dissect_rpc_data(tvb, lock_tree, hf_nlm_lock_owner, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_mode, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, hf_nlm_share_access, offset);
+	offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_share_mode, offset);
+	offset = dissect_rpc_uint32(tvb, lock_tree, hf_nlm_share_access, offset);
 
 
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nlm_reclaim, offset);
+	offset = dissect_rpc_bool(tvb, tree, hf_nlm_reclaim, offset);
 	return offset;
 }
 
 static int
-dissect_nlm_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo,
-    proto_tree *tree, int version)
+dissect_nlm_shareres(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+    proto_tree *tree, int version _U_)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_sequence, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nlm_sequence, offset);
 	return offset;
 }
 
 static int
-dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
-    proto_tree *tree,int version)
+dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+    proto_tree *tree,int version _U_)
 {
-	offset = dissect_rpc_string(tvb,pinfo,tree,
+	offset = dissect_rpc_string(tvb,tree,
 			hf_nlm_share_name, offset, NULL);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
 
 	return offset;
 }
@@ -358,11 +358,11 @@ dissect_nlm_freeall(tvbuff_t *tvb, int offset, packet_info *pinfo,
 
 /* This function is identical for all NLM protocol versions (1-4)*/
 static int
-dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo,
+dissect_nlm_gen_reply(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
     proto_tree *tree)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, hf_nlm_cookie, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, hf_nlm_stat, offset);
+	offset = dissect_rpc_data(tvb, tree, hf_nlm_cookie, offset);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nlm_stat, offset);
 	return offset;
 }