Squelch more warnings.
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 8 Nov 2009 07:28:39 +0000 (07:28 +0000)
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>
Sun, 8 Nov 2009 07:28:39 +0000 (07:28 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30860 f5534014-38df-0310-8fa8-9805f1628bb7

epan/dissectors/packet-rlc.c

index a945ed9d5a9c7f5217bc7fd49529bcaab188910a..555ec35f6b44a605545812f44667cba14b594f9c 100644 (file)
@@ -642,16 +642,19 @@ static struct rlc_frag *add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_i
 static tvbuff_t *get_reassembled_data(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
        guint16 seq, guint16 num_li)
 {
+       gpointer orig_frag, orig_sdu;
        struct rlc_sdu *sdu;
        struct rlc_frag lookup, *frag;
-       gboolean found;
 
        rlc_frag_assign(&lookup, mode, pinfo, seq, num_li);
 
-       found = g_hash_table_lookup_extended(reassembled_table, &lookup, (gpointer*)&frag,
-               (gpointer*)&sdu);
+       if (!g_hash_table_lookup_extended(reassembled_table, &lookup,
+           &orig_frag, &orig_sdu))
+               return NULL;
 
-       if (found == FALSE || !sdu || !sdu->data)
+       frag = orig_frag;
+       sdu = orig_sdu;
+       if (!sdu || !sdu->data)
                return NULL;
 
        /* TODO */