1 files changed, 10 insertions, 24 deletions

diff --git a/epan/dissectors/packet-fmp.c b/epan/dissectors/packet-fmp.c
index 127d20c8e1..b25bf07c12 100644
--- a/epan/dissectors/packet-fmp.c
+++ b/epan/dissectors/packet-fmp.c
@@ -189,16 +189,13 @@ dissect_fmp_fileHandleSrc(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 {
     nativeProtocol      np;
 
-    proto_item *fileHandleItem;
     proto_tree *fileHandleTree;
     int         length;
 
     length = get_fileHandleSrc_size(tvb, offset);
 
-    fileHandleItem =  proto_tree_add_text(tree, tvb, offset, length,
-                                          "Source File Handle");
-    fileHandleTree = proto_item_add_subtree(fileHandleItem,
-                                            ett_fmp_fileHandle);
+    fileHandleTree = proto_tree_add_subtree(tree, tvb, offset, length,
+                                          ett_fmp_fileHandle, NULL, "Source File Handle");
 
     np = (nativeProtocol)tvb_get_ntohl(tvb, offset);
     proto_tree_add_item(fileHandleTree, hf_fmp_native_protocol, tvb, offset, 4, ENC_BIG_ENDIAN);
@@ -280,13 +277,10 @@ dissect_fmp_extentState(tvbuff_t *tvb, int offset, proto_tree *tree)
 static int
 dissect_fmp_extent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree, guint32 ext_num)
 {
-    proto_item *extItem;
     proto_tree *extTree;
 
-    extItem = proto_tree_add_text(tree, tvb, offset, 20 ,
-                                  "Extent (%u)", (guint32) ext_num);
-
-    extTree = proto_item_add_subtree(extItem, ett_fmp_ext);
+    extTree = proto_tree_add_subtree_format(tree, tvb, offset, 20 ,
+                                  ett_fmp_ext, NULL, "Extent (%u)", (guint32) ext_num);
 
     offset = dissect_rpc_uint32(tvb,  extTree, hf_fmp_firstLogBlk,
                                 offset);
@@ -306,16 +300,14 @@ dissect_fmp_extentList(tvbuff_t *tvb, int offset, packet_info *pinfo,
 {
     guint32     numExtents;
     guint32     totalLength;
-    proto_item *extListItem;
     proto_tree *extListTree;
     guint32     i;
 
     numExtents = tvb_get_ntohl(tvb, offset);
     totalLength = 4 + (20 * numExtents);
 
-    extListItem =  proto_tree_add_text(tree, tvb, offset, totalLength,
-                                       "Extent List");
-    extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList);
+    extListTree =  proto_tree_add_subtree(tree, tvb, offset, totalLength,
+                                       ett_fmp_extList, NULL, "Extent List");
 
     offset = dissect_rpc_uint32(tvb, extListTree,
                                 hf_fmp_extentList_len, offset);
@@ -333,7 +325,6 @@ dissect_fmp_extentListEx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
                          proto_tree *tree)
 {
     guint32     numExtents;
-    proto_item *extListItem;
     proto_tree *extListTree;
     guint32     i;
 
@@ -342,10 +333,8 @@ dissect_fmp_extentListEx(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
     offset += 4;
 
     for (i = 0; i < numExtents; i++) {
-        extListItem =  proto_tree_add_text(tree, tvb, offset, 28,
-                                           "Extent List");
-        extListTree = proto_item_add_subtree(extListItem, ett_fmp_extList);
-
+        extListTree =  proto_tree_add_subtree(tree, tvb, offset, 28,
+                                           ett_fmp_extList, NULL, "Extent List");
 
         offset = dissect_rpc_uint64(tvb,extListTree , hf_fmp_firstLogBlk64,  offset);
 
@@ -839,13 +828,10 @@ dissect_fmp_cerrInfo(tvbuff_t *tvb, int offset, proto_tree *tree)
 static int
 dissect_fmp_attrs(tvbuff_t *tvb, int offset, proto_tree *tree)
 {
-    proto_tree *attrstree;
     proto_tree *attrsTree;
 
-    attrstree =  proto_tree_add_text(tree, tvb, offset, 84,
-                                     "Attribute: ");
-    attrsTree = proto_item_add_subtree(attrstree,
-                                       ett_attrs );
+    attrsTree =  proto_tree_add_subtree(tree, tvb, offset, 84,
+                                     ett_attrs, NULL, "Attribute: ");
     offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_type, offset);
     offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_mode, offset);
     offset = dissect_rpc_uint32(tvb, attrsTree, hf_fmp_nfsv3Attr_nlink, offset);