convert to proto_tree_add_subtree[_format]

Change-Id: I2ea1892b5963cc5578cbdd2b03029ca8424f2267
Reviewed-on: https://code.wireshark.org/review/2640
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

1 files changed, 16 insertions, 40 deletions

diff --git a/epan/dissectors/packet-dcom-sysact.c b/epan/dissectors/packet-dcom-sysact.c
index d3a2ce4d4f..f3dc972034 100644
--- a/epan/dissectors/packet-dcom-sysact.c
+++ b/epan/dissectors/packet-dcom-sysact.c
@@ -312,9 +312,7 @@ dissect_dcom_ActivationPropertiesCustomerHdr(tvbuff_t *tvb, gint offset, packet_
     proto_item *sub_item;
     proto_tree *sub_tree;
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "CustomHeader");
-
-    sub_tree = proto_item_add_subtree(sub_item, ett_commonheader);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_commonheader, &sub_item, "CustomHeader");
 
     old_offset = offset;
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
@@ -388,8 +386,7 @@ dissect_dcom_ActivationPropertiesBody(tvbuff_t *tvb, gint offset, packet_info *p
         min_idx = MIN(pg->id_idx, pg->size_idx);
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "Properties");
-    sub_tree = proto_item_add_subtree(sub_item, ett_properties);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_properties, &sub_item, "Properties");
 
     old_offset = offset;
     for (i = 0; i < min_idx; i++) {
@@ -442,8 +439,7 @@ dissect_dcom_ContextMarshaler(tvbuff_t *tvb, gint offset, packet_info *pinfo,
     guint32    u32Count;
 
     old_offset = offset;
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "Context");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_context);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_dcom_context, &sub_item, "Context");
 
     offset = dissect_dcom_COMVERSION(tvb, offset, pinfo, sub_tree, di, drep,
                 NULL, NULL);
@@ -478,7 +474,6 @@ static int
 dissect_dcom_SpecialSystemProperties(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item, *it;
     proto_tree *sub_tree, *tr;
     gint old_offset, len, i;
 
@@ -489,8 +484,7 @@ dissect_dcom_SpecialSystemProperties(tvbuff_t *tvb, gint offset, packet_info *pi
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "SpecialSystemProperties");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_spclsysprop);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_spclsysprop, NULL, "SpecialSystemProperties");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -520,9 +514,8 @@ dissect_dcom_SpecialSystemProperties(tvbuff_t *tvb, gint offset, packet_info *pi
  *            hf_sysact_spsysprop_hwnd, NULL);
  *
  */
-    it = proto_tree_add_text(sub_tree, tvb, offset, sizeof(guint32)*8,
-                             "Reserved: 8 DWORDs");
-    tr = proto_item_add_subtree(it, ett_dcom_reserved);
+    tr = proto_tree_add_subtree(sub_tree, tvb, offset, sizeof(guint32)*8,
+                             ett_dcom_reserved, NULL, "Reserved: 8 DWORDs");
     for (i = 0; i < 8; i++) {
         offset = dissect_dcom_DWORD(tvb, offset, pinfo, tr, di, drep,
                 hf_sysact_res, NULL);
@@ -565,7 +558,6 @@ static int
 dissect_dcom_InstantiationInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -576,8 +568,7 @@ dissect_dcom_InstantiationInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "InstantiationInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_instantianinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_instantianinfo, NULL, "InstantiationInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -645,7 +636,6 @@ static int
 dissect_dcom_ActivationContextInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -656,8 +646,7 @@ dissect_dcom_ActivationContextInfo(tvbuff_t *tvb, gint offset, packet_info *pinf
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "ActivationContextInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_actctxinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_actctxinfo, NULL, "ActivationContextInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -739,7 +728,6 @@ static int
 dissect_dcom_SecurtiyInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -750,8 +738,7 @@ dissect_dcom_SecurtiyInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "SecurityInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_securityinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_securityinfo, NULL, "SecurityInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di ,drep);
 
@@ -782,7 +769,6 @@ static int
 dissect_dcom_LocationInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -793,8 +779,7 @@ dissect_dcom_LocationInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "LocationInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_locationinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_locationinfo, NULL, "LocationInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -857,8 +842,7 @@ dissect_dcom_customREMOTE_REQUEST_SCM_INFO(tvbuff_t *tvb, gint offset,
         return offset;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "RemoteRequest");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_rmtrqst);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_dcom_rmtrqst, &sub_item, "RemoteRequest");
 
     old_offset = offset;
     offset = dissect_dcom_DWORD(tvb, offset, pinfo, sub_tree, di, drep,
@@ -878,7 +862,6 @@ static int
 dissect_dcom_ScmRqstInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -889,8 +872,7 @@ dissect_dcom_ScmRqstInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "ScmRequestInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_scmrqstinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_scmrqstinfo, NULL, "ScmRequestInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -989,7 +971,6 @@ static int
 dissect_dcom_PropsOutInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -1000,8 +981,7 @@ dissect_dcom_PropsOutInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "PropertiesOutput");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_propsoutput);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_propsoutput, NULL, "PropertiesOutput");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);
 
@@ -1052,8 +1032,7 @@ dissect_dcom_OxidBindings(tvbuff_t *tvb, gint offset,
     }
 
     old_offset = offset;
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "OxidBindings");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_oxidbinding);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_dcom_oxidbinding, &sub_item, "OxidBindings");
 
     offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, sub_tree, di, drep, NULL);
     offset = dissect_dcom_DUALSTRINGARRAY(tvb, offset, pinfo, sub_tree, di, drep,
@@ -1076,8 +1055,7 @@ dissect_dcom_customREMOTE_REPLY_SCM_INFO(tvbuff_t *tvb, gint offset,
         return offset;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, 0, "RemoteReply");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_rmtresp);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, 0, ett_dcom_rmtresp, &sub_item, "RemoteReply");
 
     old_offset = offset;
     offset = dissect_dcom_ID(tvb, offset, pinfo, sub_tree, di, drep,
@@ -1102,7 +1080,6 @@ static int
 dissect_dcom_ScmReplyInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
                        proto_tree *tree, dcerpc_info *di, guint8 *drep, gint size)
 {
-    proto_item *sub_item;
     proto_tree *sub_tree;
     gint old_offset, len;
 
@@ -1113,8 +1090,7 @@ dissect_dcom_ScmReplyInfo(tvbuff_t *tvb, gint offset, packet_info *pinfo,
         size = -1;
     }
 
-    sub_item = proto_tree_add_text(tree, tvb, offset, size, "ScmReplyInfo");
-    sub_tree = proto_item_add_subtree(sub_item, ett_dcom_scmrespinfo);
+    sub_tree = proto_tree_add_subtree(tree, tvb, offset, size, ett_dcom_scmrespinfo, NULL, "ScmReplyInfo");
 
     offset = dissect_TypeSzCommPrivHdr(tvb, offset, pinfo, sub_tree, di, drep);