diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-06-18 21:30:42 +0000 |
| commit | b228488bc0b9d5e0c63b15814836f7332f35ce04 (patch) | |
| tree | 62ba2a1b91519fc94d9c3213b328889b969e0c78 /epan/dissectors/packet-v120.c | |
| parent | dec6ea57aefdcebc4bacd3934606ad0d78da446e (diff) | |
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
Diffstat (limited to 'epan/dissectors/packet-v120.c')
| -rw-r--r-- | epan/dissectors/packet-v120.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c index b3ae47456a..004e075a78 100644 --- a/epan/dissectors/packet-v120.c +++ b/epan/dissectors/packet-v120.c @@ -242,49 +242,49 @@ proto_register_v120(void) static hf_register_info hf[] = { { &hf_v120_address, { "Link Address", "v120.address", FT_UINT16, BASE_HEX, NULL, - 0x0, "", HFILL }}, + 0x0, NULL, HFILL }}, { &hf_v120_control, { "Control Field", "v120.control", FT_UINT16, BASE_HEX, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, { &hf_v120_n_r, { "N(R)", "v120.control.n_r", FT_UINT16, BASE_DEC, - NULL, XDLC_N_R_EXT_MASK, "", HFILL }}, + NULL, XDLC_N_R_EXT_MASK, NULL, HFILL }}, { &hf_v120_n_s, { "N(S)", "v120.control.n_s", FT_UINT16, BASE_DEC, - NULL, XDLC_N_S_EXT_MASK, "", HFILL }}, + NULL, XDLC_N_S_EXT_MASK, NULL, HFILL }}, { &hf_v120_p, { "Poll", "v120.control.p", FT_BOOLEAN, 8, - TFS(&flags_set_truth), XDLC_P_F, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }}, { &hf_v120_p_ext, { "Poll", "v120.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_v120_f, { "Final", "v120.control.f", FT_BOOLEAN, 8, - TFS(&flags_set_truth), XDLC_P_F, "", HFILL }}, + TFS(&flags_set_truth), XDLC_P_F, NULL, HFILL }}, { &hf_v120_f_ext, { "Final", "v120.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_v120_s_ftype, { "Supervisory frame type", "v120.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_v120_u_modifier_cmd, { "Command", "v120.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_v120_u_modifier_resp, { "Response", "v120.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_v120_ftype_i, { "Frame type", "v120.control.ftype", FT_UINT16, BASE_HEX, - VALS(ftype_vals), XDLC_I_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_I_MASK, NULL, HFILL }}, { &hf_v120_ftype_s_u, { "Frame type", "v120.control.ftype", FT_UINT8, BASE_HEX, - VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }}, { &hf_v120_ftype_s_u_ext, { "Frame type", "v120.control.ftype", FT_UINT16, BASE_HEX, - VALS(ftype_vals), XDLC_S_U_MASK, "", HFILL }}, + VALS(ftype_vals), XDLC_S_U_MASK, NULL, HFILL }}, { &hf_v120_header, { "Header Field", "v120.header", FT_STRING, BASE_NONE, NULL, 0x0, - "", HFILL }}, + NULL, HFILL }}, }; static gint *ett[] = { &ett_v120, |