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

svn path=/trunk/; revision=5090

1 files changed, 94 insertions, 94 deletions

diff --git a/packet-nisplus.c b/packet-nisplus.c
index dcaf97019a..bb0f28799d 100644
--- a/packet-nisplus.c
+++ b/packet-nisplus.c
@@ -1,7 +1,7 @@
 /* packet-nisplus.c
  * 2001  Ronnie Sahlberg   <See AUTHORS for email>
  *
- * $Id: packet-nisplus.c,v 1.10 2002/01/20 22:12:27 guy Exp $
+ * $Id: packet-nisplus.c,v 1.11 2002/04/03 13:24:12 girlich Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -265,7 +265,7 @@ static const value_string ns_type[] = {
 
 
 static int
-dissect_nisplus_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree, int hfindex)
+dissect_nisplus_time(tvbuff_t *tvb, int offset, proto_tree *tree, int hfindex)
 {
 	nstime_t ts;
 
@@ -279,9 +279,9 @@ dissect_nisplus_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *
 }
 
 static int
-dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_group(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_group_name, offset, NULL);
 
 	return offset;
@@ -300,7 +300,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_group);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_group_flags, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@@ -312,7 +312,7 @@ dissect_group_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 
 static int
-dissect_access_rights(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_access_rights(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
 	proto_item* mask_item = NULL;
 	proto_tree* mask_tree = NULL;
@@ -345,7 +345,7 @@ dissect_access_rights(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 }
 
 static int
-dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -359,7 +359,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table_col);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_table_col_name, offset, NULL);
 
 
@@ -384,7 +384,7 @@ dissect_table(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 		tvb, offset, 4, mask);
 	offset += 4;
 
-	offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
+	offset = dissect_access_rights(tvb, offset, lock_tree);
 
 	proto_item_set_len(lock_item, offset-old_offset);
 	return offset;
@@ -403,19 +403,19 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_table);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_table_type, offset, NULL);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_table_maxcol, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_table_sep, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
 			dissect_table, hf_nisplus_table_cols);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_table_path, offset, NULL);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -423,7 +423,7 @@ dissect_table_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 }
 
 static int
-dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -450,7 +450,7 @@ dissect_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 	proto_tree_add_boolean(mask_tree, hf_nisplus_entry_mask_asn, tvb, offset, 4, mask);
 	offset += 4;
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_entry_val, offset, NULL);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -469,7 +469,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_entry);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_entry_type, offset, NULL);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@@ -480,7 +480,7 @@ dissect_entry_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 }
 
 static int
-dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -491,10 +491,10 @@ dissect_attr(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_attr);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_attr_name, offset, NULL);
 
-	offset = dissect_rpc_data(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_data(tvb, lock_tree, 
 			hf_nisplus_attr_val, offset);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -513,13 +513,13 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_link);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_object_type, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
 			dissect_attr, hf_nisplus_attrs_array);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_object_name,	offset, NULL);
 	
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -528,7 +528,7 @@ dissect_link_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
 
 
 static int
-dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -539,13 +539,13 @@ dissect_endpoint(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_endpoint);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_endpoint_uaddr, offset, NULL);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_endpoint_family, offset, NULL);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_endpoint_proto, offset, NULL);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -565,16 +565,16 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_server);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_server_name, offset, NULL);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
 			dissect_endpoint, hf_nisplus_endpoints);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_key_type, offset);
 
-	offset = dissect_rpc_data(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_data(tvb, lock_tree, 
 			hf_nisplus_key_data, offset);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -583,7 +583,7 @@ dissect_directory_server(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
 
 
 static int
-dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -594,9 +594,9 @@ dissect_directory_mask(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory_mask);
 
-	offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
+	offset = dissect_access_rights(tvb, offset, lock_tree);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_object_type, offset);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -615,16 +615,16 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_directory);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_directory_name, offset, NULL);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_directory_type, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
 			dissect_directory_server, hf_nisplus_servers);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_directory_ttl, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@@ -635,7 +635,7 @@ dissect_directory_obj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 }
 
 static int
-dissect_nisplus_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_nisplus_oid(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -646,10 +646,10 @@ dissect_nisplus_oid(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_oid);
 
-	offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree, 
+	offset = dissect_nisplus_time(tvb, offset, lock_tree, 
 			hf_nisplus_object_ctime);
 
-	offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree, 
+	offset = dissect_nisplus_time(tvb, offset, lock_tree, 
 			hf_nisplus_object_mtime);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -669,27 +669,27 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_object);
 
-	offset = dissect_nisplus_oid(tvb, offset, pinfo, lock_tree);
+	offset = dissect_nisplus_oid(tvb, offset, lock_tree);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_object_name,	offset, NULL);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_object_owner, offset, NULL);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_object_group, offset, NULL);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree,
+	offset = dissect_rpc_string(tvb, lock_tree,
 			hf_nisplus_object_domain, offset, NULL);
 
-	offset = dissect_access_rights(tvb, offset, pinfo, lock_tree);
+	offset = dissect_access_rights(tvb, offset, lock_tree);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_object_ttl, offset);
 
 	type = tvb_get_ntohl(tvb, offset);
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_object_type, offset);
 	switch (type) {
 	case	NIS_DIRECTORY_OBJ:
@@ -708,7 +708,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 		offset = dissect_link_obj(tvb, offset, pinfo, lock_tree);
 		break;
 	case	NIS_PRIVATE_OBJ:
-		offset = dissect_rpc_data(tvb, pinfo, lock_tree, 
+		offset = dissect_rpc_data(tvb, lock_tree, 
 				hf_nisplus_object_private, offset);
 		break;
 	case	NIS_NO_OBJ:
@@ -732,7 +732,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 static int
 dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_object_name, offset, NULL);
 	
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -744,13 +744,13 @@ dissect_ns_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 static int
 dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_object_name, offset, NULL);
 	
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
 			dissect_attr, hf_nisplus_attrs_array);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_ib_flags, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -759,29 +759,29 @@ dissect_ib_request(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
 			dissect_directory_server, hf_nisplus_cbservers);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_ib_bufsize, offset);
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_cookie, offset);
 
 	return offset;
 }
 
 static int
-dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_fd_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_fd_dirname, offset, NULL);
 	
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_fd_requester, offset, NULL);
 
 	return offset;
 }
 	
 static int
-dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
@@ -792,10 +792,10 @@ dissect_nisplus_tag(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *t
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_tag);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_tag_type, offset);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_tag_val, offset, NULL);
 
 	proto_item_set_len(lock_item, offset-old_offset);
@@ -814,10 +814,10 @@ dissect_nisplus_taglist(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tre
 static int
 dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_dump_dir, offset, NULL);
 
-	offset = dissect_nisplus_time(tvb, offset, pinfo, tree, 
+	offset = dissect_nisplus_time(tvb, offset, tree, 
 			hf_nisplus_dump_time);
 
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -827,30 +827,30 @@ dissect_dump_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 }
 
 static int
-dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_netobj(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_dummy, offset);
 
 	return offset;
 }
 
 static int
-dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_nisname(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_object_name, offset, NULL);
 	
 	return offset;
 }
 
 static int
-dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_ping_args(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_ping_dir, offset, NULL);
 
-	offset = dissect_nisplus_time(tvb, offset, pinfo, tree, 
+	offset = dissect_nisplus_time(tvb, offset, tree, 
 			hf_nisplus_ping_time);
 
 	return offset;
@@ -960,43 +960,43 @@ static const value_string nis_error[] = {
 static int
 dissect_nisplus_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_error, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
 			dissect_nisplus_object, hf_nisplus_object);
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_cookie, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_zticks, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_dticks, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_aticks, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_cticks, offset);
 
 	return offset;
 }
 
 static int
-dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_fd_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_error, offset);
 
-	offset = dissect_rpc_string(tvb, pinfo, tree, 
+	offset = dissect_rpc_string(tvb, tree, 
 			hf_nisplus_fd_dirname, offset, NULL);
 	
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_dir_data, offset);
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_signature, offset);
 
 	return offset;
@@ -1035,16 +1035,16 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 
 	lock_tree = proto_item_add_subtree(lock_item, ett_nisplus_log_entry);
 
-	offset = dissect_nisplus_time(tvb, offset, pinfo, lock_tree, 
+	offset = dissect_nisplus_time(tvb, offset, lock_tree, 
 			hf_nisplus_log_time);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_uint32(tvb, lock_tree, 
 			hf_nisplus_log_type, offset);
 
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_log_principal, offset, NULL);
 	
-	offset = dissect_rpc_string(tvb, pinfo, lock_tree, 
+	offset = dissect_rpc_string(tvb, lock_tree, 
 			hf_nisplus_directory_name, offset, NULL);
 
 	offset = dissect_rpc_array(tvb, pinfo, lock_tree, offset,
@@ -1059,10 +1059,10 @@ dissect_log_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tre
 static int
 dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
 {
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_error, offset);
 
-	offset = dissect_rpc_data(tvb, pinfo, tree, 
+	offset = dissect_rpc_data(tvb, tree, 
 			hf_nisplus_cookie, offset);
 
 	offset = dissect_rpc_array(tvb, pinfo, tree, offset,
@@ -1072,42 +1072,42 @@ dissect_log_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tr
 }
 
 static int
-dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_callback_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_bool(tvb, pinfo, tree, hf_nisplus_callback_status,
+	offset = dissect_rpc_bool(tvb, tree, hf_nisplus_callback_status,
 			offset);
 
 	return offset;
 }
 
 static int
-dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_change_time(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_nisplus_time(tvb, offset, pinfo, tree, 
+	offset = dissect_nisplus_time(tvb, offset, tree, 
 			hf_nisplus_log_time);
 
 	return offset;
 }
 
 static int
-dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_cp_result(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_cp_status, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_cp_zticks, offset);
 
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_cp_dticks, offset);
 
 	return offset;
 }
 
 static int
-dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_nisplus_error(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	offset = dissect_rpc_uint32(tvb, pinfo, tree, 
+	offset = dissect_rpc_uint32(tvb, tree, 
 			hf_nisplus_error, offset);
 
 	return offset;
@@ -1847,7 +1847,7 @@ static gint ett_nispluscb = -1;
 static gint ett_nispluscb_entry = -1;
 
 static int
-dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree)
+dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;