aboutsummaryrefslogtreecommitdiffstats
path: root/asn1
diff options
context:
space:
mode:
authorKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-23 14:30:36 +0000
committerKovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>2009-09-23 14:30:36 +0000
commit99624329faf9404e969286ae665f47dfd1d626a8 (patch)
treef744e1b985106e6b12a9ec03be0038eca6bdf03e /asn1
parent7e06989ac36b2f307a1446a6355ff1799b33efce (diff)
Don't col_clear() followed by col_set_str(). A col_set_str() will clear (replace) any existing string (the fence still needs to be respected though)
svn path=/trunk/; revision=30086
Diffstat (limited to 'asn1')
-rw-r--r--asn1/ocsp/packet-ocsp-template.c4
-rw-r--r--asn1/pkixcmp/packet-cmp-template.c3
-rw-r--r--asn1/pkixtsp/packet-pkixtsp-template.c4
-rw-r--r--asn1/x509af/packet-x509af-template.c2
4 files changed, 0 insertions, 13 deletions
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index 1e743dffc1..96f27e0787 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -71,8 +71,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "Request");
}
@@ -97,8 +95,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "Response");
}
diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index 58152bf2e9..6c99a11c57 100644
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.c
@@ -125,8 +125,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
}
@@ -296,7 +294,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
}
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index 34d4a32e7d..01b5e74e05 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -67,8 +67,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "Reply");
}
@@ -92,8 +90,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "Query");
}
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index c450a636e7..5dbee96ca7 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -77,8 +77,6 @@ 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_clear(pinfo->cinfo, COL_INFO);
-
col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
}