Merging upstream version 4.4.0.

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

1 files changed, 41 insertions, 41 deletions

diff --git a/epan/dissectors/packet-v5dl.c b/epan/dissectors/packet-v5dl.c
index 2066c1a3..6b760bee 100644
--- a/epan/dissectors/packet-v5dl.c
+++ b/epan/dissectors/packet-v5dl.c
@@ -26,38 +26,38 @@
 
 void proto_register_v5dl(void);
 
-static int proto_v5dl = -1;
-static int hf_v5dl_direction = -1;
-/* static int hf_v5dl_address = -1; */
-static int hf_v5dl_ef = -1;
-static int hf_v5dl_eah = -1;
-static int hf_v5dl_cr = -1;
-static int hf_v5dl_ea1 = -1;
-static int hf_v5dl_eal = -1;
-static int hf_v5dl_ea2 = -1;
-static int hf_v5dl_control = -1;
-static int hf_v5dl_n_r = -1;
-static int hf_v5dl_n_s = -1;
-static int hf_v5dl_p = -1;
-static int hf_v5dl_p_ext = -1;
-static int hf_v5dl_f = -1;
-static int hf_v5dl_f_ext = -1;
-static int hf_v5dl_s_ftype = -1;
-static int hf_v5dl_u_modifier_cmd = -1;
-static int hf_v5dl_u_modifier_resp = -1;
-static int hf_v5dl_ftype_i = -1;
-static int hf_v5dl_ftype_s_u = -1;
-static int hf_v5dl_ftype_s_u_ext = -1;
+static int proto_v5dl;
+static int hf_v5dl_direction;
+/* static int hf_v5dl_address; */
+static int hf_v5dl_ef;
+static int hf_v5dl_eah;
+static int hf_v5dl_cr;
+static int hf_v5dl_ea1;
+static int hf_v5dl_eal;
+static int hf_v5dl_ea2;
+static int hf_v5dl_control;
+static int hf_v5dl_n_r;
+static int hf_v5dl_n_s;
+static int hf_v5dl_p;
+static int hf_v5dl_p_ext;
+static int hf_v5dl_f;
+static int hf_v5dl_f_ext;
+static int hf_v5dl_s_ftype;
+static int hf_v5dl_u_modifier_cmd;
+static int hf_v5dl_u_modifier_resp;
+static int hf_v5dl_ftype_i;
+static int hf_v5dl_ftype_s_u;
+static int hf_v5dl_ftype_s_u_ext;
 #if 0
-static int hf_v5dl_checksum = -1;
-static int hf_v5dl_checksum_status = -1;
+static int hf_v5dl_checksum;
+static int hf_v5dl_checksum_status;
 #endif
-static gint ett_v5dl = -1;
-static gint ett_v5dl_address = -1;
-static gint ett_v5dl_control = -1;
-/* static gint ett_v5dl_checksum = -1; */
+static int ett_v5dl;
+static int ett_v5dl_address;
+static int ett_v5dl_control;
+/* static int ett_v5dl_checksum; */
 
-static expert_field ei_v5dl_checksum = EI_INIT;
+static expert_field ei_v5dl_checksum;
 
 static dissector_handle_t v52_handle;
 
@@ -123,18 +123,18 @@ dissect_v5dl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 	proto_tree	*v5dl_tree, *addr_tree;
 	proto_item	*v5dl_ti, *addr_ti;
 	int		direction;
-	guint		v5dl_header_len;
-	guint16		control;
+	unsigned		v5dl_header_len;
+	uint16_t		control;
 #if 0
 	proto_tree	*checksum_tree;
 	proto_item	*checksum_ti;
-	guint16		checksum, checksum_calculated;
-	guint		checksum_offset;
+	uint16_t		checksum, checksum_calculated;
+	unsigned		checksum_offset;
 #endif
-	guint16		addr, cr, eah, eal, v5addr;
-	gboolean	is_response = 0;
+	uint16_t		addr, cr, eah, eal, v5addr;
+	bool	is_response = 0;
 #if 0
-	guint		length, reported_length;
+	unsigned		length, reported_length;
 #endif
 	tvbuff_t	*next_tvb;
 	const char	*srcname = "?";
@@ -152,12 +152,12 @@ dissect_v5dl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
 	direction = pinfo->p2p_dir;
 	if (pinfo->p2p_dir == P2P_DIR_RECV) {
-	    is_response = cr ? FALSE : TRUE;
+	    is_response = cr ? false : true;
 	    srcname = "Network";
 	    dstname = "User";
 	}
 	else if (pinfo->p2p_dir == P2P_DIR_SENT) {
-	    is_response = cr ? TRUE : FALSE;
+	    is_response = cr ? true : false;
 	    srcname = "User";
 	    dstname = "Network";
 	}
@@ -197,8 +197,8 @@ dissect_v5dl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_
 
 	control = dissect_xdlc_control(tvb, 2, pinfo, v5dl_tree, hf_v5dl_control,
 	    ett_v5dl_control, &v5dl_cf_items, &v5dl_cf_items_ext, NULL, NULL,
-	    is_response, TRUE, FALSE);
-	v5dl_header_len += XDLC_CONTROL_LEN(control, TRUE);
+	    is_response, true, false);
+	v5dl_header_len += XDLC_CONTROL_LEN(control, true);
 
 	if (tree)
 		proto_item_set_len(v5dl_ti, v5dl_header_len);
@@ -385,7 +385,7 @@ proto_register_v5dl(void)
 #endif
 	};
 
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_v5dl,
 		&ett_v5dl_address,
 		&ett_v5dl_control,