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-mctp-control.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-mctp-control.c')
| -rw-r--r-- | epan/dissectors/packet-mctp-control.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-mctp-control.c b/epan/dissectors/packet-mctp-control.c index 54eab536..cc3f1496 100644 --- a/epan/dissectors/packet-mctp-control.c +++ b/epan/dissectors/packet-mctp-control.c @@ -31,17 +31,17 @@ void proto_register_mctp_control(void); void proto_reg_handoff_mctp_control(void); -static int proto_mctp_ctrl = -1; +static int proto_mctp_ctrl; -static int hf_mctp_ctrl_command = -1; -static int hf_mctp_ctrl_rq = -1; -static int hf_mctp_ctrl_d = -1; -static int hf_mctp_ctrl_instance = -1; -static int hf_mctp_ctrl_cc = -1; -static int hf_mctp_ctrl_data = -1; +static int hf_mctp_ctrl_command; +static int hf_mctp_ctrl_rq; +static int hf_mctp_ctrl_d; +static int hf_mctp_ctrl_instance; +static int hf_mctp_ctrl_cc; +static int hf_mctp_ctrl_data; -static gint ett_mctp_ctrl = -1; -static gint ett_mctp_ctrl_hdr = -1; +static int ett_mctp_ctrl; +static int ett_mctp_ctrl_hdr; static const value_string command_vals[] = { { 0x00, "Reserved" }, @@ -70,9 +70,9 @@ dissect_mctp_ctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_) { proto_tree *mctp_ctrl_tree, *mctp_ctrl_hdr_tree; - guint len, payload_start, cmd; + unsigned len, payload_start, cmd; proto_item *ti, *hti; - gboolean rq; + bool rq; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MCTP Control"); col_clear(pinfo->cinfo, COL_INFO); @@ -170,7 +170,7 @@ proto_register_mctp_control(void) }; /* protocol subtree */ - static gint *ett[] = { + static int *ett[] = { &ett_mctp_ctrl, &ett_mctp_ctrl_hdr, }; |