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-hp-erm.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-hp-erm.c')
| -rw-r--r-- | epan/dissectors/packet-hp-erm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/epan/dissectors/packet-hp-erm.c b/epan/dissectors/packet-hp-erm.c index 209e1a67..41205905 100644 --- a/epan/dissectors/packet-hp-erm.c +++ b/epan/dissectors/packet-hp-erm.c @@ -43,15 +43,15 @@ static dissector_handle_t hp_erm_handle; #define PROTO_SHORT_NAME "HP_ERM" #define PROTO_LONG_NAME "HP encapsulated remote mirroring" -static int proto_hp_erm = -1; -static gint ett_hp_erm = -1; -static int hf_hp_erm_unknown1 = -1; -static int hf_hp_erm_unknown2 = -1; -static int hf_hp_erm_unknown3 = -1; -static int hf_hp_erm_priority = -1; -static int hf_hp_erm_cfi = -1; -static int hf_hp_erm_vlan = -1; -static int hf_hp_erm_is_tagged = -1; +static int proto_hp_erm; +static int ett_hp_erm; +static int hf_hp_erm_unknown1; +static int hf_hp_erm_unknown2; +static int hf_hp_erm_unknown3; +static int hf_hp_erm_priority; +static int hf_hp_erm_cfi; +static int hf_hp_erm_vlan; +static int hf_hp_erm_is_tagged; static const value_string hp_erm_pri_vals[] = { { 0, "Background" }, @@ -76,7 +76,7 @@ dissect_hp_erm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _ proto_tree *hp_erm_tree; tvbuff_t *eth_tvb; int offset = 0; - int * const flags[] = { + static int * const flags[] = { &hf_hp_erm_unknown2, &hf_hp_erm_priority, &hf_hp_erm_cfi, @@ -137,7 +137,7 @@ proto_register_hp_erm(void) 0x0000007F, NULL, HFILL }} }; - static gint *ett[] = { + static int *ett[] = { &ett_hp_erm, }; |