packet-ipmi...: Various cleanups:

- refs to value_strings in hf[] entries, by convention, should use VALS macro;
- add editor-modelines as needed; Fix some indentation.

Change-Id: Iaa0196bab6de066ed68a2755b69b07fadd33e498
Reviewed-on: https://code.wireshark.org/review/1927
Reviewed-by: Bill Meier <wmeier@newsguy.com>

1 files changed, 35 insertions, 22 deletions

diff --git a/epan/dissectors/packet-ipmi-app.c b/epan/dissectors/packet-ipmi-app.c
index 4ed0387bad..fffb526827 100644
--- a/epan/dissectors/packet-ipmi-app.c
+++ b/epan/dissectors/packet-ipmi-app.c
@@ -1084,7 +1084,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_04_result,
 			{ "Self test result",
-				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, vals_04_result, 0, NULL, HFILL }},
+				"ipmi.app04.self_test_result", FT_UINT8, BASE_HEX, VALS(vals_04_result), 0, NULL, HFILL }},
 		{ &hf_ipmi_app_04_fail,
 			{ "Self-test error bitfield",
 				"ipmi.app04.fail", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -1122,20 +1122,20 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app06.syspwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_syspwr_enum,
 			{ "System Power State enumeration",
-				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, vals_06_syspwr, 0x7f, NULL, HFILL }},
+				"ipmi.app06.syspwr.enum", FT_UINT8, BASE_HEX, VALS(vals_06_syspwr), 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_set,
 			{ "Device Power State",
 				"ipmi.app06.devpwr.set", FT_BOOLEAN, 8, TFS(&tfs_06_pwr), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_06_devpwr_enum,
 			{ "Device Power State enumeration",
-				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, vals_06_devpwr, 0x7f, NULL, HFILL }},
+				"ipmi.app06.devpwr.enum", FT_UINT8, BASE_HEX, VALS(vals_06_devpwr), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_07_syspwr_enum,
 			{ "ACPI System Power State",
-				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, vals_07_syspwr, 0x7f, NULL, HFILL }},
+				"ipmi.app07.syspwr", FT_UINT8, BASE_HEX, VALS(vals_07_syspwr), 0x7f, NULL, HFILL }},
 		{ &hf_ipmi_app_07_devpwr_enum,
 			{ "ACPI Device Power State",
-				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, vals_07_devpwr, 0x7f, NULL, HFILL }},
+				"ipmi.app07.devpwr", FT_UINT8, BASE_HEX, VALS(vals_07_devpwr), 0x7f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_08_guid,
 			{ "GUID",
@@ -1149,13 +1149,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app24.timer_use.dont_stop", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_use_timer_use,
 			{ "Timer use",
-				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
+				"ipmi.app24.timer_use.timer_use", FT_UINT8, BASE_HEX, VALS(vals_24_timer_use), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
+				"ipmi.app24.timer_action.interrupt", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_interrupt), 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_24_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
+				"ipmi.app24.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_24_pretimeout,
 			{ "Pre-timeout interval",
 				"ipmi.app24.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
@@ -1186,13 +1186,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app25.timer_use.started", FT_BOOLEAN, 8, NULL, 0x40, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_use_timer_use,
 			{ "Timer user",
-				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, vals_24_timer_use, 0x07, NULL, HFILL }},
+				"ipmi.app25.timer_use.timer_use", FT_UINT8, BASE_HEX, VALS(vals_24_timer_use), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_interrupt,
 			{ "Pre-timeout interrupt",
-				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, vals_24_timer_action_interrupt, 0x70, NULL, HFILL }},
+				"ipmi.app25.timer_action.interrupt", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_interrupt), 0x70, NULL, HFILL }},
 		{ &hf_ipmi_app_25_timer_action_timeout_action,
 			{ "Timeout action",
-				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, vals_24_timer_action_timeout, 0x07, NULL, HFILL }},
+				"ipmi.app25.timer_action.timeout", FT_UINT8, BASE_HEX, VALS(vals_24_timer_action_timeout), 0x07, NULL, HFILL }},
 		{ &hf_ipmi_app_25_pretimeout,
 			{ "Pre-timeout interval",
 				"ipmi.app25.pretimeout", FT_UINT8, BASE_CUSTOM, ipmi_fmt_1s_1based, 0, NULL, HFILL }},
@@ -1305,7 +1305,7 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app32.rq_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rq_state,
 			{ "Channel State",
-				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, vals_32_state, 0x03, NULL, HFILL }},
+				"ipmi.app32.rq_state", FT_UINT8, BASE_HEX, VALS(vals_32_state), 0x03, NULL, HFILL }},
 		{ &hf_ipmi_app_32_rs_chno,
 			{ "Channel",
 				"ipmi.app32.rs_chno", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
@@ -1315,7 +1315,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_34_track,
 			{ "Tracking",
-				"ipmi.app34.track", FT_UINT8, BASE_HEX, vals_34_track, 0xc0, NULL, HFILL }},
+				"ipmi.app34.track", FT_UINT8, BASE_HEX, VALS(vals_34_track), 0xc0, NULL, HFILL }},
 		{ &hf_ipmi_app_34_encrypt,
 			{ "Encryption required",
 				"ipmi.app34.encrypt", FT_BOOLEAN, 8, NULL, 0x20, NULL, HFILL }},
@@ -1334,13 +1334,13 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app38.rq_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rq_priv,
 			{ "Requested privilege level",
-				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app38.rq_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_chan,
 			{ "Channel",
 				"ipmi.app38.rs_chan", FT_UINT8, BASE_CUSTOM, ipmi_fmt_channel, 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_ipmi20,
 			{ "Version compatibility",
-				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, vals_38_ipmi20, 0x80, NULL, HFILL }},
+				"ipmi.app38.rs_ipmi20", FT_UINT8, BASE_DEC, VALS(vals_38_ipmi20), 0x80, NULL, HFILL }},
 		{ &hf_ipmi_app_38_rs_auth_oem,
 			{ "OEM Proprietary authentication",
 				"ipmi.app38.rs_auth_oem", FT_BOOLEAN, 8, TFS(&tfs_38_supp), 0x20, NULL, HFILL }},
@@ -1389,7 +1389,7 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_39_authtype,
 			{ "Authentication Type",
-				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app39.authtype", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_39_user,
 			{ "User Name",
 				"ipmi.app39.user", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1402,10 +1402,10 @@ ipmi_register_app(gint proto_ipmi)
 
 		{ &hf_ipmi_app_3a_authtype,
 			{ "Authentication Type",
-				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.authtype", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_privlevel,
 			{ "Requested Maximum Privilege Level",
-				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.privlevel", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authcode,
 			{ "Challenge string/Auth Code",
 				"ipmi.app3a.authcode", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }},
@@ -1414,7 +1414,7 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app3a.outbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_authtype_session,
 			{ "Authentication Type for session",
-				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, vals_XX_auth, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.authtype_session", FT_UINT8, BASE_HEX, VALS(vals_XX_auth), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_session_id,
 			{ "Session ID",
 				"ipmi.app3a.session_id", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
@@ -1423,14 +1423,14 @@ ipmi_register_app(gint proto_ipmi)
 				"ipmi.app3a.inbound_seq", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
 		{ &hf_ipmi_app_3a_maxpriv_session,
 			{ "Maximum Privilege Level for session",
-				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3a.maxpriv_session", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3b_req_priv,
 			{ "Requested Privilege Level",
-				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3b.req_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 		{ &hf_ipmi_app_3b_new_priv,
 			{ "New Privilege Level",
-				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, vals_XX_priv, 0x0f, NULL, HFILL }},
+				"ipmi.app3b.new_priv", FT_UINT8, BASE_HEX, VALS(vals_XX_priv), 0x0f, NULL, HFILL }},
 
 		{ &hf_ipmi_app_3c_session_id,
 			{ "Session ID",
@@ -1484,3 +1484,16 @@ ipmi_register_app(gint proto_ipmi)
 	ipmi_register_netfn_cmdtab(IPMI_APP_REQ, IPMI_OEM_NONE, NULL, 0, NULL,
 			cmd_app, array_length(cmd_app));
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */