diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-24 02:11:11 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-24 02:11:11 +0000 |
commit | 975a16f70693ed2815c8033457de4421448b6a00 (patch) | |
tree | b1d274274c7e87347b1a7bae90a828974377895d /epan | |
parent | 92215412c5d561f030f52b27397776f902d037dc (diff) |
From Kovarththanan Rajaratnam:
Cleanup hf_register_info declaration passed to llc_add_oui(). While there,
change the declaration to an array in order to be consistent with the rest
of packet-*.c files.
svn path=/trunk/; revision=28830
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-cimetrics.c | 7 | ||||
-rw-r--r-- | epan/dissectors/packet-cisco-oui.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-extreme.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-force10-oui.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-iana-oui.c | 9 | ||||
-rw-r--r-- | epan/dissectors/packet-nt-oui.c | 9 |
6 files changed, 29 insertions, 23 deletions
diff --git a/epan/dissectors/packet-cimetrics.c b/epan/dissectors/packet-cimetrics.c index 50878f6d5f..13bc264f30 100644 --- a/epan/dissectors/packet-cimetrics.c +++ b/epan/dissectors/packet-cimetrics.c @@ -100,11 +100,12 @@ proto_register_cimetrics(void) "value", HFILL } } }; - static hf_register_info hf2 = { - &hf_llc_cimetrics_pid, + static hf_register_info hf2[] = { + { &hf_llc_cimetrics_pid, { "PID", "llc.cimetrics_pid", FT_UINT16, BASE_HEX, VALS(cimetrics_pid_vals), 0, NULL, HFILL } + } }; static gint *ett[] = { &ett_cimetrics_mstp @@ -120,7 +121,7 @@ proto_register_cimetrics(void) proto_cimetrics_mstp); llc_add_oui(OUI_CIMETRICS, "llc.cimetrics_pid", - "Cimetrics OUI PID", &hf2); + "Cimetrics OUI PID", hf2); } void diff --git a/epan/dissectors/packet-cisco-oui.c b/epan/dissectors/packet-cisco-oui.c index ed50219ebb..5f9d14d11b 100644 --- a/epan/dissectors/packet-cisco-oui.c +++ b/epan/dissectors/packet-cisco-oui.c @@ -63,12 +63,13 @@ static const value_string cisco_pid_vals[] = { void proto_register_cisco_oui(void) { - static hf_register_info hf = { - &hf_llc_cisco_pid, + static hf_register_info hf[] = { + { &hf_llc_cisco_pid, { "PID", "llc.cisco_pid", FT_UINT16, BASE_HEX, - VALS(cisco_pid_vals), 0x0, "", HFILL }, + VALS(cisco_pid_vals), 0x0, NULL, HFILL } + } }; - llc_add_oui(OUI_CISCO, "llc.cisco_pid", "Cisco OUI PID", &hf); + llc_add_oui(OUI_CISCO, "llc.cisco_pid", "Cisco OUI PID", hf); } diff --git a/epan/dissectors/packet-extreme.c b/epan/dissectors/packet-extreme.c index 869e288991..a6f11ac8e2 100644 --- a/epan/dissectors/packet-extreme.c +++ b/epan/dissectors/packet-extreme.c @@ -1501,11 +1501,12 @@ proto_reg_handoff_edp(void) void proto_register_extreme_oui(void) { - static hf_register_info hf = { - &hf_llc_extreme_pid, + static hf_register_info hf[] = { + { &hf_llc_extreme_pid, { "PID", "llc.extreme_pid", FT_UINT16, BASE_HEX, - VALS(extreme_pid_vals), 0x0, "", HFILL }, + VALS(extreme_pid_vals), 0x0, NULL, HFILL } + } }; - llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "Extreme OUI PID", &hf); + llc_add_oui(OUI_EXTREME, "llc.extreme_pid", "Extreme OUI PID", hf); } diff --git a/epan/dissectors/packet-force10-oui.c b/epan/dissectors/packet-force10-oui.c index 5791f3181c..9068d450a2 100644 --- a/epan/dissectors/packet-force10-oui.c +++ b/epan/dissectors/packet-force10-oui.c @@ -41,12 +41,13 @@ static const value_string force10_pid_vals[] = { void proto_register_force10_oui(void) { - static hf_register_info hf = { - &hf_llc_force10_pid, + static hf_register_info hf[] = { + { &hf_llc_force10_pid, { "PID", "llc.force10_pid", FT_UINT16, BASE_HEX, - VALS(force10_pid_vals), 0x0, NULL, HFILL }, + VALS(force10_pid_vals), 0x0, NULL, HFILL } + } }; - llc_add_oui(OUI_FORCE10, "llc.force10_pid", "FORCE10 OUI PID", &hf); + llc_add_oui(OUI_FORCE10, "llc.force10_pid", "FORCE10 OUI PID", hf); } diff --git a/epan/dissectors/packet-iana-oui.c b/epan/dissectors/packet-iana-oui.c index 14a71e05a0..66959fb2d4 100644 --- a/epan/dissectors/packet-iana-oui.c +++ b/epan/dissectors/packet-iana-oui.c @@ -51,11 +51,12 @@ static const value_string iana_pid_vals[] = { void proto_register_iana_oui(void) { - static hf_register_info hf = { - &hf_llc_iana_pid, + static hf_register_info hf[] = { + { &hf_llc_iana_pid, { "PID", "llc.iana_pid", FT_UINT16, BASE_HEX, - VALS(iana_pid_vals), 0x0, "", HFILL }, + VALS(iana_pid_vals), 0x0, NULL, HFILL } + } }; - llc_add_oui(OUI_IANA, "llc.iana_pid", "IANA OUI PID", &hf); + llc_add_oui(OUI_IANA, "llc.iana_pid", "IANA OUI PID", hf); } diff --git a/epan/dissectors/packet-nt-oui.c b/epan/dissectors/packet-nt-oui.c index 5ef0ab109a..839ed90722 100644 --- a/epan/dissectors/packet-nt-oui.c +++ b/epan/dissectors/packet-nt-oui.c @@ -44,11 +44,12 @@ static const value_string nortel_pid_vals[] = { void proto_register_nortel_oui(void) { - static hf_register_info hf = { - &hf_llc_nortel_pid, + static hf_register_info hf[] = { + { &hf_llc_nortel_pid, { "PID", "llc.nortel_pid", FT_UINT16, BASE_HEX, - VALS(nortel_pid_vals), 0x0, "", HFILL }, + VALS(nortel_pid_vals), 0x0, NULL, HFILL } + } }; - llc_add_oui(OUI_NORTEL, "llc.nortel_pid", "Nortel OUI PID", &hf); + llc_add_oui(OUI_NORTEL, "llc.nortel_pid", "Nortel OUI PID", hf); } |