Eliminate proto_tree_add_text from some dissectors.

Other minor cleanup while in the neighborhood.

Change-Id: I77cac916d617f56f92f686e9cd9f15fba058facf
Reviewed-on: https://code.wireshark.org/review/3675
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 6 insertions, 10 deletions

diff --git a/epan/dissectors/packet-ncp-sss.c b/epan/dissectors/packet-ncp-sss.c
index cfee0d9ac6..60a307b67e 100644
--- a/epan/dissectors/packet-ncp-sss.c
+++ b/epan/dissectors/packet-ncp-sss.c
@@ -508,8 +508,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp
 
     switch (subfunc) {
     case 1:
-        aitem = proto_tree_add_text(ncp_tree, tvb, foffset, -1, "Packet Type: %s", val_to_str(subfunc, sss_func_enum, "Unknown (%d)"));
-        atree = proto_item_add_subtree(aitem, ett_sss);
+        atree = proto_tree_add_subtree_format(ncp_tree, tvb, foffset, -1, ett_sss, NULL, "Packet Type: %s", val_to_str(subfunc, sss_func_enum, "Unknown (%d)"));
         proto_tree_add_item(atree, hf_ping_version, tvb, foffset, 4, ENC_LITTLE_ENDIAN);
         foffset += 4;
         proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN);
@@ -594,7 +593,6 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp
             }
         } else {
             col_set_str(pinfo->cinfo, COL_INFO, "C SecretStore - fragment");
-            proto_tree_add_text(ncp_tree, tvb, foffset, 4, "Fragment");
 
             /* Fragments don't really carry a subverb so store 0xff as the subverb number */
             if (request_value) {
@@ -602,7 +600,7 @@ dissect_sss_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, ncp
             }
             if (tvb_length_remaining(tvb, foffset) > 8) {
                 foffset += 4;
-                proto_tree_add_item(ncp_tree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), ENC_NA);
+                proto_tree_add_item(ncp_tree, hf_enc_data, tvb, foffset, -1, ENC_NA);
             }
         }
         break;
@@ -627,7 +625,6 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
     const gchar         *str;
 
     proto_tree          *atree;
-    proto_item          *aitem;
     proto_item          *expert_item;
 
     foffset = 8;
@@ -635,8 +632,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
     if (tvb_length_remaining(tvb, foffset)<4) {
         return;
     }
-    aitem = proto_tree_add_text(ncp_tree, tvb, foffset, -1, "Function: %s", val_to_str_const(subfunc, sss_func_enum, "Unknown"));
-    atree = proto_item_add_subtree(aitem, ett_sss);
+    atree = proto_tree_add_subtree_format(ncp_tree, tvb, foffset, -1, ett_sss, NULL, "Function: %s", val_to_str_const(subfunc, sss_func_enum, "Unknown"));
     switch (subfunc) {
     case 1:
         proto_tree_add_item(atree, hf_flags, tvb, foffset, 4, ENC_LITTLE_ENDIAN);
@@ -649,7 +645,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
             subverb = request_value->req_nds_flags;
             str = try_val_to_str(subverb, sss_verb_enum);
             if (str) {
-                proto_tree_add_text(atree, tvb, foffset, tvb_length_remaining(tvb, foffset), "Verb: %s", str);
+                proto_tree_add_uint(atree, hf_verb, tvb, foffset, -1, subverb);
             }
         }
         proto_tree_add_item(atree, hf_length, tvb, foffset, 4, ENC_LITTLE_ENDIAN);
@@ -668,7 +664,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
                 col_add_fstr(pinfo->cinfo, COL_INFO, "R Error - %s", val_to_str(return_code, sss_errors_enum, "Unknown (%d)"));
                 /*foffset+=4;*/
             } else {
-                proto_tree_add_text(atree, tvb, foffset, 4, "Return Code: Success (0x00000000)");
+                proto_tree_add_uint_format_value(atree, hf_return_code, tvb, foffset, 4, 0, "Success (0x00000000)");
                 if (tvb_length_remaining(tvb, foffset) > 8) {
                     foffset += 4;
                     if (request_value && subverb == 6) {
@@ -692,7 +688,7 @@ dissect_sss_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ncp_tree, guint
                 }
             }
         } else {
-            proto_tree_add_text(atree, tvb, foffset, 4, "Return Code: Success (0x00000000)");
+            proto_tree_add_uint_format_value(atree, hf_return_code, tvb, foffset, 4, 0, "Success (0x00000000)");
             if (tvb_length_remaining(tvb, foffset) > 8) {
                 foffset += 4;
                 proto_tree_add_item(atree, hf_enc_data, tvb, foffset, tvb_length_remaining(tvb, foffset), ENC_NA);