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-pat.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-pat.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-pat.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-mpeg-pat.c b/epan/dissectors/packet-mpeg-pat.c index 8f5ae08e..d01d6d07 100644 --- a/epan/dissectors/packet-mpeg-pat.c +++ b/epan/dissectors/packet-mpeg-pat.c @@ -19,21 +19,21 @@ void proto_reg_handoff_mpeg_pat(void); static dissector_handle_t mpeg_pat_handle; -static int proto_mpeg_pat = -1; -static int hf_mpeg_pat_transport_stream_id = -1; -static int hf_mpeg_pat_reserved = -1; -static int hf_mpeg_pat_version_number = -1; -static int hf_mpeg_pat_current_next_indicator = -1; -static int hf_mpeg_pat_section_number = -1; -static int hf_mpeg_pat_last_section_number = -1; +static int proto_mpeg_pat; +static int hf_mpeg_pat_transport_stream_id; +static int hf_mpeg_pat_reserved; +static int hf_mpeg_pat_version_number; +static int hf_mpeg_pat_current_next_indicator; +static int hf_mpeg_pat_section_number; +static int hf_mpeg_pat_last_section_number; -static int hf_mpeg_pat_program_number = -1; -static int hf_mpeg_pat_program_reserved = -1; -static int hf_mpeg_pat_program_map_pid = -1; +static int hf_mpeg_pat_program_number; +static int hf_mpeg_pat_program_reserved; +static int hf_mpeg_pat_program_map_pid; -static gint ett_mpeg_pat = -1; -static gint ett_mpeg_pat_prog = -1; +static int ett_mpeg_pat; +static int ett_mpeg_pat_prog; #define MPEG_PAT_RESERVED_MASK 0xC0 #define MPEG_PAT_VERSION_NUMBER_MASK 0x3E @@ -45,8 +45,8 @@ static gint ett_mpeg_pat_prog = -1; static int dissect_mpeg_pat(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint offset = 0, length = 0; - guint16 prog_num, prog_pid; + unsigned offset = 0, length = 0; + uint16_t prog_num, prog_pid; proto_item *ti; proto_tree *mpeg_pat_tree; @@ -153,7 +153,7 @@ proto_register_mpeg_pat(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_mpeg_pat, &ett_mpeg_pat_prog }; |