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-amr.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-amr.c')
| -rw-r--r-- | epan/dissectors/packet-amr.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c index 70938cdb5d..9f1c0376b4 100644 --- a/epan/dissectors/packet-amr.c +++ b/epan/dissectors/packet-amr.c @@ -666,8 +666,8 @@ proto_register_amr(void) }, { &hf_amr_toc_f, { "F bit", "amr.toc.f", - FT_BOOLEAN, 8, TFS(&toc_f_bit_vals), 0x0, - "F bit", HFILL } + FT_BOOLEAN, BASE_NONE, TFS(&toc_f_bit_vals), 0x0, + NULL, HFILL } }, { &hf_amr_nb_toc_ft, { "FT bits", "amr.nb.toc.ft", @@ -681,78 +681,78 @@ proto_register_amr(void) }, { &hf_amr_toc_q, { "Q bit", "amr.toc.q", - FT_BOOLEAN, 8, TFS(&toc_q_bit_vals), 0x00, + FT_BOOLEAN, BASE_NONE, TFS(&toc_q_bit_vals), 0x0, "Frame quality indicator bit", HFILL } }, { &hf_amr_nb_if1_ft, { "Frame Type", "amr.nb.if1.ft", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0xf0, - "Frame Type", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if1_ft, { "Frame Type", "amr.wb.if1.ft", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0, - "Frame Type", HFILL } + NULL, HFILL } }, { &hf_amr_nb_if1_mode_req, { "Mode Type request", "amr.nb.if1.modereq", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_request_vals), 0xe0, - "Mode Type request", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if1_mode_req, { "Mode Type request", "amr.wb.if1.modereq", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_request_vals), 0x0f, - "Mode Type request", HFILL } + NULL, HFILL } }, { &hf_amr_if1_sti, { "SID Type Indicator", "amr.if1.sti", FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x10, - "SID Type Indicator", HFILL } + NULL, HFILL } }, { &hf_amr_nb_if1_sti_mode_ind, { "Mode Type indication", "amr.nb.if1.stimodeind", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x0e, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if1_sti_mode_ind, { "Mode Type indication", "amr.wb.if1.stimodeind", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0x0f, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_nb_if1_mode_ind, { "Mode Type indication", "amr.nb.if1.modeind", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x07, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if1_mode_ind, { "Mode Type indication", "amr.wb.if1.modeind", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_nb_if2_ft, { "Frame Type", "amr.nb.if2.ft", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x0f, - "Frame Type", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if2_ft, { "Frame Type", "amr.wb.if2.ft", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0xf0, - "Frame Type", HFILL } + NULL, HFILL } }, { &hf_amr_if2_sti, { "SID Type Indicator", "amr.if2.sti", FT_BOOLEAN, 8, TFS(&amr_sti_vals), 0x80, - "SID Type Indicator", HFILL } + NULL, HFILL } }, { &hf_amr_nb_if2_sti_mode_ind, { "Mode Type indication", "amr.nb.if2.stimodeind", FT_UINT8, BASE_DEC, VALS(amr_nb_codec_mode_vals), 0x07, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_wb_if2_sti_mode_ind, { "Mode Type indication", "amr.wb.if2.stimodeind", FT_UINT8, BASE_DEC, VALS(amr_wb_codec_mode_vals), 0x78, - "Mode Type indication", HFILL } + NULL, HFILL } }, { &hf_amr_if1_fqi, { "FQI", "amr.fqi", |