Merging upstream version 4.4.0.

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

1 files changed, 29 insertions, 29 deletions

diff --git a/epan/dissectors/packet-msnip.c b/epan/dissectors/packet-msnip.c
index 8000e049..14f7cc1d 100644
--- a/epan/dissectors/packet-msnip.c
+++ b/epan/dissectors/packet-msnip.c
@@ -33,23 +33,23 @@ void proto_reg_handoff_msnip(void);
 
 static dissector_handle_t msnip_handle;
 
-static int proto_msnip = -1;
-static int hf_checksum = -1;
-static int hf_checksum_status = -1;
-static int hf_type = -1;
-static int hf_count = -1;
-static int hf_holdtime = -1;
-static int hf_groups = -1;
-static int hf_maddr = -1;
-static int hf_mask = -1;
-static int hf_holdtime16 = -1;
-static int hf_genid = -1;
-static int hf_rec_type = -1;
-
-static int ett_msnip = -1;
-static int ett_groups = -1;
-
-static expert_field ei_checksum = EI_INIT;
+static int proto_msnip;
+static int hf_checksum;
+static int hf_checksum_status;
+static int hf_type;
+static int hf_count;
+static int hf_holdtime;
+static int hf_groups;
+static int hf_maddr;
+static int hf_mask;
+static int hf_holdtime16;
+static int hf_genid;
+static int hf_rec_type;
+
+static int ett_msnip;
+static int ett_groups;
+
+static expert_field ei_checksum;
 
 #define MC_ALL_IGMPV3_ROUTERS	0xe0000016
 
@@ -74,10 +74,10 @@ static const value_string msnip_rec_types[] = {
 static int
 dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
 {
-	guint8 count;
+	uint8_t count;
 
 	/* group count */
-	count = tvb_get_guint8(tvb, offset);
+	count = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint(parent_tree, hf_count, tvb, offset, 1, count);
 	offset += 1;
 
@@ -88,7 +88,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in
 	while (count--) {
 		proto_tree *tree;
 		proto_item *item;
-		guint8 rec_type;
+		uint8_t rec_type;
 		int old_offset = offset;
 
 		item = proto_tree_add_item(parent_tree, hf_groups,
@@ -96,7 +96,7 @@ dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, in
 		tree = proto_item_add_subtree(item, ett_groups);
 
 		/* record type */
-		rec_type = tvb_get_guint8(tvb, offset);
+		rec_type = tvb_get_uint8(tvb, offset);
 		proto_tree_add_uint(tree, hf_rec_type, tvb, offset, 1, rec_type);
 		offset += 1;
 
@@ -146,10 +146,10 @@ dissect_msnip_is(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
 static int
 dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset)
 {
-	guint8 count;
+	uint8_t count;
 
 	/* group count */
-	count = tvb_get_guint8(tvb, offset);
+	count = tvb_get_uint8(tvb, offset);
 	proto_tree_add_uint(parent_tree, hf_count, tvb, offset, 1, count);
 	offset += 1;
 
@@ -164,7 +164,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
 	while (count--) {
 		proto_tree *tree;
 		proto_item *item;
-		guint8 masklen;
+		uint8_t masklen;
 		int old_offset = offset;
 
 		item = proto_tree_add_item(parent_tree, hf_groups,
@@ -176,7 +176,7 @@ dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int
 		offset += 4;
 
 		/* mask length */
-		masklen = tvb_get_guint8(tvb, offset);
+		masklen = tvb_get_uint8(tvb, offset);
 		proto_tree_add_uint(tree, hf_mask, tvb,
 			offset, 1, masklen);
 		offset += 1;
@@ -202,9 +202,9 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 {
 	proto_tree *tree;
 	proto_item *item;
-	guint8 type;
+	uint8_t type;
 	int offset = 0;
-	guint32 dst = g_htonl(MC_ALL_IGMPV3_ROUTERS);
+	uint32_t dst = g_htonl(MC_ALL_IGMPV3_ROUTERS);
 
 	/* Shouldn't be destined for us */
 	if ((pinfo->dst.type != AT_IPv4) || memcmp(pinfo->dst.data, &dst, 4))
@@ -216,7 +216,7 @@ dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void*
 	item = proto_tree_add_item(parent_tree, proto_msnip, tvb, offset, -1, ENC_NA);
 	tree = proto_item_add_subtree(item, ett_msnip);
 
-	type = tvb_get_guint8(tvb, offset);
+	type = tvb_get_uint8(tvb, offset);
 	col_add_str(pinfo->cinfo, COL_INFO,
 			val_to_str(type, msnip_types,
 				"Unknown Type:0x%02x"));
@@ -294,7 +294,7 @@ proto_register_msnip(void)
 			  VALS(msnip_rec_types), 0, "MSNIP Record Type", HFILL }},
 
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_msnip,
 		&ett_groups,
 	};