Merging upstream version 4.4.0.

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

1 files changed, 144 insertions, 144 deletions

diff --git a/epan/dissectors/packet-nisplus.c b/epan/dissectors/packet-nisplus.c
index 0c78d88a..df3a806a 100644
--- a/epan/dissectors/packet-nisplus.c
+++ b/epan/dissectors/packet-nisplus.c
@@ -19,141 +19,141 @@ void proto_reg_handoff_nis(void);
 void proto_register_niscb(void);
 void proto_reg_handoff_niscb(void);
 
-static int proto_nisplus = -1;
-static int hf_nisplus_procedure_v3 = -1;
-static int hf_nisplus_object = -1;
-static int hf_nisplus_oid = -1;
-static int hf_nisplus_object_ctime = -1;
-static int hf_nisplus_object_mtime = -1;
-static int hf_nisplus_object_name = -1;
-static int hf_nisplus_object_owner = -1;
-static int hf_nisplus_object_group = -1;
-static int hf_nisplus_object_domain = -1;
-static int hf_nisplus_object_ttl = -1;
-static int hf_nisplus_object_type = -1;
-static int hf_nisplus_object_private = -1;
-static int hf_nisplus_directory = -1;
-static int hf_nisplus_directory_name = -1;
-static int hf_nisplus_directory_type = -1;
-static int hf_nisplus_directory_ttl = -1;
-static int hf_nisplus_directory_mask = -1;
-static int hf_nisplus_directory_mask_list = -1;
-static int hf_nisplus_access_mask = -1;
-static int hf_nisplus_mask_world_read = -1;
-static int hf_nisplus_mask_world_modify = -1;
-static int hf_nisplus_mask_world_create = -1;
-static int hf_nisplus_mask_world_destroy = -1;
-static int hf_nisplus_mask_group_read = -1;
-static int hf_nisplus_mask_group_modify = -1;
-static int hf_nisplus_mask_group_create = -1;
-static int hf_nisplus_mask_group_destroy = -1;
-static int hf_nisplus_mask_owner_read = -1;
-static int hf_nisplus_mask_owner_modify = -1;
-static int hf_nisplus_mask_owner_create = -1;
-static int hf_nisplus_mask_owner_destroy = -1;
-static int hf_nisplus_mask_nobody_read = -1;
-static int hf_nisplus_mask_nobody_modify = -1;
-static int hf_nisplus_mask_nobody_create = -1;
-static int hf_nisplus_mask_nobody_destroy = -1;
-static int hf_nisplus_server_name = -1;
-static int hf_nisplus_key_type = -1;
-static int hf_nisplus_key_data = -1;
-static int hf_nisplus_servers = -1;
-static int hf_nisplus_cbservers = -1;
-static int hf_nisplus_server = -1;
-static int hf_nisplus_endpoints = -1;
-static int hf_nisplus_endpoint = -1;
-static int hf_nisplus_endpoint_uaddr = -1;
-static int hf_nisplus_endpoint_family = -1;
-static int hf_nisplus_endpoint_proto = -1;
-static int hf_nisplus_link = -1;
-static int hf_nisplus_attrs_array = -1;
-static int hf_nisplus_attr = -1;
-static int hf_nisplus_attr_name = -1;
-static int hf_nisplus_attr_val = -1;
-static int hf_nisplus_entry = -1;
-static int hf_nisplus_entry_type = -1;
-static int hf_nisplus_entry_cols = -1;
-static int hf_nisplus_entry_col = -1;
-/* static int hf_nisplus_entry_flags = -1; */
-static int hf_nisplus_entry_val = -1;
-static int hf_nisplus_entry_mask = -1;
-static int hf_nisplus_entry_mask_binary = -1;
-static int hf_nisplus_entry_mask_crypt = -1;
-static int hf_nisplus_entry_mask_xdr = -1;
-static int hf_nisplus_entry_mask_modified = -1;
-static int hf_nisplus_entry_mask_asn = -1;
-static int hf_nisplus_table = -1;
-static int hf_nisplus_table_type = -1;
-static int hf_nisplus_table_maxcol = -1;
-static int hf_nisplus_table_sep = -1;
-static int hf_nisplus_table_cols = -1;
-static int hf_nisplus_table_col = -1;
-static int hf_nisplus_table_path = -1;
-static int hf_nisplus_table_col_name = -1;
-static int hf_nisplus_table_col_mask = -1;
-static int hf_nisplus_table_col_mask_binary = -1;
-static int hf_nisplus_table_col_mask_encrypted = -1;
-static int hf_nisplus_table_col_mask_xdr = -1;
-static int hf_nisplus_table_col_mask_searchable = -1;
-static int hf_nisplus_table_col_mask_casesensitive = -1;
-static int hf_nisplus_table_col_mask_modified = -1;
-static int hf_nisplus_table_col_mask_asn = -1;
-static int hf_nisplus_group = -1;
-static int hf_nisplus_group_flags = -1;
-static int hf_nisplus_grps = -1;
-static int hf_nisplus_group_name = -1;
-static int hf_nisplus_ib_flags = -1;
-static int hf_nisplus_ib_bufsize = -1;
-static int hf_nisplus_cookie = -1;
-static int hf_nisplus_fd_dirname = -1;
-static int hf_nisplus_fd_requester = -1;
-static int hf_nisplus_taglist = -1;
-static int hf_nisplus_tag = -1;
-static int hf_nisplus_tag_type = -1;
-static int hf_nisplus_tag_val = -1;
-static int hf_nisplus_dump_dir = -1;
-static int hf_nisplus_dump_time = -1;
-static int hf_nisplus_dummy = -1;
-static int hf_nisplus_ping_dir = -1;
-static int hf_nisplus_ping_time = -1;
-static int hf_nisplus_error = -1;
-static int hf_nisplus_dir_data = -1;
-static int hf_nisplus_signature = -1;
-static int hf_nisplus_log_entries = -1;
-static int hf_nisplus_log_entry = -1;
-static int hf_nisplus_log_type = -1;
-static int hf_nisplus_log_time = -1;
-static int hf_nisplus_log_principal = -1;
-static int hf_nisplus_callback_status = -1;
-static int hf_nisplus_cp_status = -1;
-static int hf_nisplus_cp_zticks = -1;
-static int hf_nisplus_cp_dticks = -1;
-static int hf_nisplus_zticks = -1;
-static int hf_nisplus_dticks = -1;
-static int hf_nisplus_aticks = -1;
-static int hf_nisplus_cticks = -1;
-
-static gint ett_nisplus = -1;
-static gint ett_nisplus_object = -1;
-static gint ett_nisplus_oid = -1;
-static gint ett_nisplus_directory = -1;
-static gint ett_nisplus_directory_mask = -1;
-static gint ett_nisplus_access_mask = -1;
-static gint ett_nisplus_server = -1;
-static gint ett_nisplus_endpoint = -1;
-static gint ett_nisplus_link = -1;
-static gint ett_nisplus_attr = -1;
-static gint ett_nisplus_entry = -1;
-static gint ett_nisplus_entry_col = -1;
-static gint ett_nisplus_entry_mask = -1;
-static gint ett_nisplus_table = -1;
-static gint ett_nisplus_table_col = -1;
-static gint ett_nisplus_table_col_mask = -1;
-static gint ett_nisplus_group = -1;
-static gint ett_nisplus_grps = -1;
-static gint ett_nisplus_tag = -1;
-static gint ett_nisplus_log_entry = -1;
+static int proto_nisplus;
+static int hf_nisplus_procedure_v3;
+static int hf_nisplus_object;
+static int hf_nisplus_oid;
+static int hf_nisplus_object_ctime;
+static int hf_nisplus_object_mtime;
+static int hf_nisplus_object_name;
+static int hf_nisplus_object_owner;
+static int hf_nisplus_object_group;
+static int hf_nisplus_object_domain;
+static int hf_nisplus_object_ttl;
+static int hf_nisplus_object_type;
+static int hf_nisplus_object_private;
+static int hf_nisplus_directory;
+static int hf_nisplus_directory_name;
+static int hf_nisplus_directory_type;
+static int hf_nisplus_directory_ttl;
+static int hf_nisplus_directory_mask;
+static int hf_nisplus_directory_mask_list;
+static int hf_nisplus_access_mask;
+static int hf_nisplus_mask_world_read;
+static int hf_nisplus_mask_world_modify;
+static int hf_nisplus_mask_world_create;
+static int hf_nisplus_mask_world_destroy;
+static int hf_nisplus_mask_group_read;
+static int hf_nisplus_mask_group_modify;
+static int hf_nisplus_mask_group_create;
+static int hf_nisplus_mask_group_destroy;
+static int hf_nisplus_mask_owner_read;
+static int hf_nisplus_mask_owner_modify;
+static int hf_nisplus_mask_owner_create;
+static int hf_nisplus_mask_owner_destroy;
+static int hf_nisplus_mask_nobody_read;
+static int hf_nisplus_mask_nobody_modify;
+static int hf_nisplus_mask_nobody_create;
+static int hf_nisplus_mask_nobody_destroy;
+static int hf_nisplus_server_name;
+static int hf_nisplus_key_type;
+static int hf_nisplus_key_data;
+static int hf_nisplus_servers;
+static int hf_nisplus_cbservers;
+static int hf_nisplus_server;
+static int hf_nisplus_endpoints;
+static int hf_nisplus_endpoint;
+static int hf_nisplus_endpoint_uaddr;
+static int hf_nisplus_endpoint_family;
+static int hf_nisplus_endpoint_proto;
+static int hf_nisplus_link;
+static int hf_nisplus_attrs_array;
+static int hf_nisplus_attr;
+static int hf_nisplus_attr_name;
+static int hf_nisplus_attr_val;
+static int hf_nisplus_entry;
+static int hf_nisplus_entry_type;
+static int hf_nisplus_entry_cols;
+static int hf_nisplus_entry_col;
+/* static int hf_nisplus_entry_flags; */
+static int hf_nisplus_entry_val;
+static int hf_nisplus_entry_mask;
+static int hf_nisplus_entry_mask_binary;
+static int hf_nisplus_entry_mask_crypt;
+static int hf_nisplus_entry_mask_xdr;
+static int hf_nisplus_entry_mask_modified;
+static int hf_nisplus_entry_mask_asn;
+static int hf_nisplus_table;
+static int hf_nisplus_table_type;
+static int hf_nisplus_table_maxcol;
+static int hf_nisplus_table_sep;
+static int hf_nisplus_table_cols;
+static int hf_nisplus_table_col;
+static int hf_nisplus_table_path;
+static int hf_nisplus_table_col_name;
+static int hf_nisplus_table_col_mask;
+static int hf_nisplus_table_col_mask_binary;
+static int hf_nisplus_table_col_mask_encrypted;
+static int hf_nisplus_table_col_mask_xdr;
+static int hf_nisplus_table_col_mask_searchable;
+static int hf_nisplus_table_col_mask_casesensitive;
+static int hf_nisplus_table_col_mask_modified;
+static int hf_nisplus_table_col_mask_asn;
+static int hf_nisplus_group;
+static int hf_nisplus_group_flags;
+static int hf_nisplus_grps;
+static int hf_nisplus_group_name;
+static int hf_nisplus_ib_flags;
+static int hf_nisplus_ib_bufsize;
+static int hf_nisplus_cookie;
+static int hf_nisplus_fd_dirname;
+static int hf_nisplus_fd_requester;
+static int hf_nisplus_taglist;
+static int hf_nisplus_tag;
+static int hf_nisplus_tag_type;
+static int hf_nisplus_tag_val;
+static int hf_nisplus_dump_dir;
+static int hf_nisplus_dump_time;
+static int hf_nisplus_dummy;
+static int hf_nisplus_ping_dir;
+static int hf_nisplus_ping_time;
+static int hf_nisplus_error;
+static int hf_nisplus_dir_data;
+static int hf_nisplus_signature;
+static int hf_nisplus_log_entries;
+static int hf_nisplus_log_entry;
+static int hf_nisplus_log_type;
+static int hf_nisplus_log_time;
+static int hf_nisplus_log_principal;
+static int hf_nisplus_callback_status;
+static int hf_nisplus_cp_status;
+static int hf_nisplus_cp_zticks;
+static int hf_nisplus_cp_dticks;
+static int hf_nisplus_zticks;
+static int hf_nisplus_dticks;
+static int hf_nisplus_aticks;
+static int hf_nisplus_cticks;
+
+static int ett_nisplus;
+static int ett_nisplus_object;
+static int ett_nisplus_oid;
+static int ett_nisplus_directory;
+static int ett_nisplus_directory_mask;
+static int ett_nisplus_access_mask;
+static int ett_nisplus_server;
+static int ett_nisplus_endpoint;
+static int ett_nisplus_link;
+static int ett_nisplus_attr;
+static int ett_nisplus_entry;
+static int ett_nisplus_entry_col;
+static int ett_nisplus_entry_mask;
+static int ett_nisplus_table;
+static int ett_nisplus_table_col;
+static int ett_nisplus_table_col_mask;
+static int ett_nisplus_group;
+static int ett_nisplus_grps;
+static int ett_nisplus_tag;
+static int ett_nisplus_log_entry;
 
 
 #define NIS_MASK_TABLE_BINARY   0x00000001
@@ -624,7 +624,7 @@ dissect_nisplus_object(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree
 {
 	proto_item* lock_item = NULL;
 	proto_tree* lock_tree = NULL;
-	gint32	type;
+	int32_t	type;
 	int old_offset = offset;
 
 	lock_item = proto_tree_add_item(tree, hf_nisplus_object, tvb,
@@ -1789,7 +1789,7 @@ proto_register_nis(void)
 
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_nisplus,
 		&ett_nisplus_object,
 		&ett_nisplus_oid,
@@ -1834,13 +1834,13 @@ proto_reg_handoff_nis(void)
    callback protocol for NIS+
    xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx */
 
-static int proto_nispluscb = -1;
-static int hf_nispluscb_procedure_v1 = -1;
-static int hf_nispluscb_entries = -1;
-static int hf_nispluscb_entry = -1;
+static int proto_nispluscb;
+static int hf_nispluscb_procedure_v1;
+static int hf_nispluscb_entries;
+static int hf_nispluscb_entry;
 
-static gint ett_nispluscb = -1;
-static gint ett_nispluscb_entry = -1;
+static int ett_nispluscb;
+static int ett_nispluscb_entry;
 
 static int
 dissect_cb_entry(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, void* data _U_)
@@ -1907,7 +1907,7 @@ proto_register_niscb(void)
 
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_nispluscb,
 		&ett_nispluscb_entry,
 	};