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-mbim.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'epan/dissectors/packet-mbim.h') diff --git a/epan/dissectors/packet-mbim.h b/epan/dissectors/packet-mbim.h index f421b70c..5a7ad2f4 100644 --- a/epan/dissectors/packet-mbim.h +++ b/epan/dissectors/packet-mbim.h @@ -18,12 +18,12 @@ #define MBIM_COMMAND_SET 1 struct mbim_info { - guint32 req_frame; - guint32 resp_frame; - guint32 cmd_type; + uint32_t req_frame; + uint32_t resp_frame; + uint32_t cmd_type; }; -typedef void (*mbim_dissect_fct) (tvbuff_t *, packet_info *, proto_tree *, gint /* offset */, struct mbim_info *); +typedef void (*mbim_dissect_fct) (tvbuff_t *, packet_info *, proto_tree *, int /* offset */, struct mbim_info *); /* Structure listing the dissection function to be called for a given CID */ struct mbim_cid_dissect { @@ -36,9 +36,9 @@ struct mbim_cid_dissect { /* Structure handling the description of the UUID extension to be registered */ struct mbim_uuid_ext { /* UUID value stored in network byte order */ - guint32 uuid[4]; + uint32_t uuid[4]; /* UUID name to be displayed during dissection */ - const gchar *uuid_name; + const char *uuid_name; /* value_string array containing the CID list for this UUID */ const value_string *uuid_cid_list; /* Array of the dissection functions per CID. Pointers can be NULL when no dissection is expected */ -- cgit v1.2.3