diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-09 16:36:56 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2012-01-09 16:36:56 +0000 |
| commit | 2f820b8902a7955a8c0de7a50becc4f7172df97a (patch) | |
| tree | 28651810fc0d79621b5f1028d5be8c1b90aeaf5a /epan/dissectors/packet-t38.c | |
| parent | 8f34b6760b5579ed7dde127886a4576443ab4299 (diff) | |
Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10
svn path=/trunk/; revision=40412
Diffstat (limited to 'epan/dissectors/packet-t38.c')
| -rw-r--r-- | epan/dissectors/packet-t38.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 3a76d0cc7f..94082dcb63 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -698,7 +698,6 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ /* using the current ressaemble functions. */ /* TODO: reassemble all the Items in one frame */ if (primary_part && (Data_Field_item_num<2)) { - tvbuff_t* new_tvb = NULL; fragment_data *frag_msg = NULL; /* HDLC Data or t4-non-ecm-data */ @@ -725,7 +724,7 @@ dissect_t38_T_field_data(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ value_len, /* fragment length */ TRUE); /* More fragments */ - new_tvb = process_reassembled_data(tvb, offset, actx->pinfo, + process_reassembled_data(tvb, offset, actx->pinfo, "Reassembled T38", frag_msg, &data_frag_items, NULL, tree); if (!frag_msg) { /* Not last packet of reassembled */ @@ -797,7 +796,7 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 65535U, &seq_number, FALSE); -#line 227 "../../asn1/t38/t38.cnf" +#line 226 "../../asn1/t38/t38.cnf" /* info for tap */ if (primary_part) t38_info->seq_num = seq_number; @@ -811,12 +810,12 @@ dissect_t38_T_seq_number(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ static int dissect_t38_T_primary_ifp_packet(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 235 "../../asn1/t38/t38.cnf" +#line 234 "../../asn1/t38/t38.cnf" primary_part = TRUE; offset = dissect_per_open_type(tvb, offset, actx, tree, hf_index, dissect_t38_IFPPacket); -#line 237 "../../asn1/t38/t38.cnf" +#line 236 "../../asn1/t38/t38.cnf" /* if is a valid t38 packet, add to tap */ if (p_t38_packet_conv && (!actx->pinfo->flags.in_error_pkt) && ((gint32) seq_number != p_t38_packet_conv_info->last_seqnum)) tap_queue_packet(t38_tap, actx->pinfo, t38_info); @@ -910,14 +909,14 @@ static const per_choice_t T_error_recovery_choice[] = { static int dissect_t38_T_error_recovery(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 245 "../../asn1/t38/t38.cnf" +#line 244 "../../asn1/t38/t38.cnf" primary_part = FALSE; offset = dissect_per_choice(tvb, offset, actx, tree, hf_index, ett_t38_T_error_recovery, T_error_recovery_choice, NULL); -#line 247 "../../asn1/t38/t38.cnf" +#line 246 "../../asn1/t38/t38.cnf" primary_part = TRUE; return offset; @@ -933,7 +932,7 @@ static const per_sequence_t UDPTLPacket_sequence[] = { static int dissect_t38_UDPTLPacket(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 221 "../../asn1/t38/t38.cnf" +#line 220 "../../asn1/t38/t38.cnf" /* Initialize to something else than data type */ Data_Field_field_type_value = 1; |