diff options
| author | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 19:50:43 +0000 |
|---|---|---|
| committer | Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com> | 2009-09-24 19:50:43 +0000 |
| commit | cf8138e19504c72fb7874708442cffe1e84a145f (patch) | |
| tree | 0083ccd6d10e85a85ef9e7138089163c7ddd5b56 /asn1 | |
| parent | bc67c2575998f02183def34959f85a970690b99a (diff) | |
Remove check_col() guard
svn path=/trunk/; revision=30124
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/ocsp/packet-ocsp-template.c | 8 | ||||
| -rw-r--r-- | asn1/pkixcmp/packet-cmp-template.c | 8 | ||||
| -rw-r--r-- | asn1/pkixtsp/packet-pkixtsp-template.c | 8 | ||||
| -rw-r--r-- | asn1/x509af/packet-x509af-template.c | 4 |
4 files changed, 7 insertions, 21 deletions
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c index 96f27e0787..f18836ba18 100644 --- a/asn1/ocsp/packet-ocsp-template.c +++ b/asn1/ocsp/packet-ocsp-template.c @@ -70,9 +70,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Request"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Request"); if(parent_tree){ @@ -94,9 +92,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree col_set_str(pinfo->cinfo, COL_PROTOCOL, "OCSP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Response"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Response"); if(parent_tree){ diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c index 6c99a11c57..1fa3a5f922 100644 --- a/asn1/pkixcmp/packet-cmp-template.c +++ b/asn1/pkixcmp/packet-cmp-template.c @@ -124,9 +124,7 @@ static int dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *pa col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); - } + col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); if(parent_tree){ item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE); @@ -293,9 +291,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "CMP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); - } + col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP"); if(parent_tree){ item=proto_tree_add_item(parent_tree, proto_cmp, tvb, 0, -1, FALSE); diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c index 01b5e74e05..b9f51378bc 100644 --- a/asn1/pkixtsp/packet-pkixtsp-template.c +++ b/asn1/pkixtsp/packet-pkixtsp-template.c @@ -66,9 +66,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Reply"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Reply"); if(parent_tree){ @@ -89,9 +87,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIXTSP"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Query"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Query"); if(parent_tree){ diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c index 5dbee96ca7..08e01aff8c 100644 --- a/asn1/x509af/packet-x509af-template.c +++ b/asn1/x509af/packet-x509af-template.c @@ -76,9 +76,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) col_set_str(pinfo->cinfo, COL_PROTOCOL, "PKIX-CRL"); - if (check_col(pinfo->cinfo, COL_INFO)) { - col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List"); - } + col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List"); if(parent_tree){ |