diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:00:21 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 20:00:21 +0000 |
| commit | 65c53fedb6c2a23295d280d8971f03c05343dc7d (patch) | |
| tree | 38f6f77786d5869ee199e3e8fd80f0968be1b575 /asn1/t38 | |
| parent | cf8138e19504c72fb7874708442cffe1e84a145f (diff) | |
Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
Diffstat (limited to 'asn1/t38')
| -rw-r--r-- | asn1/t38/packet-t38-template.c | 16 | ||||
| -rw-r--r-- | asn1/t38/t38.cnf | 4 |
2 files changed, 5 insertions, 15 deletions
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c index 5916b7fd22..e7befe26b1 100644 --- a/asn1/t38/packet-t38-template.c +++ b/asn1/t38/packet-t38-template.c @@ -531,9 +531,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); @@ -542,9 +540,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?]"); } } @@ -576,9 +572,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) { @@ -592,9 +586,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 { diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf index 9e4bf2bae5..273e8b5c8c 100644 --- a/asn1/t38/t38.cnf +++ b/asn1/t38/t38.cnf @@ -135,9 +135,7 @@ VAL_PTR=&Data_Field_field_type_value 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; } } |