1 files changed, 32 insertions, 32 deletions

diff --git a/epan/dissectors/packet-interlink.c b/epan/dissectors/packet-interlink.c
index f313f792..029dc24f 100644
--- a/epan/dissectors/packet-interlink.c
+++ b/epan/dissectors/packet-interlink.c
@@ -21,23 +21,23 @@ void proto_reg_handoff_interlink(void);
  * No public information available.
  */
 
-static int proto_interlink = -1;
-
-static int hf_interlink_id = -1;
-static int hf_interlink_version = -1;
-static int hf_interlink_cmd = -1;
-static int hf_interlink_seq = -1;
-static int hf_interlink_flags = -1;
-static int hf_interlink_flags_req_ack = -1;
-static int hf_interlink_flags_inc_ack_port = -1;
-static int hf_interlink_block_type = -1;
-static int hf_interlink_block_version = -1;
-static int hf_interlink_block_length = -1;
-
-static gint ett_interlink = -1;
-static gint ett_interlink_header = -1;
-static gint ett_interlink_flags = -1;
-static gint ett_interlink_block = -1;
+static int proto_interlink;
+
+static int hf_interlink_id;
+static int hf_interlink_version;
+static int hf_interlink_cmd;
+static int hf_interlink_seq;
+static int hf_interlink_flags;
+static int hf_interlink_flags_req_ack;
+static int hf_interlink_flags_inc_ack_port;
+static int hf_interlink_block_type;
+static int hf_interlink_block_version;
+static int hf_interlink_block_length;
+
+static int ett_interlink;
+static int ett_interlink_header;
+static int ett_interlink_flags;
+static int ett_interlink_block;
 
 static dissector_handle_t data_handle;
 static dissector_table_t subdissector_table;
@@ -59,9 +59,9 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 	proto_item	*il_item;
 	proto_tree	*ilh_tree = NULL;
 	proto_tree	*ilb_tree = NULL;
-	guint8		ilb_type;
-	guint8		ilb_version;
-	guint16		type_version = 0;
+	uint8_t		ilb_type;
+	uint8_t		ilb_version;
+	uint16_t		type_version = 0;
 	dissector_handle_t	handle;
 	tvbuff_t	*next_tvb;
 
@@ -101,8 +101,8 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 
 	ilb_tree = proto_tree_add_subtree(il_tree, tvb, offset, 4, ett_interlink_block, NULL, "Block Header");
 
-	ilb_type = tvb_get_guint8(tvb, offset);
-	ilb_version = tvb_get_guint8(tvb, offset + 1);
+	ilb_type = tvb_get_uint8(tvb, offset);
+	ilb_version = tvb_get_uint8(tvb, offset + 1);
 	type_version = ilb_type << 8 | ilb_version;
 	col_append_fstr(pinfo->cinfo, COL_INFO, "Type: %d, Version: %d",
 		ilb_type, ilb_version);
@@ -134,22 +134,22 @@ dissect_interlink(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat
 }
 
 
-static gboolean
-dissect_interlink_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
+static bool
+dissect_interlink_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
 {
 	if (!tvb_bytes_exist(tvb, 0, 4)) {
-		return FALSE;
+		return false;
 	}
 	if (
-		tvb_get_guint8(tvb,0) != 'I' ||
-		tvb_get_guint8(tvb,1) != 'L' ||
-		tvb_get_guint8(tvb,2) != 'N' ||
-		tvb_get_guint8(tvb,3) != 'K'
+		tvb_get_uint8(tvb,0) != 'I' ||
+		tvb_get_uint8(tvb,1) != 'L' ||
+		tvb_get_uint8(tvb,2) != 'N' ||
+		tvb_get_uint8(tvb,3) != 'K'
 	)
-		return FALSE;
+		return false;
 
 	dissect_interlink(tvb, pinfo, tree, data);
-	return TRUE;
+	return true;
 }
 
 
@@ -189,7 +189,7 @@ proto_register_interlink(void)
 			BASE_DEC, NULL, 0, NULL, HFILL }},
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_interlink,
 		&ett_interlink_header,
 		&ett_interlink_flags,