From 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:33 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-vicp.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'epan/dissectors/packet-vicp.c') diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index 001a5d74..7440baeb 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -17,14 +17,14 @@ #include /* registration object IDs */ -static int proto_vicp = -1; -static int hf_vicp_operation = -1; -static int hf_vicp_version = -1; -static int hf_vicp_sequence = -1; -static int hf_vicp_unused = -1; -static int hf_vicp_length = -1; -static int hf_vicp_data = -1; -static gint ett_vicp = -1; +static int proto_vicp; +static int hf_vicp_operation; +static int hf_vicp_version; +static int hf_vicp_sequence; +static int hf_vicp_unused; +static int hf_vicp_length; +static int hf_vicp_data; +static int ett_vicp; #define VICP_PORT 1861 @@ -39,7 +39,7 @@ static int dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi proto_tree *vicp_tree; ptvcursor_t* cursor; - guint len; + unsigned len; if (tvb_reported_length_remaining(tvb, 0) < 8) { @@ -93,7 +93,7 @@ void proto_register_vicp(void) } }; - static gint *ett[] = + static int *ett[] = { &ett_vicp }; -- cgit v1.2.3