Don't guard col_clear with col_check

svn path=/trunk/; revision=29344

9 files changed, 9 insertions, 18 deletions

diff --git a/plugins/asn1/packet-asn1.c b/plugins/asn1/packet-asn1.c
index 1ed411a457..06d9ef2514 100644
--- a/plugins/asn1/packet-asn1.c
+++ b/plugins/asn1/packet-asn1.c
@@ -737,8 +737,7 @@ dissect_asn1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
     col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "ASN.1 %s", current_pduname);
   }
 
-  if(check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   offstr[0] = 0;
diff --git a/plugins/docsis/packet-macmgmt.c b/plugins/docsis/packet-macmgmt.c
index c8afcb42ba..e2ebff7d6b 100644
--- a/plugins/docsis/packet-macmgmt.c
+++ b/plugins/docsis/packet-macmgmt.c
@@ -135,8 +135,7 @@ dissect_macmgmt (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   guint8 type;
   col_set_str (pinfo->cinfo, COL_PROTOCOL, "DOCSIS MGMT");
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    col_clear (pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
 
   src = tvb_get_ptr (tvb, 6, 6);
diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 44b8814c10..82076d3c31 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -396,8 +396,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "AMS");
 
-   if (check_col(pinfo->cinfo, COL_INFO)) 
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    if( pinfo->ethertype != 0x88a4 )
    {
diff --git a/plugins/ethercat/packet-ethercat-datagram.c b/plugins/ethercat/packet-ethercat-datagram.c
index 02ec0a28cc..faa191b1de 100644
--- a/plugins/ethercat/packet-ethercat-datagram.c
+++ b/plugins/ethercat/packet-ethercat-datagram.c
@@ -464,8 +464,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ECAT");
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
    /* If the data portion of an EtherCAT datagram is less than 44 bytes, then
       it must have been padded with an additional n number of bytes to reach a
diff --git a/plugins/ethercat/packet-ioraw.c b/plugins/ethercat/packet-ioraw.c
index 780451181e..ce23661111 100644
--- a/plugins/ethercat/packet-ioraw.c
+++ b/plugins/ethercat/packet-ioraw.c
@@ -71,8 +71,7 @@ static void dissect_ioraw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "IO-RAW");
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
 
       
    IoRawSummaryFormater(szText, nMax);
diff --git a/plugins/ethercat/packet-nv.c b/plugins/ethercat/packet-nv.c
index 2bd6fed5f7..350fc2d17c 100644
--- a/plugins/ethercat/packet-nv.c
+++ b/plugins/ethercat/packet-nv.c
@@ -112,8 +112,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
  
    col_set_str(pinfo->cinfo, COL_PROTOCOL, "TC-NV");
 
-   if (check_col(pinfo->cinfo, COL_INFO)) 
-      col_clear(pinfo->cinfo, COL_INFO);
+   col_clear(pinfo->cinfo, COL_INFO);
    
    NvSummaryFormater(tvb, offset, szText, nMax);
    if (check_col(pinfo->cinfo, COL_INFO)) 
diff --git a/plugins/gryphon/packet-gryphon.c b/plugins/gryphon/packet-gryphon.c
index 6152c674f4..935ba3b1a5 100644
--- a/plugins/gryphon/packet-gryphon.c
+++ b/plugins/gryphon/packet-gryphon.c
@@ -211,8 +211,7 @@ dissect_gryphon_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     if (!is_msgresp_add) {
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "Gryphon");
-	if (check_col(pinfo->cinfo, COL_INFO))
-	    col_clear(pinfo->cinfo, COL_INFO);
+	col_clear(pinfo->cinfo, COL_INFO);
     }
 
     if (!is_msgresp_add) {
diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 9698051366..6361383426 100644
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -1726,8 +1726,7 @@ static void dissect_irlap(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root)
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "IrLAP");
 
     /* Clear Info column */
-    if (check_col(pinfo->cinfo, COL_INFO))
-        col_clear(pinfo->cinfo, COL_INFO);
+    col_clear(pinfo->cinfo, COL_INFO);
 
     /* set direction column */
     if (check_col(pinfo->cinfo, COL_IF_DIR))
diff --git a/plugins/sercosiii/packet-sercosiii_1v1.c b/plugins/sercosiii/packet-sercosiii_1v1.c
index df2a9534f9..f0af8afa82 100644
--- a/plugins/sercosiii/packet-sercosiii_1v1.c
+++ b/plugins/sercosiii/packet-sercosiii_1v1.c
@@ -57,8 +57,7 @@ dissect_siii(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* setup columns */
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "SERCOS III V1.1");
-  if(check_col(pinfo->cinfo, COL_INFO))
-    col_clear(pinfo->cinfo, COL_INFO);
+  col_clear(pinfo->cinfo, COL_INFO);
 
   /* check what we got on our hand */
   type = tvb_get_guint8(tvb, 0);