Create 2 subtrees using the correct 'proto_item *'; Fixes Coverity 900 & 901 [UNUSED];
authorwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 18 May 2011 23:01:05 +0000 (23:01 +0000)
committerwmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 18 May 2011 23:01:05 +0000 (23:01 +0000)
#inclide <stdlib.h> not req'd.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37267 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-fcswils.c

index ef1d7960d143a623de430afee865b83222005e7e..0ddb4c94d1a530964465b16fe2e98e18ca260a77 100644 (file)
@@ -27,8 +27,6 @@
 # include "config.h"
 #endif
 
-#include <stdlib.h>
-
 #ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
@@ -1192,7 +1190,7 @@ dissect_swils_rscn (tvbuff_t *tvb, proto_tree *rscn_tree, guint8 isreq)
         for (i = 0; i < numrec; i++) {
             subti = proto_tree_add_text (rscn_tree, tvb, offset, 20,
                                          "Device Entry %d", i);
-            dev_tree = proto_item_add_subtree (rscn_tree, ett_fcswils_rscn_dev);
+            dev_tree = proto_item_add_subtree (subti, ett_fcswils_rscn_dev);
 
             proto_tree_add_item (dev_tree, hf_swils_rscn_portstate, tvb, offset, 1, 0);
             proto_tree_add_string (dev_tree, hf_swils_rscn_portid, tvb, offset+1, 3,
@@ -1319,7 +1317,7 @@ dissect_swils_zone_obj (tvbuff_t *tvb, proto_tree *zobj_tree, int offset)
             mbrlen = 4 + tvb_get_guint8 (tvb, offset+3);
             subti = proto_tree_add_text (zobj_tree, tvb, offset, mbrlen,
                                          "Zone Member %d", i);
-            zmbr_tree = proto_item_add_subtree (zobj_tree,
+            zmbr_tree = proto_item_add_subtree (subti,
                                                 ett_fcswils_zonembr);
             dissect_swils_zone_mbr (tvb, zmbr_tree, offset);
             offset += mbrlen;