From b228488bc0b9d5e0c63b15814836f7332f35ce04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig=20Bj=C3=B8rlykke?= Date: Thu, 18 Jun 2009 21:30:42 +0000 Subject: From Kovarththanan Rajaratnam via bug 3548: (1) Trailing/leading spaces are removed from 'name's/'blurb's (2) Duplicate 'blurb's are replaced with NULL (3) Empty ("") 'blurb's are replaced with NULL (4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME, FT_PROTOCOL, FT_STRING and FT_STRINGZ field types (5) Only allow non-zero value for 'display' if 'bitmask' is non-zero svn path=/trunk/; revision=28770 --- epan/dissectors/packet-fr.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'epan/dissectors/packet-fr.c') diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c index 95f22cc8d3..a8c3d6d99e 100644 --- a/epan/dissectors/packet-fr.c +++ b/epan/dissectors/packet-fr.c @@ -855,49 +855,49 @@ void proto_register_fr(void) NULL, 0x0, "Control field", HFILL }}, { &hf_fr_n_r, { "N(R)", "fr.control.n_r", FT_UINT16, BASE_DEC, - NULL, XDLC_N_R_EXT_MASK, "", HFILL }}, + NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }}, { &hf_fr_n_s, { "N(S)", "fr.control.n_s", FT_UINT16, BASE_DEC, - NULL, XDLC_N_S_EXT_MASK, "", HFILL }}, + NULL, XDLC_N_S_EXT_MASK, NULL, HFILL }}, { &hf_fr_p, { "Poll", "fr.control.p", FT_BOOLEAN, 8, - TFS(&flags_set_truth), XDLC_P_F, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }}, { &hf_fr_p_ext, { "Poll", "fr.control.p", FT_BOOLEAN, 16, - TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }}, { &hf_fr_f, { "Final", "fr.control.f", FT_BOOLEAN, 8, - TFS(&flags_set_truth), XDLC_P_F, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }}, { &hf_fr_f_ext, { "Final", "fr.control.f", FT_BOOLEAN, 16, - TFS(&flags_set_truth), XDLC_P_F_EXT, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F_EXT, NULL, HFILL }}, { &hf_fr_s_ftype, { "Supervisory frame type", "fr.control.s_ftype", FT_UINT16, BASE_HEX, - VALS(stype_vals), XDLC_S_FTYPE_MASK, "", HFILL }}, + VALS(stype_vals), XDLC_S_FTYPE_MASK, NULL, HFILL }}, { &hf_fr_u_modifier_cmd, { "Command", "fr.control.u_modifier_cmd", FT_UINT8, BASE_HEX, - VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, "", HFILL }}, + VALS(modifier_vals_cmd), XDLC_U_MODIFIER_MASK, NULL, HFILL }}, { &hf_fr_u_modifier_resp, { "Response", "fr.control.u_modifier_resp", FT_UINT8, BASE_HEX, - VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, "", HFILL }}, + VALS(modifier_vals_resp), XDLC_U_MODIFIER_MASK, NULL, HFILL }}, { &hf_fr_ftype_i, { "Frame type", "fr.control.ftype", FT_UINT16, BASE_HEX, - VALS(ftype_vals), XDLC_I_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }}, { &hf_fr_ftype_s_u, { "Frame type", "fr.control.ftype", FT_UINT8, BASE_HEX, - VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }}, { &hf_fr_ftype_s_u_ext, { "Frame type", "fr.control.ftype", FT_UINT16, BASE_HEX, - VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }}, { &hf_fr_nlpid, { "NLPID", "fr.nlpid", FT_UINT8, BASE_HEX, VALS(fr_nlpid_vals), 0x0, "Frame Relay Encapsulated Protocol NLPID", HFILL }}, { &hf_fr_oui, { "Organization Code", "fr.snap.oui", FT_UINT24, BASE_HEX, - VALS(oui_vals), 0x0, "", HFILL }}, + VALS(oui_vals), 0x0, NULL, HFILL }}, { &hf_fr_pid, { "Protocol ID", "fr.snap.pid", FT_UINT16, BASE_HEX, - NULL, 0x0, "", HFILL }}, + NULL, 0x0, NULL, HFILL }}, { &hf_fr_snaptype, { "Type", "fr.snaptype", FT_UINT16, BASE_HEX, VALS(etype_vals), 0x0, "Frame Relay SNAP Encapsulated Protocol", HFILL }}, -- cgit v1.2.3