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 /plugins/epan/ethercat/packet-ethercat-frame.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 'plugins/epan/ethercat/packet-ethercat-frame.c')
| -rw-r--r-- | plugins/epan/ethercat/packet-ethercat-frame.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/plugins/epan/ethercat/packet-ethercat-frame.c b/plugins/epan/ethercat/packet-ethercat-frame.c index 3de05942..687ca8bd 100644 --- a/plugins/epan/ethercat/packet-ethercat-frame.c +++ b/plugins/epan/ethercat/packet-ethercat-frame.c @@ -23,17 +23,17 @@ void proto_register_ethercat_frame(void); void proto_reg_handoff_ethercat_frame(void); /* Define the Ethercat frame proto */ -static int proto_ethercat_frame = -1; +static int proto_ethercat_frame; static dissector_table_t ethercat_frame_dissector_table; static dissector_handle_t ethercat_frame_handle; /* Define the tree for the EtherCAT frame */ -static int ett_ethercat_frame = -1; -static int hf_ethercat_frame_length = -1; -static int hf_ethercat_frame_reserved = -1; -static int hf_ethercat_frame_type = -1; +static int ett_ethercat_frame; +static int hf_ethercat_frame_length; +static int hf_ethercat_frame_reserved; +static int hf_ethercat_frame_type; static const value_string EthercatFrameTypes[] = { @@ -58,7 +58,7 @@ static int dissect_ethercat_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree tvbuff_t *next_tvb; proto_item *ti; proto_tree *ethercat_frame_tree; - gint offset = 0; + int offset = 0; EtherCATFrameParserHDR hdr; col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECATF"); @@ -115,7 +115,7 @@ void proto_register_ethercat_frame(void) } }; - static gint *ett[] = + static int *ett[] = { &ett_ethercat_frame }; |