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-mpeg-ca.c | |
| 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-mpeg-ca.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-ca.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-mpeg-ca.c b/epan/dissectors/packet-mpeg-ca.c index 96d9042d..35f18e14 100644 --- a/epan/dissectors/packet-mpeg-ca.c +++ b/epan/dissectors/packet-mpeg-ca.c @@ -20,14 +20,14 @@ void proto_reg_handoff_mpeg_ca(void); static dissector_handle_t mpeg_ca_handle; -static int proto_mpeg_ca = -1; -static int hf_mpeg_ca_reserved = -1; -static int hf_mpeg_ca_version_number = -1; -static int hf_mpeg_ca_current_next_indicator = -1; -static int hf_mpeg_ca_section_number = -1; -static int hf_mpeg_ca_last_section_number = -1; +static int proto_mpeg_ca; +static int hf_mpeg_ca_reserved; +static int hf_mpeg_ca_version_number; +static int hf_mpeg_ca_current_next_indicator; +static int hf_mpeg_ca_section_number; +static int hf_mpeg_ca_last_section_number; -static gint ett_mpeg_ca = -1; +static int ett_mpeg_ca; #define MPEG_CA_RESERVED_MASK 0xFFFFC0 #define MPEG_CA_VERSION_NUMBER_MASK 0x00003E @@ -36,7 +36,7 @@ static gint ett_mpeg_ca = -1; static int dissect_mpeg_ca(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0, length = 0; + unsigned offset = 0, length = 0; proto_item *ti; proto_tree *mpeg_ca_tree; @@ -111,7 +111,7 @@ proto_register_mpeg_ca(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_mpeg_ca, }; |