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>

1 files changed, 34 insertions, 48 deletions

diff --git a/epan/dissectors/packet-dcerpc-rs_pgo.c b/epan/dissectors/packet-dcerpc-rs_pgo.c
index d072527587..8065625e27 100644
--- a/epan/dissectors/packet-dcerpc-rs_pgo.c
+++ b/epan/dissectors/packet-dcerpc-rs_pgo.c
@@ -141,8 +141,7 @@ dissect_error_status_t (tvbuff_t * tvb, int offset,
     return offset;
   }
 
-  item = proto_tree_add_text (parent_tree, tvb, offset, -1, "error_status_t");
-  tree = proto_item_add_subtree (item, ett_error_status_t);
+  tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_error_status_t, &item, "error_status_t");
 
   offset =
     dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep, hf_error_status_t,
@@ -181,9 +180,8 @@ dissect    sec_rgy_pname const signed32        sec_rgy_pname_t_size  = 257; * In
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_pname_t");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_pname_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_sec_rgy_pname_t, &item, "sec_rgy_pname_t");
     }
 
   offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, di, drep,
@@ -240,10 +238,9 @@ dissect_sec_rgy_pgo_flags_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             "sec_rgy_pgo_flags_t ");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_pgo_flags_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_sec_rgy_pgo_flags_t, &item, "sec_rgy_pgo_flags_t ");
     }
 
   offset =
@@ -339,9 +336,8 @@ dissect_rs_cache_data_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_cache_data_t");
-      tree = proto_item_add_subtree (item, ett_rs_cache_data_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_rs_cache_data_t, &item, "rs_cache_data_t");
     }
 
 
@@ -392,9 +388,8 @@ dissect_sec_rgy_name_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_name_t");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_name_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_sec_rgy_name_t, &item, "sec_rgy_name_t");
     }
 
   offset =
@@ -449,9 +444,8 @@ dissect_sec_rgy_domain_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1, "sec_rgy_domain_t");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_domain_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_sec_rgy_domain_t, &item, "sec_rgy_domain_t");
     }
 
 
@@ -498,10 +492,9 @@ dissect_sec_rgy_pgo_item_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             " sec_rgy_pgo_item_t ");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_pgo_item_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_sec_rgy_pgo_item_t, &item, " sec_rgy_pgo_item_t ");
     }
 
   offset =
@@ -560,10 +553,9 @@ dissect_sec_rgy_cursor_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             " sec_rgy_cursor_t ");
-      tree = proto_item_add_subtree (item, ett_sec_rgy_cursor_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_sec_rgy_cursor_t, &item, " sec_rgy_cursor_t ");
     }
 
   offset =
@@ -615,9 +607,8 @@ dissect_rs_pgo_query_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1, "rs_pgo_query_t ");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_query_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1, ett_rs_pgo_query_t, &item, "rs_pgo_query_t ");
     }
   offset =
     dissect_ndr_uint8 (tvb, offset, pinfo, tree, di, drep, hf_rs_pgo_query_t,
@@ -678,10 +669,9 @@ dissect_rs_pgo_id_key_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             "rs_pgo_id_key_t ");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_id_key_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_rs_pgo_id_key_t, &item, "rs_pgo_id_key_t ");
     }
 
   offset =
@@ -725,10 +715,9 @@ dissect_rs_pgo_result_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             "rs_pgo_result_t ");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_result_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_rs_pgo_result_t, &item, "rs_pgo_result_t ");
     }
 
   offset = dissect_sec_rgy_name_t (tvb, offset, pinfo, tree, di, drep);
@@ -770,10 +759,9 @@ r
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             " rs_pgo_unix_num_key_t ");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_unix_num_key_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_rs_pgo_unix_num_key_t, &item, " rs_pgo_unix_num_key_t ");
     }
 
   offset =
@@ -837,10 +825,9 @@ dissect_rs_pgo_query_key_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item =
-        proto_tree_add_text (parent_tree, tvb, offset, -1,
-                             "rs_pgo_query_key_t ");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_query_key_t);
+      tree =
+        proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                             ett_rs_pgo_query_key_t, &item, "rs_pgo_query_key_t ");
     }
   offset =
     dissect_ndr_uint16 (tvb, offset, pinfo, tree, di, drep, hf_rs_pgo_query_key_t,
@@ -909,9 +896,8 @@ dissect_rs_pgo_query_result_t (tvbuff_t * tvb, int offset,
 
   if (parent_tree)
     {
-      item = proto_tree_add_text (parent_tree, tvb, offset, -1,
-                                  "rs_pgo_query_result_t");
-      tree = proto_item_add_subtree (item, ett_rs_pgo_query_result_t);
+      tree = proto_tree_add_subtree(parent_tree, tvb, offset, -1,
+                                  ett_rs_pgo_query_result_t, &item, "rs_pgo_query_result_t");
     }
 
   offset =