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/pidl | |
| parent | 1e47e050dcdf30eced478e6909408d79548975c6 (diff) | |
| download | wireshark-06237e487885387591087646b788925ff38e773b.tar.gz | |
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/pidl')
| -rw-r--r-- | epan/dissectors/pidl/mapi/mapi.cnf | 6 | ||||
| -rw-r--r-- | epan/dissectors/pidl/winreg.cnf | 3 | ||||
| -rw-r--r-- | epan/dissectors/pidl/wkssvc.cnf | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/epan/dissectors/pidl/mapi/mapi.cnf b/epan/dissectors/pidl/mapi/mapi.cnf index fb7c24bc3c..78f2190b52 100644 --- a/epan/dissectors/pidl/mapi/mapi.cnf +++ b/epan/dissectors/pidl/mapi/mapi.cnf @@ -89,15 +89,13 @@ static int mapi_dissect_element_request_handles_cnf(tvbuff_t *tvb _U_, int offse gint handles_cnt = 0; int old_offset; guint32 value; - proto_item *it = NULL; - proto_tree *tr = NULL; + proto_tree *tr; reported_len = tvb_reported_length_remaining(tvb, offset); handles_cnt = reported_len / 4; - it = proto_tree_add_text(tree, tvb, offset, reported_len, "MAPI Handles: %d", handles_cnt); - tr = proto_item_add_subtree(it, ett_mapi_mapi_request); + tr = proto_tree_add_subtree_format(tree, tvb, offset, reported_len, ett_mapi_mapi_request, NULL, "MAPI Handles: %d", handles_cnt); for (i = 0; i < handles_cnt; i++) { old_offset = offset; diff --git a/epan/dissectors/pidl/winreg.cnf b/epan/dissectors/pidl/winreg.cnf index 622597e0ab..a4d89d77d2 100644 --- a/epan/dissectors/pidl/winreg.cnf +++ b/epan/dissectors/pidl/winreg.cnf @@ -212,8 +212,7 @@ cnf_dissect_winreg_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_t hf_info=proto_registrar_get_nth(hfindex); if (parent_tree) { - item = proto_tree_add_text(parent_tree, tvb, offset, 0, "%s: ", hf_info->name); - tree = proto_item_add_subtree(item, ett_winreg_winreg_String); + tree = proto_tree_add_subtree_format(parent_tree, tvb, offset, 0, ett_winreg_winreg_String, &item, "%s: ", hf_info->name); } offset = winreg_dissect_element_String_name_len(tvb, offset, pinfo, tree, di, drep); diff --git a/epan/dissectors/pidl/wkssvc.cnf b/epan/dissectors/pidl/wkssvc.cnf index 556230871b..d71519de77 100644 --- a/epan/dissectors/pidl/wkssvc.cnf +++ b/epan/dissectors/pidl/wkssvc.cnf @@ -59,8 +59,7 @@ cnf_dissect_lsa_String(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree hf_info=proto_registrar_get_nth(hfindex); if (parent_tree) { - item = proto_tree_add_text(parent_tree, tvb, offset, 0, "%s: ", hf_info->name); - tree = proto_item_add_subtree(item, ett_wkssvc_lsa_String); + tree = proto_tree_add_subtree_format(parent_tree, tvb, offset, 0, ett_wkssvc_lsa_String, &item, "%s: ", hf_info->name); } offset = wkssvc_dissect_element_lsa_String_name_len(tvb, offset, pinfo, tree, di, drep); |