diff options
author | Pascal Quantin <pascal.quantin@gmail.com> | 2012-07-27 14:07:20 +0000 |
---|---|---|
committer | Pascal Quantin <pascal.quantin@gmail.com> | 2012-07-27 14:07:20 +0000 |
commit | 8c493695ad0891338ca0335796bd925305577fff (patch) | |
tree | 6ad022d6353e024ca1c35117aeee2448b08befe7 /epan/dissectors/packet-rlc.c | |
parent | c4d66ac9a2ab05f8930fcef9ed151e5f47a42695 (diff) |
Fix a few Clang warnings (dead assignment, function call argument is an uninitialized value)
Remove misleading U-RNTI display: it is useless for RLC dissection and the variable is a placeholder used for re-assembly that can contain other identifiers than the real U-RNTI (see packet-umts_fp.c)
svn path=/trunk/; revision=44070
Diffstat (limited to 'epan/dissectors/packet-rlc.c')
-rw-r--r-- | epan/dissectors/packet-rlc.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index a4d49c583c..818e36570b 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -870,10 +870,12 @@ add_fragment(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, struct rlc_seqlist * endlist = NULL; GList * element = NULL; - rlc_channel_assign(&ch_lookup, mode, pinfo); + if (rlc_channel_assign(&ch_lookup, mode, pinfo) == -1) { + return NULL; + } rlc_frag_assign(&frag_lookup, mode, pinfo, seq, num_li); #if RLC_ADD_FRAGMENT_DEBUG_PRINT - g_print("paket: %d, kanal (%d %d %d %d %d %d %d %d %d) seq: %u, num_li: %u, offset: %u, \n", pinfo->fd->num, ch_lookup.cid, ch_lookup.dir, ch_lookup.li_size, ch_lookup.link, ch_lookup.mode, ch_lookup.rbid, ch_lookup.urnti, ch_lookup.vci, ch_lookup.vpi, seq, num_li, offset); + g_print("packet: %d, channel (%d %d %d %d %d %d %d %d %d) seq: %u, num_li: %u, offset: %u, \n", pinfo->fd->num, ch_lookup.cid, ch_lookup.dir, ch_lookup.li_size, ch_lookup.link, ch_lookup.mode, ch_lookup.rbid, ch_lookup.urnti, ch_lookup.vci, ch_lookup.vpi, seq, num_li, offset); #endif /* look for an already assembled SDU */ if (g_hash_table_lookup_extended(reassembled_table, &frag_lookup, &orig_key, &value)) { @@ -1061,7 +1063,6 @@ get_reassembled_data(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinfo, &orig_frag, &orig_sdu)) return NULL; - frag = orig_frag; sdu = orig_sdu; if (!sdu || !sdu->data) return NULL; @@ -1465,7 +1466,6 @@ dissect_rlc_um(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, return; } pos = fpinf->cur_tb; - proto_tree_add_text(tree,tvb,0,0,"U-RNTI: %d", rlcinf->urnti[pos]); if (global_rlc_ciphered) { proto_tree_add_text(tree, tvb, 0, -1, @@ -1887,7 +1887,6 @@ dissect_rlc_am(enum rlc_channel_type channel, tvbuff_t *tvb, packet_info *pinfo, pos = fpinf->cur_tb; - proto_tree_add_text(tree,tvb,0,0,"U-RNTI e: %d", rlcinf->urnti[pos]); if (global_rlc_ciphered) { proto_tree_add_text(tree, tvb, 0, -1, "Cannot dissect RLC frame because it is ciphered"); |