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-pw-common.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-pw-common.c')
| -rw-r--r-- | epan/dissectors/packet-pw-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-pw-common.c b/epan/dissectors/packet-pw-common.c index a8a855d2..2ce5880b 100644 --- a/epan/dissectors/packet-pw-common.c +++ b/epan/dissectors/packet-pw-common.c @@ -44,7 +44,7 @@ pwc_vals_cw_frag[] = { }; -void pwc_item_append_cw(proto_item* item, const guint32 cw, const gboolean append_text) +void pwc_item_append_cw(proto_item* item, const uint32_t cw, const bool append_text) { if (item != NULL) { @@ -71,14 +71,14 @@ void pwc_item_append_text_n_items(proto_item* item, const int n, const char * co } -static gint proto_pw_padding = -1; -static gint ett_pw_common = -1; -static int hf_padding_len = -1; +static int proto_pw_padding; +static int ett_pw_common; +static int hf_padding_len; static int dissect_pw_padding(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree, void* data _U_) { - gint size; + int size; proto_item* item; proto_tree* tree_p; size = tvb_reported_length_remaining(tvb, 0); @@ -100,7 +100,7 @@ void proto_register_pw_padding(void) ,FT_INT32 ,BASE_DEC ,NULL ,0 ,NULL ,HFILL }} }; - static gint *ett_array[] = { + static int *ett_array[] = { &ett_pw_common }; proto_pw_padding = proto_register_protocol("Pseudowire Padding","PW Padding","pw.padding"); |