diff options
author | Michael Mann <mmann78@netscape.net> | 2014-09-19 22:23:27 -0400 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-09-20 11:59:25 +0000 |
commit | 06237e487885387591087646b788925ff38e773b (patch) | |
tree | 07dc54c02e926b8b8a2238676699b4234e518d71 /epan/dissectors/packet-dcerpc-fldb.c | |
parent | 1e47e050dcdf30eced478e6909408d79548975c6 (diff) |
proto_tree_add_text -> proto_tree_add_subtree[_format] for DCE/RPC dissectors.
Change-Id: I84755d059ef70ca98b0e7626b6425360daf0529d
Reviewed-on: https://code.wireshark.org/review/4199
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-dcerpc-fldb.c')
-rw-r--r-- | epan/dissectors/packet-dcerpc-fldb.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/epan/dissectors/packet-dcerpc-fldb.c b/epan/dissectors/packet-dcerpc-fldb.c index 5b4fce15d4..ae40cfd103 100644 --- a/epan/dissectors/packet-dcerpc-fldb.c +++ b/epan/dissectors/packet-dcerpc-fldb.c @@ -250,9 +250,8 @@ dissect_afsnetaddr (tvbuff_t * tvb, int offset, if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, - "afsNetAddr:"); - tree = proto_item_add_subtree (item, ett_fldb_afsnetaddr); + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, + ett_fldb_afsnetaddr, &item, "afsNetAddr:"); } /* unsigned16 type; @@ -334,9 +333,8 @@ dissect_vlconf_cell (tvbuff_t * tvb, int offset, if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, - "vlconf_cell:"); - tree = proto_item_add_subtree (item, ett_fldb_vlconf_cell); + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, + ett_fldb_vlconf_cell, &item, "vlconf_cell:"); } /* byte name[MAXVLCELLCHARS]; Cell name */ @@ -445,10 +443,8 @@ typedef [string] byte NameString_t[AFS_NAMEMAX]; if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, - "afsNameString_t:"); - tree = proto_item_add_subtree (item, ett_fldb_afsNameString_t); - } + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, + ett_fldb_afsNameString_t, &item, "afsNameString_t:"); } offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, di, drep, hf_fldb_afsNameString_t_principalName_size, @@ -488,8 +484,7 @@ dissect_afsflags (tvbuff_t * tvb, int offset, if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, "afsFlags:"); - tree = proto_item_add_subtree (item, ett_fldb_afsflags); + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_fldb_afsflags, &item, "afsFlags:"); } offset = @@ -601,8 +596,7 @@ dissect_siteflags (tvbuff_t * tvb, int offset, if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, "SiteFlags:"); - tree = proto_item_add_subtree (item, ett_fldb_siteflags); + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_fldb_siteflags, &item, "SiteFlags:"); } offset = @@ -676,8 +670,7 @@ dissect_vldbentry (tvbuff_t * tvb, int offset, if (parent_tree) { - item = proto_tree_add_text (parent_tree, tvb, offset, -1, "vldbentry:"); - tree = proto_item_add_subtree (item, ett_fldb_vldbentry); + tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_fldb_vldbentry, &item, "vldbentry:"); } /* byte name[114]; Volume name */ |