Remove check_col() guard

svn path=/trunk/; revision=30124

8 files changed, 7 insertions, 31 deletions

diff --git a/plugins/docsis/packet-dccack.c b/plugins/docsis/packet-dccack.c
index c67089d175..278fa87e50 100644
--- a/plugins/docsis/packet-dccack.c
+++ b/plugins/docsis/packet-dccack.c
@@ -55,10 +55,7 @@ dissect_dccack (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-ACK Message: ");
 
   if (tree)
     {
diff --git a/plugins/docsis/packet-dccreq.c b/plugins/docsis/packet-dccreq.c
index 9e2166b0bd..ba88ed41f3 100644
--- a/plugins/docsis/packet-dccreq.c
+++ b/plugins/docsis/packet-dccreq.c
@@ -265,10 +265,7 @@ dissect_dccreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-REQ Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-REQ Message: ");
 
   if (tree)
     {
diff --git a/plugins/docsis/packet-dccrsp.c b/plugins/docsis/packet-dccrsp.c
index a0e40cde2b..07bbf4056b 100644
--- a/plugins/docsis/packet-dccrsp.c
+++ b/plugins/docsis/packet-dccrsp.c
@@ -111,10 +111,7 @@ dissect_dccrsp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCC-RSP Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCC-RSP Message: ");
 
   if (tree)
     {
diff --git a/plugins/docsis/packet-dcd.c b/plugins/docsis/packet-dcd.c
index ad29064987..987dd026c7 100644
--- a/plugins/docsis/packet-dcd.c
+++ b/plugins/docsis/packet-dcd.c
@@ -513,10 +513,7 @@ dissect_dcd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 
   len = tvb_length_remaining (tvb, 0);
 
-  if (check_col (pinfo->cinfo, COL_INFO))
-    {
-      col_set_str(pinfo->cinfo, COL_INFO, "DCD Message: ");
-    }
+  col_set_str(pinfo->cinfo, COL_INFO, "DCD Message: ");
 
   if (tree)
     {
diff --git a/plugins/docsis/packet-mdd.c b/plugins/docsis/packet-mdd.c
index 1759d078d2..d802fab599 100644
--- a/plugins/docsis/packet-mdd.c
+++ b/plugins/docsis/packet-mdd.c
@@ -322,10 +322,7 @@ dissect_mdd (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	
 	len = tvb_reported_length_remaining (tvb, 0);
 
-	if (check_col (pinfo->cinfo, COL_INFO))
-	{
-		col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:");
-    }
+	col_set_str(pinfo->cinfo, COL_INFO, "MDD Message:");
 
 	if (tree)
 	{
diff --git a/plugins/docsis/packet-regreqmp.c b/plugins/docsis/packet-regreqmp.c
index d801a0a563..d3a776a5c2 100644
--- a/plugins/docsis/packet-regreqmp.c
+++ b/plugins/docsis/packet-regreqmp.c
@@ -55,10 +55,7 @@ dissect_regreqmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	proto_tree *regreqmp_tree;
 	tvbuff_t *next_tvb;
 
-	if (check_col (pinfo->cinfo, COL_INFO))
-		{
-		col_set_str(pinfo->cinfo, COL_INFO, "REG-REQ-MP Message:");
-		}
+	col_set_str(pinfo->cinfo, COL_INFO, "REG-REQ-MP Message:");
 
 		if (tree)
 		{
diff --git a/plugins/docsis/packet-regrspmp.c b/plugins/docsis/packet-regrspmp.c
index 5f63bc01f8..92975ccfd2 100644
--- a/plugins/docsis/packet-regrspmp.c
+++ b/plugins/docsis/packet-regrspmp.c
@@ -60,10 +60,7 @@ dissect_regrspmp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	
 	
 	
-	if (check_col (pinfo->cinfo, COL_INFO))
-		{
-		col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:");
-		}
+	col_set_str(pinfo->cinfo, COL_INFO, "REG-RSP-MP Message:");
 	
 		if (tree)
 		{
diff --git a/plugins/docsis/packet-sync.c b/plugins/docsis/packet-sync.c
index f6c3f3f771..a0bfc316c5 100644
--- a/plugins/docsis/packet-sync.c
+++ b/plugins/docsis/packet-sync.c
@@ -45,10 +45,7 @@ dissect_sync (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
 	proto_item *it;
 	proto_tree *sync_tree;
 
-	if (check_col (pinfo->cinfo, COL_INFO))
-	{
 	col_set_str(pinfo->cinfo, COL_INFO, "Sync Message:");
-	}
 
 	if (tree)
 	{