* Prefer col_append_str instead of col_append_fstr for constant strings

* Remove check_col guards

svn path=/trunk/; revision=30127

6 files changed, 51 insertions, 102 deletions

diff --git a/plugins/ethercat/packet-ams.c b/plugins/ethercat/packet-ams.c
index 6ab6b85a10..ca9653ade6 100644
--- a/plugins/ethercat/packet-ams.c
+++ b/plugins/ethercat/packet-ams.c
@@ -464,8 +464,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         {          
         case ADSSRVID_READ:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Request");
 
               if( tree )
               {
@@ -487,8 +486,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_WRITE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Request");
 
               if( tree )
               {
@@ -512,8 +510,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READWRITE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Request");
 
               if( tree )
               {
@@ -540,8 +537,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READSTATE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Request");
 
               if( tree )
               {
@@ -556,8 +552,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_WRITECTRL:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Request");
 
               if( tree )
               {
@@ -581,8 +576,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READDEVICEINFO:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Request");
 
               if( tree )
               {
@@ -597,8 +591,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_ADDDEVICENOTE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Add Device Notification Request");
 
               if( tree )
               {
@@ -629,8 +622,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_DELDEVICENOTE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Request");
 
               if( tree )
               {
@@ -645,8 +637,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_DEVICENOTE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Request");
 
               if( tree )
               {
@@ -679,8 +670,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         {
         case ADSSRVID_READ:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Response");
 
               if( tree )
               {
@@ -701,8 +691,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_WRITE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Response");
 
               if( tree )
               {
@@ -717,8 +706,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READWRITE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Write Response");
 
               if( tree )
               {
@@ -739,8 +727,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READSTATE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read State Response");
 
               if( tree )
               {
@@ -761,8 +748,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_WRITECTRL:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Write Control Response");
 
               if( tree )
               {
@@ -777,8 +763,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_READDEVICEINFO:
            {
-              if (check_col(pinfo->cinfo, COL_INFO))
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Read Device Info Response");
 
               if( tree )
               {
@@ -801,8 +786,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_ADDDEVICENOTE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO))
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Device Notification Response");
 
               if( tree )
               {
@@ -820,8 +804,7 @@ static void dissect_ams(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            break;
         case ADSSRVID_DELDEVICENOTE:
            {
-              if (check_col(pinfo->cinfo, COL_INFO)) 
-                 col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response");
+              col_append_str(pinfo->cinfo, COL_INFO, "ADS Delete Device Notification Response");
 
               if( tree )
               {
diff --git a/plugins/ethercat/packet-ecatmb.c b/plugins/ethercat/packet-ecatmb.c
index 57410dec7b..13dc5072eb 100644
--- a/plugins/ethercat/packet-ecatmb.c
+++ b/plugins/ethercat/packet-ecatmb.c
@@ -601,8 +601,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
       proto_item_append_text(aparent,":CoE ");
    }
 
-   if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_str(pinfo->cinfo, COL_INFO, "CoE ");
+   col_append_str(pinfo->cinfo, COL_INFO, "CoE ");
 
    if( coe_length >= ETHERCAT_COE_HEADER_LEN )
    {
@@ -631,8 +630,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
 
             if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_HEADER_LEN )
             {
-               if (check_col(pinfo->cinfo, COL_INFO))
-                  col_append_str(pinfo->cinfo, COL_INFO, "Sdo Req - invalid length");
+               col_append_str(pinfo->cinfo, COL_INFO, "Sdo Req - invalid length");
                break;
             }
 
@@ -722,8 +720,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
             ETHERCAT_SDO_HEADER sdo;
             if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_HEADER_LEN )
             {
-               if (check_col(pinfo->cinfo, COL_INFO))
-                  col_append_str(pinfo->cinfo, COL_INFO, "Sdo Res - invalid length");
+               col_append_str(pinfo->cinfo, COL_INFO, "Sdo Res - invalid length");
                break;
             }
 
@@ -801,8 +798,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
 
             if( coe_length < ETHERCAT_COE_HEADER_LEN + ETHERCAT_SDO_INFO_LISTREQ_LEN )
             {
-               if (check_col(pinfo->cinfo, COL_INFO))
-                  col_append_str(pinfo->cinfo, COL_INFO, "Sdo Info - invalid length");
+               col_append_str(pinfo->cinfo, COL_INFO, "Sdo Info - invalid length");
                break;
             }
 
@@ -919,8 +915,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
    }
    else
    {
-      if (check_col(pinfo->cinfo, COL_INFO))
-         col_append_str(pinfo->cinfo, COL_INFO, "- invalid length");
+      col_append_str(pinfo->cinfo, COL_INFO, "- invalid length");
    }
 }
 
@@ -1010,8 +1005,7 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
    }
    else
    {
-      if (check_col(pinfo->cinfo, COL_INFO))
-         col_append_str(pinfo->cinfo, COL_INFO, "SoE - invalid length");
+      col_append_str(pinfo->cinfo, COL_INFO, "SoE - invalid length");
    }
 }
 
@@ -1192,8 +1186,7 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
    }
    else
    {
-      if (check_col(pinfo->cinfo, COL_INFO))
-         col_append_str(pinfo->cinfo, COL_INFO, "EoE - invalid length!");
+      col_append_str(pinfo->cinfo, COL_INFO, "EoE - invalid length!");
    }
 }
 
@@ -1291,8 +1284,7 @@ static void dissect_ecat_foe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
    }
    else
    {
-      if (check_col(pinfo->cinfo, COL_INFO))
-         col_append_str(pinfo->cinfo, COL_INFO, "FoE - invalid length");
+      col_append_str(pinfo->cinfo, COL_INFO, "FoE - invalid length");
    }
 }
 
@@ -1317,8 +1309,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
 
       if( mailbox_length >= ETHERCAT_MBOX_HEADER_LEN + hdr.Length )
       {
-         if (check_col(pinfo->cinfo, COL_INFO))
-            col_append_str(pinfo->cinfo, COL_INFO, " Mbx(");
+         col_append_str(pinfo->cinfo, COL_INFO, " Mbx(");
 
          if( tree )
          {
@@ -1380,8 +1371,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
             anItem = proto_tree_add_item(ecat_mailbox_tree, hf_ecat_mailboxdata, tvb, offset, hdr.Length, TRUE);
          }
 
-         if (check_col(pinfo->cinfo, COL_INFO))
-            col_append_str(pinfo->cinfo, COL_INFO, ")");
+         col_append_str(pinfo->cinfo, COL_INFO, ")");
       }
    }
 }
diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 3055a5cb92..00051184a7 100644
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -2225,8 +2225,7 @@ dissect_PNIO_status(tvbuff_t *tvb, int offset,
 
     if(u8ErrorCode == 0 && u8ErrorDecode == 0 && u8ErrorCode1 == 0 && u8ErrorCode2 == 0) {
         proto_item_append_text(sub_item, ": OK");
-        if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_str(pinfo->cinfo, COL_INFO, ", OK");
+        col_append_str(pinfo->cinfo, COL_INFO, ", OK");
     } else {
         proto_item_append_text(sub_item, ": Error: \"%s\", \"%s\", \"%s\", \"%s\"",
             val_to_str(u8ErrorCode, pn_io_error_code, "(0x%x)"),
@@ -2928,8 +2927,7 @@ dissect_Alarm_ack_block(tvbuff_t *tvb, int offset,
         return offset;
 	}
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-	    col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack");
+    col_append_str(pinfo->cinfo, COL_INFO, ", Alarm Ack");
 
     offset = dissect_Alarm_header(tvb, offset, pinfo, tree, item, drep);
 
@@ -3275,26 +3273,22 @@ dissect_ControlConnect_block(tvbuff_t *tvb, int offset,
     if(u16Command & 0x0001) {
         proto_item_append_text(sub_item, ", ParameterEnd");
         proto_item_append_text(item, " ParameterEnd");
-        if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: ParameterEnd");
+        col_append_str(pinfo->cinfo, COL_INFO, ", Command: ParameterEnd");
     }
     if(u16Command & 0x0002) {
         proto_item_append_text(sub_item, ", ApplicationReady");
         proto_item_append_text(item, " ApplicationReady");
-        if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: ApplicationReady");
+        col_append_str(pinfo->cinfo, COL_INFO, ", Command: ApplicationReady");
     }
     if(u16Command & 0x0004) {
         proto_item_append_text(sub_item, ", Release");
         proto_item_append_text(item, " Release");
-        if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: Release");
+        col_append_str(pinfo->cinfo, COL_INFO, ", Command: Release");
     }
     if(u16Command & 0x0008) {
         proto_item_append_text(sub_item, ", Done");
         proto_item_append_text(item, ", Done");
-        if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_fstr(pinfo->cinfo, COL_INFO, ", Command: Done");
+        col_append_str(pinfo->cinfo, COL_INFO, ", Command: Done");
     }
 
     proto_item_append_text(item, ", Properties:0x%x", u16Properties);
@@ -7289,23 +7283,19 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
 
     switch(u8PDUType & 0x0F) {
     case(1):    /* Data-RTA */
-    	if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA");
+    	col_append_str(pinfo->cinfo, COL_INFO, ", Data-RTA");
         offset = dissect_block(tvb, offset, pinfo, rta_tree, drep, &u16Index, &u32RecDataLen, &ar);
         break;
     case(2):    /* NACK-RTA */
-    	if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA");
+    	col_append_str(pinfo->cinfo, COL_INFO, ", NACK-RTA");
         /* no additional data */
         break;
     case(3):    /* ACK-RTA */
-    	if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA");
+    	col_append_str(pinfo->cinfo, COL_INFO, ", ACK-RTA");
         /* no additional data */
         break;
     case(4):    /* ERR-RTA */
-    	if (check_col(pinfo->cinfo, COL_INFO))
-	        col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA");
+    	col_append_str(pinfo->cinfo, COL_INFO, ", ERR-RTA");
         offset = dissect_PNIO_status(tvb, offset, pinfo, rta_tree, drep);
         break;
     default:
diff --git a/plugins/profinet/packet-pn-mrp.c b/plugins/profinet/packet-pn-mrp.c
index 2aff5279c4..48d25a2832 100644
--- a/plugins/profinet/packet-pn-mrp.c
+++ b/plugins/profinet/packet-pn-mrp.c
@@ -126,8 +126,7 @@ dissect_PNMRP_Common(tvbuff_t *tvb, int offset,
     /* MRP_DomainUUID */
     offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_mrp_domain_uuid, &uuid);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "Common");
+    col_append_str(pinfo->cinfo, COL_INFO, "Common");
 
     proto_item_append_text(item, "Common");
 
@@ -156,8 +155,7 @@ dissect_PNMRP_LinkUp(tvbuff_t *tvb, int offset,
     /* Padding */
     offset = dissect_pn_align4(tvb, offset, pinfo, tree);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "LinkUp");
+    col_append_str(pinfo->cinfo, COL_INFO, "LinkUp");
 
     proto_item_append_text(item, "LinkUp");
 
@@ -186,8 +184,7 @@ dissect_PNMRP_LinkDown(tvbuff_t *tvb, int offset,
     /* Padding */
     offset = dissect_pn_align4(tvb, offset, pinfo, tree);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "LinkDown");
+    col_append_str(pinfo->cinfo, COL_INFO, "LinkDown");
 
     proto_item_append_text(item, "LinkDown");
 
@@ -228,8 +225,7 @@ dissect_PNMRP_Test(tvbuff_t *tvb, int offset,
     /* Padding */
     offset = dissect_pn_align4(tvb, offset, pinfo, tree);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "Test");
+    col_append_str(pinfo->cinfo, COL_INFO, "Test");
 
     proto_item_append_text(item, "Test");
 
@@ -258,8 +254,7 @@ dissect_PNMRP_TopologyChange(tvbuff_t *tvb, int offset,
     /* Padding */
     /*offset = dissect_pn_align4(tvb, offset, pinfo, tree);*/
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "TopologyChange");
+    col_append_str(pinfo->cinfo, COL_INFO, "TopologyChange");
 
     proto_item_append_text(item, "TopologyChange");
 
@@ -290,15 +285,13 @@ dissect_PNMRP_Option(tvbuff_t *tvb, int offset,
         if(length != 0) {
             offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length);
         }
-        if (check_col(pinfo->cinfo, COL_INFO))
-          col_append_fstr(pinfo->cinfo, COL_INFO, "Option(Siemens)");
+        col_append_str(pinfo->cinfo, COL_INFO, "Option(Siemens)");
 		break;
 	default:
         proto_item_append_text(item, "Option(Unknown-OUI)");
         offset = dissect_pn_undecoded(tvb, offset, pinfo, tree, length);
 
-        if (check_col(pinfo->cinfo, COL_INFO))
-          col_append_fstr(pinfo->cinfo, COL_INFO, "Option");
+        col_append_str(pinfo->cinfo, COL_INFO, "Option");
     }
 
     offset += length;
@@ -337,8 +330,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset,
         offset = dissect_pn_uint8(tvb_new, offset, pinfo, tree, hf_pn_mrp_length, &length);
 
         if(i != 0) {
-            if (check_col(pinfo->cinfo, COL_INFO))
-              col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
+            col_append_str(pinfo->cinfo, COL_INFO, ", ");
 
             proto_item_append_text(item, ", ");
         }
@@ -346,8 +338,7 @@ dissect_PNMRP_PDU(tvbuff_t *tvb, int offset,
         switch(type) {
         case(0x00):
             /* no content */
-            if (check_col(pinfo->cinfo, COL_INFO))
-              col_append_fstr(pinfo->cinfo, COL_INFO, "End");
+            col_append_str(pinfo->cinfo, COL_INFO, "End");
             proto_item_append_text(item, "End");
             return offset;
             break;
diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index 8037b874dc..c5c48fdeda 100644
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -81,8 +81,7 @@ dissect_PNMRRT_Common(tvbuff_t *tvb, int offset,
     /* MRRT_DomainUUID */
     offset = dissect_pn_uuid(tvb, offset, pinfo, tree, hf_pn_mrrt_domain_uuid, &uuid);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "Common");
+    col_append_str(pinfo->cinfo, COL_INFO, "Common");
 
     proto_item_append_text(item, "Common");
 
@@ -103,8 +102,7 @@ dissect_PNMRRT_Test(tvbuff_t *tvb, int offset,
     /* Padding */
     offset = dissect_pn_align4(tvb, offset, pinfo, tree);
 
-    if (check_col(pinfo->cinfo, COL_INFO))
-      col_append_fstr(pinfo->cinfo, COL_INFO, "Test");
+    col_append_str(pinfo->cinfo, COL_INFO, "Test");
 
     proto_item_append_text(item, "Test");
 
@@ -133,8 +131,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset,
 
 
         if(i != 0) {
-            if (check_col(pinfo->cinfo, COL_INFO))
-              col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
+            col_append_str(pinfo->cinfo, COL_INFO, ", ");
 
             proto_item_append_text(item, ", ");
         }
@@ -144,8 +141,7 @@ dissect_PNMRRT_PDU(tvbuff_t *tvb, int offset,
         switch(type) {
         case(0x00):
             /* no content */
-            if (check_col(pinfo->cinfo, COL_INFO))
-              col_append_fstr(pinfo->cinfo, COL_INFO, "End");
+            col_append_str(pinfo->cinfo, COL_INFO, "End");
             proto_item_append_text(item, "End");
             return offset;
             break;
diff --git a/plugins/wimax/mac_mgmt_msg_decoder.c b/plugins/wimax/mac_mgmt_msg_decoder.c
index 1f8c137ef5..f1dcaebe6e 100644
--- a/plugins/wimax/mac_mgmt_msg_decoder.c
+++ b/plugins/wimax/mac_mgmt_msg_decoder.c
@@ -218,8 +218,7 @@ void dissect_mac_mgmt_msg_decoder(tvbuff_t *tvb, packet_info *pinfo, proto_tree
 		}
 		else
 		{
-			if (check_col(pinfo->cinfo, COL_INFO))
-				col_append_str(pinfo->cinfo, COL_INFO, "Unknown message type,");
+			col_append_str(pinfo->cinfo, COL_INFO, "Unknown message type,");
 			/* display MAC payload types */
 			message_item = proto_tree_add_protocol_format(tree, proto_mac_mgmt_msg_decoder, tvb, offset, tvb_len, "Unknown message type: %u (%u bytes)", message_type, tvb_len);
 			/* add MAC payload subtree */