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-g723.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-g723.c')
| -rw-r--r-- | epan/dissectors/packet-g723.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/epan/dissectors/packet-g723.c b/epan/dissectors/packet-g723.c index ceb90206..74918498 100644 --- a/epan/dissectors/packet-g723.c +++ b/epan/dissectors/packet-g723.c @@ -22,12 +22,12 @@ void proto_register_g723(void); static dissector_handle_t g723_handle; /* Initialize the protocol and registered fields */ -static int proto_g723 = -1; -static int hf_g723_frame_size_and_codec = -1; -static int hf_g723_lpc_B5_B0 = -1; +static int proto_g723; +static int hf_g723_frame_size_and_codec; +static int hf_g723_lpc_B5_B0; /* Initialize the subtree pointers */ -static int ett_g723 = -1; +static int ett_g723; /* RFC 3551 @@ -54,7 +54,7 @@ static int dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int offset = 0; - guint octet; + unsigned octet; proto_item *ti; proto_tree *g723_tree; @@ -65,7 +65,7 @@ dissect_g723(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_ g723_tree = proto_item_add_subtree(ti, ett_g723); - octet = tvb_get_guint8(tvb,offset); + octet = tvb_get_uint8(tvb,offset); proto_tree_add_item(g723_tree, hf_g723_frame_size_and_codec, tvb, offset, 1, ENC_BIG_ENDIAN); proto_tree_add_item(g723_tree, hf_g723_lpc_B5_B0, tvb, offset, 1, ENC_BIG_ENDIAN); @@ -102,7 +102,7 @@ proto_register_g723(void) }; - static gint *ett[] = { + static int *ett[] = { &ett_g723, }; |