diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:14:33 +0000 |
| commit | 9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch) | |
| tree | 2784370cda9bbf2da9114d70f05399c0b229d28c /epan/dissectors/packet-sscf-nni.c | |
| parent | Adding debian version 4.2.6-1. (diff) | |
| download | wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip | |
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/dissectors/packet-sscf-nni.c')
| -rw-r--r-- | epan/dissectors/packet-sscf-nni.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/epan/dissectors/packet-sscf-nni.c b/epan/dissectors/packet-sscf-nni.c index ae5b8927..f2e17b78 100644 --- a/epan/dissectors/packet-sscf-nni.c +++ b/epan/dissectors/packet-sscf-nni.c @@ -18,9 +18,9 @@ void proto_register_sscf(void); void proto_reg_handoff_sscf(void); -static int proto_sscf = -1; +static int proto_sscf; -static gint ett_sscf = -1; +static int ett_sscf; static dissector_handle_t mtp3_handle; @@ -30,8 +30,8 @@ static dissector_handle_t mtp3_handle; #define SSCF_SPARE_OFFSET 0 #define SSCF_SPARE_LENGTH 3 -static int hf_status = -1; -static int hf_spare = -1; +static int hf_status; +static int hf_spare; #define SSCF_STATUS_OOS 0x01 #define SSCF_STATUS_PO 0x02 @@ -59,10 +59,10 @@ static const value_string sscf_status_vals[] = { static int dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - guint reported_length; + unsigned reported_length; proto_item *sscf_item = NULL; proto_tree *sscf_tree = NULL; - guint8 sscf_status; + uint8_t sscf_status; reported_length = tvb_reported_length(tvb); /* frame length */ @@ -77,7 +77,7 @@ dissect_sscf_nni(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data } else { - sscf_status = tvb_get_guint8(tvb, SSCF_STATUS_OFFSET); + sscf_status = tvb_get_uint8(tvb, SSCF_STATUS_OFFSET); col_set_str(pinfo->cinfo, COL_PROTOCOL, "SSCF-NNI"); col_add_fstr(pinfo->cinfo, COL_INFO, "STATUS (%s) ", @@ -103,7 +103,7 @@ proto_register_sscf(void) NULL, 0x0, NULL, HFILL} } }; - static gint *ett[] = { + static int *ett[] = { &ett_sscf, }; |