Merging upstream version 4.4.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 63 insertions, 63 deletions

diff --git a/epan/dissectors/packet-hclnfsd.c b/epan/dissectors/packet-hclnfsd.c
index 088ba85e..8112f600 100644
--- a/epan/dissectors/packet-hclnfsd.c
+++ b/epan/dissectors/packet-hclnfsd.c
@@ -41,65 +41,65 @@ void proto_reg_handoff_hclnfsd(void);
 #define HCLNFSDPROC_CANCEL_PRJOB      32
 #define HCLNFSDPROC_ZAP_LOCKS	     105
 
-static int proto_hclnfsd = -1;
-static int hf_hclnfsd_procedure_v1 = -1;
-static int hf_hclnfsd_request_type = -1;
-static int hf_hclnfsd_device = -1;
-/* static int hf_hclnfsd_login = -1; */
-static int hf_hclnfsd_lockname = -1;
-static int hf_hclnfsd_unknown_data = -1;
-static int hf_hclnfsd_lockowner = -1;
-static int hf_hclnfsd_printername = -1;
-static int hf_hclnfsd_filename = -1;
-static int hf_hclnfsd_fileext = -1;
-static int hf_hclnfsd_grpname = -1;
-static int hf_hclnfsd_hostname = -1;
-static int hf_hclnfsd_username = -1;
-static int hf_hclnfsd_queuename = -1;
-static int hf_hclnfsd_queuecomment = -1;
-static int hf_hclnfsd_queuestatus = -1;
-static int hf_hclnfsd_numphysicalprinters = -1;
-static int hf_hclnfsd_printqueuenumber = -1;
-static int hf_hclnfsd_printparams = -1;
-static int hf_hclnfsd_status = -1;
-static int hf_hclnfsd_sequence = -1;
-static int hf_hclnfsd_server_ip = -1;
-static int hf_hclnfsd_host_ip = -1;
-static int hf_hclnfsd_gid = -1;
-static int hf_hclnfsd_uid = -1;
-static int hf_hclnfsd_cookie = -1;
-static int hf_hclnfsd_mode = -1;
-static int hf_hclnfsd_access = -1;
-static int hf_hclnfsd_exclusive = -1;
-static int hf_hclnfsd_offset = -1;
-static int hf_hclnfsd_length = -1;
-static int hf_hclnfsd_jobstatus = -1;
-static int hf_hclnfsd_timesubmitted = -1;
-static int hf_hclnfsd_size = -1;
-static int hf_hclnfsd_copies = -1;
-static int hf_hclnfsd_auth_ident_obscure = -1;
+static int proto_hclnfsd;
+static int hf_hclnfsd_procedure_v1;
+static int hf_hclnfsd_request_type;
+static int hf_hclnfsd_device;
+/* static int hf_hclnfsd_login; */
+static int hf_hclnfsd_lockname;
+static int hf_hclnfsd_unknown_data;
+static int hf_hclnfsd_lockowner;
+static int hf_hclnfsd_printername;
+static int hf_hclnfsd_filename;
+static int hf_hclnfsd_fileext;
+static int hf_hclnfsd_grpname;
+static int hf_hclnfsd_hostname;
+static int hf_hclnfsd_username;
+static int hf_hclnfsd_queuename;
+static int hf_hclnfsd_queuecomment;
+static int hf_hclnfsd_queuestatus;
+static int hf_hclnfsd_numphysicalprinters;
+static int hf_hclnfsd_printqueuenumber;
+static int hf_hclnfsd_printparams;
+static int hf_hclnfsd_status;
+static int hf_hclnfsd_sequence;
+static int hf_hclnfsd_server_ip;
+static int hf_hclnfsd_host_ip;
+static int hf_hclnfsd_gid;
+static int hf_hclnfsd_uid;
+static int hf_hclnfsd_cookie;
+static int hf_hclnfsd_mode;
+static int hf_hclnfsd_access;
+static int hf_hclnfsd_exclusive;
+static int hf_hclnfsd_offset;
+static int hf_hclnfsd_length;
+static int hf_hclnfsd_jobstatus;
+static int hf_hclnfsd_timesubmitted;
+static int hf_hclnfsd_size;
+static int hf_hclnfsd_copies;
+static int hf_hclnfsd_auth_ident_obscure;
 
 /* Generated from convert_proto_tree_add_text.pl */
-static int hf_hclnfsd_job_id = -1;
-static int hf_hclnfsd_print_queues = -1;
-static int hf_hclnfsd_print_jobs = -1;
-static int hf_hclnfsd_gids = -1;
-static int hf_hclnfsd_uids = -1;
-static int hf_hclnfsd_password = -1;
-
-static gint ett_hclnfsd = -1;
-static gint ett_hclnfsd_gids = -1;
-static gint ett_hclnfsd_groups = -1;
-static gint ett_hclnfsd_uids = -1;
-static gint ett_hclnfsd_usernames = -1;
-static gint ett_hclnfsd_printqueues = -1;
-static gint ett_hclnfsd_printjob = -1;
-static gint ett_hclnfsd_auth_ident = -1;
+static int hf_hclnfsd_job_id;
+static int hf_hclnfsd_print_queues;
+static int hf_hclnfsd_print_jobs;
+static int hf_hclnfsd_gids;
+static int hf_hclnfsd_uids;
+static int hf_hclnfsd_password;
+
+static int ett_hclnfsd;
+static int ett_hclnfsd_gids;
+static int ett_hclnfsd_groups;
+static int ett_hclnfsd_uids;
+static int ett_hclnfsd_usernames;
+static int ett_hclnfsd_printqueues;
+static int ett_hclnfsd_printjob;
+static int ett_hclnfsd_auth_ident;
 
 static int
 dissect_hclnfsd_gids(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree)
 {
-	guint32 ngids, ngids_i;
+	uint32_t ngids, ngids_i;
 	proto_tree *gidtree = NULL;
 	proto_item *giditem = NULL;
 
@@ -183,7 +183,7 @@ hclnfsd_decode_obscure(wmem_allocator_t *pool, const char *ident, int ident_len)
 static int
 dissect_hclnfsd_authorize_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_)
 {
-	guint32 request_type;
+	uint32_t request_type;
 	const char *ident = NULL;
 	char *ident_decoded;
 	char *username = NULL;
@@ -238,7 +238,7 @@ dissect_hclnfsd_authorize_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tr
 static int
 dissect_hclnfsd_authorize_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint32 status;
+	uint32_t status;
 	int offset = 0;
 
 	status = tvb_get_ntohl(tvb, offset);
@@ -308,7 +308,7 @@ dissect_hclnfsd_return_host_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 static int
 dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint32 nuids, nuids_i;
+	uint32_t nuids, nuids_i;
 	proto_tree *uidtree = NULL;
 	proto_item *uiditem = NULL;
 	int offset = 0;
@@ -333,7 +333,7 @@ dissect_hclnfsd_uid_to_name_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tr
 static int
 dissect_hclnfsd_uid_to_name_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint32 nusers, nusers_i;
+	uint32_t nusers, nusers_i;
 	proto_tree *usertree = NULL;
 	proto_item *useritem = NULL;
 	int offset = 0;
@@ -376,7 +376,7 @@ dissect_hclnfsd_name_to_uid_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_t
 static int
 dissect_hclnfsd_share_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
 {
-	guint32 request_type;
+	uint32_t request_type;
 	int offset = 0;
 
 	proto_tree_add_item_ret_uint(tree, hf_hclnfsd_request_type, tvb, offset,
@@ -404,7 +404,7 @@ dissect_hclnfsd_share_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static int
 dissect_hclnfsd_share_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint32 request_type;
+	uint32_t request_type;
 	int offset = 0;
 
 	request_type = tvb_get_ntohl(tvb, offset);
@@ -465,7 +465,7 @@ dissect_hclnfsd_lock_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
 static int
 dissect_hclnfsd_lock_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint32 request_type;
+	uint32_t request_type;
 	int offset = 0;
 
 	proto_tree_add_item_ret_uint(tree, hf_hclnfsd_request_type, tvb, offset,
@@ -524,7 +524,7 @@ dissect_hclnfsd_unlock_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
 static int
 dissect_hclnfsd_get_printers_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint nqueues, nqueues_i;
+	unsigned nqueues, nqueues_i;
 	proto_item *queuesitem = NULL;
 	proto_tree *queuestree = NULL;
 	int offset = 0;
@@ -571,7 +571,7 @@ dissect_hclnfsd_get_printq_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tre
 static int
 dissect_hclnfsd_get_printq_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
 {
-	guint datafollows;
+	unsigned datafollows;
 	proto_item *queueitem = NULL;
 	proto_tree *queuetree = NULL;
 	proto_item *jobitem;
@@ -872,7 +872,7 @@ proto_register_hclnfsd(void)
 		    NULL, HFILL }
 		},
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_hclnfsd,
 		&ett_hclnfsd_gids,
 		&ett_hclnfsd_groups,