Add a CF_FUNC macro for casting BASE_CUSTOM functions.

Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:

    warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]

We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.

Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.

Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.

Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>

1 files changed, 11 insertions, 11 deletions

diff --git a/epan/dissectors/packet-ipmi-picmg.c b/epan/dissectors/packet-ipmi-picmg.c
index 065f044fd8..56562cfa72 100644
--- a/epan/dissectors/packet-ipmi-picmg.c
+++ b/epan/dissectors/packet-ipmi-picmg.c
@@ -2790,7 +2790,7 @@ proto_register_ipmi_picmg(void)
 
 		{ &hf_ipmi_picmg_00_version,
 			{ "PICMG Extension Version",
-				"ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, ipmi_fmt_version, 0, NULL, HFILL }},
+				"ipmi.picmg00.version", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_version), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_00_max_fruid,
 			{ "Max FRU Device ID",
 				"ipmi.picmg00.max_fruid", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -3128,7 +3128,7 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg1c.fan_enable_state", FT_UINT8, BASE_HEX, VALS(enable_vals), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_fan_policy_timeout,
 			{ "Fan Policy Timeout",
-				"ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg1c.fan_policy_timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_1c_site_number,
 			{ "Site Number",
 				"ipmi.picmg1c.site_number", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -3214,7 +3214,7 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg21.site_num", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_max_unavail,
 			{ "Maximum Unavailable Time",
-				"ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg21.max_unavail", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_1s_1based), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_21_is_shm,
 			{ "Shelf Manager IP Address",
 				"ipmi.picmg21.is_shm", FT_BOOLEAN, 8, NULL, 0x80, NULL, HFILL }},
@@ -3292,16 +3292,16 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg2e.self_test", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_upgrade_tout,
 			{ "Upgrade timeout",
-				"ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg2e.upgrade_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_selftest_tout,
 			{ "Self-test timeout",
-				"ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg2e.selftest_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_rollback_tout,
 			{ "Rollback timeout",
-				"ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg2e.rollback_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_2e_inaccessibility_tout,
 			{ "Inaccessibility timeout",
-				"ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_5s_1based, 0, NULL, HFILL }},
+				"ipmi.picmg2e.inaccessibility_tout", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_5s_1based), 0, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_prop00_cold_reset,
 			{ "Payload cold reset required",
@@ -3373,7 +3373,7 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg34.ccode", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_34_percentage,
 			{ "Completion estimate",
-				"ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }},
+				"ipmi.picmg34.percent", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_percent), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_35_rollback_override,
 			{ "Rollback Override Policy",
@@ -3412,7 +3412,7 @@ proto_register_ipmi_picmg(void)
 
 		{ &hf_ipmi_picmg_37_percent,
 			{ "Estimated percentage complete",
-				"ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, ipmi_fmt_percent, 0x7f, NULL, HFILL }},
+				"ipmi.picmg37.percent", FT_UINT8, BASE_CUSTOM, CF_FUNC(ipmi_fmt_percent), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_picmg_hpm_id,
 			{ "HPM.x Identifier",
@@ -3594,7 +3594,7 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg.pwr.control", FT_UINT8, BASE_DEC, VALS(picmg_24_controls), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_24_current,
 			{ "Power Channel Current Limit",
-				"ipmi.picmg.pwr.limit", FT_UINT8, BASE_CUSTOM, fmt_power_amps, 0, NULL, HFILL }},
+				"ipmi.picmg.pwr.limit", FT_UINT8, BASE_CUSTOM, CF_FUNC(fmt_power_amps), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_24_primary_pm,
 			{ "Primary PM",
 				"ipmi.picmg.primary.pm", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
@@ -3662,7 +3662,7 @@ proto_register_ipmi_picmg(void)
 				"ipmi.picmg26.pm.hly", FT_BOOLEAN, 8, NULL, 0x01, NULL, HFILL }},
 		{ &hf_ipmi_picmg_28_timeout,
 			{ "Time-out",
-				"ipmi.picmg28.timeout", FT_UINT8, BASE_CUSTOM, fmt_100ms, 0, NULL, HFILL }},
+				"ipmi.picmg28.timeout", FT_UINT8, BASE_CUSTOM, CF_FUNC(fmt_100ms), 0, NULL, HFILL }},
 		{ &hf_ipmi_picmg_28_rq_byte3,
 			{ "Flags",
 				"ipmi.picmg28.flags", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},