diff options
author | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:00:21 +0000 |
---|---|---|
committer | krj <krj@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-09-24 20:00:21 +0000 |
commit | 1e66be7623925864a57d00c97b52f88708cf6b54 (patch) | |
tree | 38f6f77786d5869ee199e3e8fd80f0968be1b575 /epan/dissectors/packet-t38.c | |
parent | 8d3dd59976ca5a8851a57f28e8c7d6a0f22062e0 (diff) |
Don't guard col_append_str with check_col
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30125 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-t38.c')
-rw-r--r-- | epan/dissectors/packet-t38.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/epan/dissectors/packet-t38.c b/epan/dissectors/packet-t38.c index 8885c7ea92..4eafdfacd3 100644 --- a/epan/dissectors/packet-t38.c +++ b/epan/dissectors/packet-t38.c @@ -650,9 +650,7 @@ dissect_t38_T_field_type(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_ proto_tree_add_text(tree, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]"); } - if (check_col(actx->pinfo->cinfo, COL_INFO)){ - col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]"); actx->pinfo->fragmented = save_fragmented; } } @@ -1112,9 +1110,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) show_setup_info(tvb, tr, p_t38_packet_conv); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket "); - } + col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket "); offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr); @@ -1123,9 +1119,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); } } @@ -1157,9 +1151,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) show_setup_info(tvb, tr, p_t38_packet_conv); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket"); - } + col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket"); while(tvb_length_remaining(tvb,offset)>0) { @@ -1173,9 +1165,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_text(tr, tvb, offset, tvb_reported_length_remaining(tvb, offset), "[MALFORMED PACKET or wrong preference settings]"); } - if (check_col(pinfo->cinfo, COL_INFO)){ - col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); - } + col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]"); break; } else { |