* Prefer col_append_str instead of col_append_fstr for constant strings

* Remove check_col guards

svn path=/trunk/; revision=30127

2 files changed, 27 insertions, 54 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, ")");
       }
    }
 }