diff options
| author | Michael Mann <mmann78@netscape.net> | 2014-08-13 08:56:22 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-14 04:21:05 +0000 |
| commit | d68d0e88b4924a610b5cd2fd3a748b00c9bbab1a (patch) | |
| tree | f46c04238502faa689c173f1b8420c8d19d3c51e /epan/dissectors/packet-mpeg-descriptor.c | |
| parent | f64421df3f230e89e0d83e327926f4c46fbd70dc (diff) | |
Eliminate proto_tree_add_text from some dissectors.
Other minor cleanup while in the neighborhood.
Change-Id: If73a029f564219782c313d4154c24c7ce7458b52
Reviewed-on: https://code.wireshark.org/review/3574
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-mpeg-descriptor.c')
| -rw-r--r-- | epan/dissectors/packet-mpeg-descriptor.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mpeg-descriptor.c b/epan/dissectors/packet-mpeg-descriptor.c index ef03a71db1..44f08748b3 100644 --- a/epan/dissectors/packet-mpeg-descriptor.c +++ b/epan/dissectors/packet-mpeg-descriptor.c @@ -1750,7 +1750,7 @@ proto_mpeg_descriptor_dissect_local_time_offset(tvbuff_t *tvb, guint offset, gui if (packet_mpeg_sect_mjd_to_utc_time(tvb, offset, &time_of_change) < 0) { - proto_tree_add_text(tree, tvb, offset, 5, "Time of Change : Unparseable time"); + proto_tree_add_time_format_value(tree, hf_mpeg_descr_local_time_offset_time_of_change, tvb, offset, 5, &time_of_change, "Unparseable time"); } else { proto_tree_add_time(tree, hf_mpeg_descr_local_time_offset_time_of_change, tvb, offset, 5, &time_of_change); } @@ -2309,6 +2309,8 @@ static int hf_mpeg_descr_extension_supp_audio_ed_cla = -1; static int hf_mpeg_descr_extension_supp_audio_lang_code_present = -1; static int hf_mpeg_descr_extension_supp_audio_lang_code = -1; +static int hf_mpeg_descr_private_data = -1; + #define EXT_TAG_IMG_ICON 0x00 #define EXT_TAG_CPCM_DLV 0x01 #define EXT_TAG_CP 0x02 @@ -2383,7 +2385,7 @@ proto_mpeg_descriptor_dissect_extension(tvbuff_t *tvb, guint offset, guint len, } already_dissected = offset-offset_start; if (already_dissected<len) - proto_tree_add_text(tree, tvb, offset, len-already_dissected, "Private data"); + proto_tree_add_item(tree, hf_mpeg_descr_private_data, tvb, offset, len-already_dissected, ENC_NA); break; default: already_dissected = offset-offset_start; @@ -2675,7 +2677,7 @@ proto_mpeg_descriptor_dissect_private_ciplus(tvbuff_t *tvb, guint offset, proto_ remaining = offset_start+2+len - offset; if (remaining > 0) { - proto_tree_add_text(descriptor_tree, tvb, offset, remaining, "Private data bytes"); + proto_tree_add_item(descriptor_tree, hf_mpeg_descr_private_data, tvb, offset, remaining, ENC_NA); offset += remaining; } } @@ -4080,6 +4082,11 @@ proto_register_mpeg_descriptor(void) FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL } }, + { &hf_mpeg_descr_private_data, { + "Private data", "mpeg_descr.private_data", + FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL + } }, + /* 0xA2 Logon Initialize Descriptor */ { &hf_mpeg_descr_logon_initialize_group_id, { "Group ID", "mpeg_descr.logon_init.group_id", |