diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:53 +0000 |
commit | a86c5f7cae7ec9a3398300555a0b644689d946a1 (patch) | |
tree | 39fe4b107c71174fd1e8a8ceb9a4d2aa14116248 /epan/dissectors/packet-ansi_a.h | |
parent | Releasing progress-linux version 4.2.6-1~progress7.99u1. (diff) | |
download | wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.tar.xz wireshark-a86c5f7cae7ec9a3398300555a0b644689d946a1.zip |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-ansi_a.h')
-rw-r--r-- | epan/dissectors/packet-ansi_a.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-ansi_a.h b/epan/dissectors/packet-ansi_a.h index 60a9ec9b..7ee77226 100644 --- a/epan/dissectors/packet-ansi_a.h +++ b/epan/dissectors/packet-ansi_a.h @@ -16,15 +16,15 @@ typedef struct _ansi_a_tap_rec_t { /* * value from packet-bssap.h */ - guint8 pdu_type; - guint8 message_type; + uint8_t pdu_type; + uint8_t message_type; } ansi_a_tap_rec_t; typedef struct ext_value_string_t { - guint32 value; - const gchar *strptr; - gint dec_index; + uint32_t value; + const char *strptr; + int dec_index; } ext_value_string_t; @@ -42,7 +42,7 @@ WS_DLL_PUBLIC const ext_value_string_t ansi_a_ios401_bsmap_strings[]; WS_DLL_PUBLIC const ext_value_string_t ansi_a_ios401_dtap_strings[]; /* - * Not strictly A-interface info, but put here to avoid file polution + * Not strictly A-interface info, but put here to avoid file pollution * * Title 3GPP2 Other * @@ -78,7 +78,7 @@ WS_DLL_PUBLIC const value_string ansi_a_ms_info_rec_num_plan_vals[]; #define A_VARIANT_IOS401 9 #define A_VARIANT_IOS501 10 -WS_DLL_PUBLIC gint a_global_variant; +WS_DLL_PUBLIC int a_global_variant; /* * allows ANSI MAP to use this for IS-880 enhancements @@ -96,7 +96,7 @@ WS_DLL_PUBLIC const ext_value_string_t *ansi_a_elem_1_strings; */ #define ANSI_A_MAX_NUM_IOS_ELEM_1_STRINGS 255 -void dissect_cdma2000_a1_elements(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint32 offset, guint len); +void dissect_cdma2000_a1_elements(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, uint32_t offset, unsigned len); /* * Editor modelines - https://www.wireshark.org/tools/modelines.html |