Trivial cleanups:

- use a gboolean instead of an int where appropriate
- comment out an unnecessary variable assignment
- move some other assignments to before the address of the variable is taken;
  this makes the data flow more natural and cleans up some cppcheck warnings

svn path=/trunk/; revision=47811

1 files changed, 6 insertions, 6 deletions

diff --git a/epan/dissectors/packet-btavctp.c b/epan/dissectors/packet-btavctp.c
index 750d2e95b2..bd0355fdf3 100644
--- a/epan/dissectors/packet-btavctp.c
+++ b/epan/dissectors/packet-btavctp.c
@@ -332,6 +332,12 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 fragments->chandle      = chandle;
                 fragments->psm          = psm;
 
+                k_interface_id = interface_id;
+                k_adapter_id   = adapter_id;
+                k_chandle      = chandle;
+                k_psm          = psm;
+                k_frame_number = pinfo->fd->num;
+
                 key[0].length = 1;
                 key[0].key = &k_interface_id;
                 key[1].length = 1;
@@ -345,12 +351,6 @@ dissect_btavctp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 key[5].length = 0;
                 key[5].key = NULL;
 
-                k_interface_id = interface_id;
-                k_adapter_id   = adapter_id;
-                k_chandle      = chandle;
-                k_psm          = psm;
-                k_frame_number = pinfo->fd->num;
-
                 se_tree_insert32_array(reassembling, key, fragments);
             }