From a86c5f7cae7ec9a3398300555a0b644689d946a1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 19 Sep 2024 06:14:53 +0200 Subject: Merging upstream version 4.4.0. Signed-off-by: Daniel Baumann --- epan/dissectors/packet-lapbether.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'epan/dissectors/packet-lapbether.c') diff --git a/epan/dissectors/packet-lapbether.c b/epan/dissectors/packet-lapbether.c index 7e6471c5..41762a23 100644 --- a/epan/dissectors/packet-lapbether.c +++ b/epan/dissectors/packet-lapbether.c @@ -18,11 +18,11 @@ void proto_register_lapbether(void); void proto_reg_handoff_lapbether(void); -static int proto_lapbether = -1; +static int proto_lapbether; -static int hf_lapbether_length = -1; +static int hf_lapbether_length; -static gint ett_lapbether = -1; +static int ett_lapbether; static dissector_handle_t lapbether_handle; static dissector_handle_t lapb_handle; @@ -37,7 +37,7 @@ dissect_lapbether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat col_set_str(pinfo->cinfo, COL_PROTOCOL, "LAPBETHER"); col_clear(pinfo->cinfo, COL_INFO); - len = tvb_get_guint8(tvb, 0) + tvb_get_guint8(tvb, 1) * 256; + len = tvb_get_uint8(tvb, 0) + tvb_get_uint8(tvb, 1) * 256; if (tree) { @@ -65,7 +65,7 @@ proto_register_lapbether(void) "LAPBEther Length Field", HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_lapbether, }; -- cgit v1.2.3