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-marker.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-marker.c')
| -rw-r--r-- | epan/dissectors/packet-marker.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-marker.c b/epan/dissectors/packet-marker.c index 6cb924d1..31be64fa 100644 --- a/epan/dissectors/packet-marker.c +++ b/epan/dissectors/packet-marker.c @@ -38,32 +38,32 @@ static const value_string marker_vals[] = { }; /* Initialise the protocol and registered fields */ -static int proto_marker = -1; +static int proto_marker; -static int hf_marker_version_number = -1; -static int hf_marker_tlv_type = -1; -static int hf_marker_tlv_length = -1; -static int hf_marker_req_port = -1; -static int hf_marker_req_system = -1; -static int hf_marker_req_trans_id = -1; -static int hf_marker_req_pad = -1; -static int hf_marker_reserved = -1; +static int hf_marker_version_number; +static int hf_marker_tlv_type; +static int hf_marker_tlv_length; +static int hf_marker_req_port; +static int hf_marker_req_system; +static int hf_marker_req_trans_id; +static int hf_marker_req_pad; +static int hf_marker_reserved; /* Expert Items */ -static expert_field ei_marker_wrong_tlv_type = EI_INIT; -static expert_field ei_marker_wrong_tlv_length = EI_INIT; -static expert_field ei_marker_wrong_pad_value = EI_INIT; +static expert_field ei_marker_wrong_tlv_type; +static expert_field ei_marker_wrong_tlv_length; +static expert_field ei_marker_wrong_pad_value; /* Initialise the subtree pointers */ -static gint ett_marker = -1; +static int ett_marker; static int dissect_marker(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { int offset = 0; - guint tlv_type, tlv_length; - guint port, transactionid, pad; - const gchar *sysidstr; + unsigned tlv_type, tlv_length; + unsigned port, transactionid, pad; + const char *sysidstr; proto_tree *marker_tree; proto_item *marker_item, *tlv_type_item, *tlv_length_item, *pad_item; @@ -192,7 +192,7 @@ proto_register_marker(void) /* Setup protocol subtree array */ - static gint *ett[] = { + static int *ett[] = { &ett_marker, }; |