convert to proto_tree_add_subtree[_format]

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

1 files changed, 4 insertions, 8 deletions

diff --git a/epan/dissectors/packet-wps.c b/epan/dissectors/packet-wps.c
index b48fdf3250..ddbba5929c 100644
--- a/epan/dissectors/packet-wps.c
+++ b/epan/dissectors/packet-wps.c
@@ -802,10 +802,8 @@ add_wps_wfa_ext(guint8 id, proto_tree *tree, tvbuff_t *tvb,
   proto_tree *elem;
   guint8      val8;
 
-  item = proto_tree_add_text(tree, tvb, offset - 2, 2 + size, "%s",
-                             val_to_str(id, eapwps_wfa_ext_types,
-                                        "Unknown (%u)"));
-  elem = proto_item_add_subtree(item, ett_wps_wfa_ext);
+  elem = proto_tree_add_subtree(tree, tvb, offset - 2, 2 + size, ett_wps_wfa_ext, &item,
+                             val_to_str(id, eapwps_wfa_ext_types, "Unknown (%u)"));
   proto_tree_add_item(elem, hf_eapwps_wfa_ext_id,  tvb, offset - 2, 1, ENC_BIG_ENDIAN);
   proto_tree_add_item(elem, hf_eapwps_wfa_ext_len, tvb, offset - 1, 1, ENC_BIG_ENDIAN);
 
@@ -904,16 +902,14 @@ dissect_wps_tlvs(proto_tree *eap_tree, tvbuff_t *tvb, int offset,
       break;
     }
 
-    tlv_item = NULL;
-    tlv_root = NULL;
     tmp_item = NULL;
 
     tlv_type = tvb_get_ntohs(tvb, offset);
     tlv_len  = tvb_get_ntohs(tvb, offset+2);
 
     /* TOP Node for each TLV-item */
-    tlv_item = proto_tree_add_text(eap_tree, tvb, offset, tlv_len+4, "Unknown Type (0x%04x)", tlv_type);
-    tlv_root = proto_item_add_subtree(tlv_item, ett_wps_tlv);
+    tlv_root = proto_tree_add_subtree_format(eap_tree, tvb, offset, tlv_len+4,
+                        ett_wps_tlv, &tlv_item, "Unknown Type (0x%04x)", tlv_type);
 
     /* analog to Tagged parameters in 802.11 */
     proto_tree_add_item(tlv_root, hf_eapwps_tlv_type, tvb, offset,   2, ENC_BIG_ENDIAN);