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-jpeg.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-jpeg.c')
| -rw-r--r-- | epan/dissectors/packet-jpeg.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/epan/dissectors/packet-jpeg.c b/epan/dissectors/packet-jpeg.c index 648e23b1b8..56fe225683 100644 --- a/epan/dissectors/packet-jpeg.c +++ b/epan/dissectors/packet-jpeg.c @@ -162,109 +162,109 @@ proto_register_jpeg(void) "Main Header", "jpeg.main_hdr", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_ts, { "Type Specific", "jpeg.main_hdr.ts", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_offs, { "Fragment Offset", "jpeg.main_hdr.offset", FT_UINT24, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_type, { "Type", "jpeg.main_hdr.type", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_q, { "Q", "jpeg.main_hdr.q", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_width, { "Width", "jpeg.main_hdr.width", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_main_hdr_height, { "Height", "jpeg.main_hdr.height", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_restart_hdr, { "Restart Marker Header", "jpeg.restart_hdr", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_restart_hdr_interval, { "Restart Interval", "jpeg.restart_hdr.interval", FT_UINT16, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_restart_hdr_f, { "F", "jpeg.restart_hdr.f", FT_UINT16, BASE_DEC, NULL, 0x8000, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_restart_hdr_l, { "L", "jpeg.restart_hdr.l", FT_UINT16, BASE_DEC, NULL, 0x4000, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_restart_hdr_count, { "Restart Count", "jpeg.restart_hdr.count", FT_UINT16, BASE_DEC, NULL, 0x3FFF, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_qtable_hdr, { "Quantization Table Header", "jpeg.qtable_hdr", FT_NONE, BASE_NONE, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_qtable_hdr_mbz, { "MBZ", "jpeg.qtable_hdr.mbz", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_qtable_hdr_prec, { "Precision", "jpeg.qtable_hdr.precision", FT_UINT8, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_qtable_hdr_length, { "Length", "jpeg.qtable_hdr.length", FT_UINT16, BASE_DEC, NULL, 0, - "", HFILL + NULL, HFILL }}, { &hf_rtp_jpeg_qtable_hdr_data, { "Quantization Table Data", "jpeg.qtable_hdr.data", - FT_BYTES, BASE_DEC, NULL, 0, - "", HFILL + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, { &hf_rtp_jpeg_payload, { "Payload", "jpeg.payload", - FT_BYTES, BASE_DEC, NULL, 0, - "", HFILL + FT_BYTES, BASE_NONE, NULL, 0, + NULL, HFILL }}, }; |