convert to proto_tree_add_subtree[_format]

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

1 files changed, 14 insertions, 27 deletions

diff --git a/epan/dissectors/packet-negoex.c b/epan/dissectors/packet-negoex.c
index 7c3f2cc76e..81e3173435 100644
--- a/epan/dissectors/packet-negoex.c
+++ b/epan/dissectors/packet-negoex.c
@@ -148,9 +148,7 @@ dissect_negoex_verify_message(tvbuff_t *tvb,
   guint32 offset;
   guint32 checksum_vector_offset;
   guint32 checksum_vector_count;
-  proto_item *pi;
   proto_tree *checksum;
-  proto_item *pi_chk;
   proto_tree *checksum_vector;
 
   offset = start_off;
@@ -160,8 +158,7 @@ dissect_negoex_verify_message(tvbuff_t *tvb,
   offset += 16;
 
   /* Checksum */
-  pi = proto_tree_add_text(tree, tvb, offset, 20, "Checksum");
-  checksum = proto_item_add_subtree(pi, ett_negoex_checksum);
+  checksum = proto_tree_add_subtree(tree, tvb, offset, 20, ett_negoex_checksum, NULL, "Checksum");
 
   /* cbHeaderLength */
   proto_tree_add_item(checksum, hf_negoex_header_len, tvb, offset, 4, ENC_LITTLE_ENDIAN);
@@ -179,11 +176,10 @@ dissect_negoex_verify_message(tvbuff_t *tvb,
   checksum_vector_offset = tvb_get_letohl(tvb, offset);
   checksum_vector_count = tvb_get_letohs(tvb, offset + 4);
 
-  pi_chk = proto_tree_add_text(checksum, tvb, offset, 8,
-                               "Checksum Vector: %u at %u",
+  checksum_vector = proto_tree_add_subtree_format(checksum, tvb, offset, 8,
+                               ett_negoex_checksum_vector, NULL, "Checksum Vector: %u at %u",
                                checksum_vector_count,
                                checksum_vector_offset);
-  checksum_vector = proto_item_add_subtree(pi_chk, ett_negoex_checksum_vector);
 
   proto_tree_add_item(checksum_vector, hf_negoex_checksum_vector_offset, tvb,
                       offset, 4, ENC_LITTLE_ENDIAN);
@@ -211,7 +207,6 @@ dissect_negoex_exchange_message(tvbuff_t *tvb,
   guint32 offset;
   guint32 exchange_vector_offset;
   guint32 exchange_vector_count;
-  proto_item *pi;
   proto_tree *exchange_vector;
 
   offset = start_off;
@@ -224,9 +219,9 @@ dissect_negoex_exchange_message(tvbuff_t *tvb,
   exchange_vector_offset = tvb_get_letohl(tvb, offset);
   exchange_vector_count = tvb_get_letohs(tvb, offset + 4);
 
-  pi = proto_tree_add_text(tree, tvb, offset, 8, "Exchange: %u bytes at %u",
+  exchange_vector = proto_tree_add_subtree_format(tree, tvb, offset, 8,
+                           ett_negoex_exchange, NULL, "Exchange: %u bytes at %u",
                            exchange_vector_count, exchange_vector_offset);
-  exchange_vector = proto_item_add_subtree(pi, ett_negoex_exchange);
 
   proto_tree_add_item(exchange_vector, hf_negoex_exchange_vector_offset, tvb,
                       offset, 4, ENC_LITTLE_ENDIAN);
@@ -263,7 +258,6 @@ dissect_negoex_nego_message(tvbuff_t *tvb,
   guint16 authscheme_vector_count;
   guint32 extension_vector_offset;
   guint32 extension_vector_count;
-  proto_item *pi, *ext_pi;
   proto_tree *authscheme_vector;
   proto_tree *extension_vector;
   guint32 i;
@@ -283,9 +277,9 @@ dissect_negoex_nego_message(tvbuff_t *tvb,
     authscheme_vector_offset = tvb_get_letohl(tvb, offset);
     authscheme_vector_count = tvb_get_letohs(tvb, offset + 4);
 
-    pi = proto_tree_add_text(tree, tvb, offset, 8, "AuthSchemes: %u at %u",
+    authscheme_vector = proto_tree_add_subtree_format(tree, tvb, offset, 8,
+                             ett_negoex_authscheme_vector, NULL, "AuthSchemes: %u at %u",
                              authscheme_vector_count, authscheme_vector_offset);
-    authscheme_vector = proto_item_add_subtree(pi, ett_negoex_authscheme_vector);
     proto_tree_add_item(authscheme_vector, hf_negoex_authscheme_vector_offset,
                         tvb, offset, 4, ENC_LITTLE_ENDIAN);
     offset += 4;
@@ -307,9 +301,9 @@ dissect_negoex_nego_message(tvbuff_t *tvb,
     extension_vector_offset = tvb_get_letohl(tvb, offset);
     extension_vector_count = tvb_get_letohs(tvb, offset + 4);
 
-    ext_pi = proto_tree_add_text(tree, tvb, offset, 8, "Extensions: %u at %u",
+    extension_vector = proto_tree_add_subtree_format(tree, tvb, offset, 8,
+                                 ett_negoex_extension_vector, NULL, "Extensions: %u at %u",
                                  extension_vector_count, extension_vector_count);
-    extension_vector = proto_item_add_subtree(ext_pi, ett_negoex_extension_vector);
 
     proto_tree_add_item(extension_vector, hf_negoex_extension_vector_offset,
                         tvb, offset, 4, ENC_LITTLE_ENDIAN);
@@ -325,7 +319,6 @@ dissect_negoex_nego_message(tvbuff_t *tvb,
 
     for (i = 0; i < extension_vector_count; i++) {
       guint32 byte_vector_offset, byte_vector_count;
-      proto_item *bv_pi;
       proto_tree *bv_tree;
 
       /*
@@ -335,11 +328,10 @@ dissect_negoex_nego_message(tvbuff_t *tvb,
       byte_vector_offset = tvb_get_letohl(tvb, offset);
       byte_vector_count = tvb_get_letohs(tvb, offset + 4);
 
-      bv_pi = proto_tree_add_text(extension_vector, tvb,
+      bv_tree = proto_tree_add_subtree_format(extension_vector, tvb,
                                   extension_vector_offset + i * 8, 8,
-                                  "Extension: %u bytes at %u",
+                                  ett_negoex_byte_vector, NULL, "Extension: %u bytes at %u",
                                   byte_vector_count, byte_vector_offset);
-      bv_tree = proto_item_add_subtree(bv_pi, ett_negoex_byte_vector);
 
       proto_tree_add_item(bv_tree, hf_negoex_extension, tvb,
                           byte_vector_offset, byte_vector_count, ENC_NA);
@@ -383,7 +375,6 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     proto_tree *negoex_msg_tree;
     proto_tree *negoex_hdr_tree;
     proto_item *msg;
-    proto_item *hdr;
     tvbuff_t *msg_tvb;
     guint32 start_offset;
 
@@ -394,18 +385,14 @@ dissect_negoex(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       message_type = tvb_get_letohl(tvb, offset + 8);
 
       /* Add the message type tree ... set its length below */
-      msg = proto_tree_add_text(negoex_tree, tvb, offset, -1,
-                                "NEGOEX %s",
+      negoex_msg_tree = proto_tree_add_subtree_format(negoex_tree, tvb, offset, -1,
+                                ett_negoex_msg, &msg, "NEGOEX %s",
                                 val_to_str_const(message_type,
                                                  negoex_message_types,
                                                  "Unknown NEGOEX message type"));
 
-      /* Add a subtree for the message */
-      negoex_msg_tree = proto_item_add_subtree(msg, ett_negoex_msg);
-
       /* Add a subtree for the header */
-      hdr = proto_tree_add_text(negoex_msg_tree, tvb, offset, 40, "Header");
-      negoex_hdr_tree = proto_item_add_subtree(hdr, ett_negoex_hdr);
+      negoex_hdr_tree = proto_tree_add_subtree(negoex_msg_tree, tvb, offset, 40, ett_negoex_hdr, NULL, "Header");
 
       /* Signature, NEGOEXTS */
       proto_tree_add_item(negoex_hdr_tree, hf_negoex_sig,