Don't guard col_set_str (COL_PROTOCOL) with col_check

svn path=/trunk/; revision=29341

13 files changed, 17 insertions, 34 deletions

diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index 59cd7fa6a9..4c66770516 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -61,8 +61,7 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
   if(check_col(pinfo->cinfo, COL_RES_DL_DST))
     col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
-  if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A" );
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   if(check_col(pinfo->cinfo, COL_INFO))
     col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace" );
 
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index bac17b322b..15e18a084b 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -1490,8 +1490,7 @@ typedef struct mr_mult_req_info {
    cip_req_info_t *mr_single_req_info;
    cip_req_info_t *cip_req_info;
 
-   if( check_col( pinfo->cinfo, COL_PROTOCOL ) )
-      col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP MR" );
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP MR");
 
    /* Add Service code & Request/Response tree */
    rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " );
@@ -1849,8 +1848,7 @@ dissect_cip_cm_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item_
       }
    }
 
-   if( check_col( pinfo->cinfo, COL_PROTOCOL ) )
-      col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP CM" );
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CM");
 
    /* Add Service code & Request/Response tree */
    rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " );
@@ -2377,8 +2375,7 @@ dissect_cip_cco_data( proto_tree *item_tree, tvbuff_t *tvb, int offset, int item
    unsigned char add_stat_size;
    unsigned char i;
 
-   if( check_col( pinfo->cinfo, COL_PROTOCOL ) )
-      col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP CCO" );
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP CCO");
 
    /* Add Service code & Request/Response tree */
    rrsc_item = proto_tree_add_text( item_tree, tvb, offset, 1, "Service: " );
@@ -2758,8 +2755,7 @@ dissect_cip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    cip_req_info_t *preq_info;
 
    /* Make entries in Protocol column and Info column on summary display */
-   if( check_col( pinfo->cinfo, COL_PROTOCOL ) )
-      col_set_str( pinfo->cinfo, COL_PROTOCOL, "CIP" );
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CIP");
 
    if (check_col( pinfo->cinfo, COL_INFO ) )
       col_clear( pinfo->cinfo, COL_INFO );
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index 669b2d8648..0f3db6a012 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -58,8 +58,7 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
   if(check_col(pinfo->cinfo, COL_RES_DL_DST))
     col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
-  if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP" );
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP");
   if(check_col(pinfo->cinfo, COL_INFO))
     col_set_str(pinfo->cinfo, COL_INFO, "Classical IP frame" );
 
diff --git a/epan/dissectors/packet-cosine.c b/epan/dissectors/packet-cosine.c
index 9e8a4e7e55..c0f6cf3808 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -66,8 +66,7 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
   if(check_col(pinfo->cinfo, COL_RES_DL_DST))
     col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
-  if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A" );
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   if(check_col(pinfo->cinfo, COL_INFO))
     col_set_str(pinfo->cinfo, COL_INFO, "CoSine IPNOS L2 debug output" );
 
diff --git a/epan/dissectors/packet-ehs.c b/epan/dissectors/packet-ehs.c
index ad86a087be..84faf29210 100644
--- a/epan/dissectors/packet-ehs.c
+++ b/epan/dissectors/packet-ehs.c
@@ -1063,8 +1063,7 @@ dissect_ehs(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         int protocol;
         int year, jday, hour, minute, second, tenths;
 
-        if ( check_col(pinfo->cinfo, COL_PROTOCOL) )
-          col_set_str ( pinfo->cinfo, COL_PROTOCOL, "EHS" );
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "EHS");
         if ( check_col(pinfo->cinfo, COL_INFO) ) 
           col_set_str ( pinfo->cinfo, COL_INFO, "EHS" );
 
diff --git a/epan/dissectors/packet-enip.c b/epan/dissectors/packet-enip.c
index 710b022284..3636f40f03 100644
--- a/epan/dissectors/packet-enip.c
+++ b/epan/dissectors/packet-enip.c
@@ -1289,8 +1289,7 @@ dissect_dlr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    guint8      dlr_frametype;
 
    /* Make entries in Protocol column and Info column on summary display */
-   if( check_col( pinfo->cinfo, COL_PROTOCOL ) )
-      col_set_str( pinfo->cinfo, COL_PROTOCOL, "DLR" );
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "DLR");
 
    if (check_col( pinfo->cinfo, COL_INFO ) )
       col_clear( pinfo->cinfo, COL_INFO );
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index bb893b979b..38d426aef8 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -371,8 +371,7 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
     if(check_col(pinfo->cinfo, COL_RES_DL_DST))
       col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
-    if(check_col(pinfo->cinfo, COL_PROTOCOL))
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A" );
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
     if(check_col(pinfo->cinfo, COL_INFO))
       col_set_str(pinfo->cinfo, COL_INFO, "Null/Loopback" );
 
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index b6b248cdd9..991d3574fa 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -3729,8 +3729,7 @@ dissect_ppp_raw_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
   tvbuff_t   *ppp_tvb;
   gboolean    first = TRUE;
 
-  if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP" );
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP");
 
   if (tree) {
     ti = proto_tree_add_item(tree, proto_ppp_hdlc, tvb, 0, -1, FALSE);
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index d3e963c2cf..b705c5658b 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -111,8 +111,7 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
   if(check_col(pinfo->cinfo, COL_RES_DL_DST))
     col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
-  if(check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A" );
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   if(check_col(pinfo->cinfo, COL_INFO))
     col_set_str(pinfo->cinfo, COL_INFO, "Raw packet data" );
 
diff --git a/epan/dissectors/packet-sqloracle.c b/epan/dissectors/packet-sqloracle.c
index e3201f8d34..dfddef67b3 100644
--- a/epan/dissectors/packet-sqloracle.c
+++ b/epan/dissectors/packet-sqloracle.c
@@ -566,8 +566,7 @@ dissect_sqloracle(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
 	pinfo->current_proto = "SQLORACLE";
-	if ( check_col( pinfo->cinfo, COL_PROTOCOL ))
-		col_set_str( pinfo->cinfo, COL_PROTOCOL, "SQL" );
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "SQL");
     if (check_col(pinfo->cinfo, COL_INFO))
         col_clear(pinfo->cinfo, COL_INFO);
 
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index adf42f1649..3e7ec39634 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -5436,8 +5436,7 @@ dissect_wsp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 static void
 dissect_wsp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	if (check_col(pinfo->cinfo, COL_PROTOCOL))
-		col_set_str(pinfo->cinfo, COL_PROTOCOL, "WSP" );
+	col_set_str(pinfo->cinfo, COL_PROTOCOL, "WSP");
 	if (check_col(pinfo->cinfo, COL_INFO))
 		col_clear(pinfo->cinfo, COL_INFO);
 
diff --git a/epan/dissectors/packet-wtp.c b/epan/dissectors/packet-wtp.c
index b68ad943ae..6a2823dcba 100644
--- a/epan/dissectors/packet-wtp.c
+++ b/epan/dissectors/packet-wtp.c
@@ -785,8 +785,7 @@ dissect_wtp_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 dissect_wtp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTP+WSP" );
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTP+WSP");
     if (check_col(pinfo->cinfo, COL_INFO))
 	col_clear(pinfo->cinfo, COL_INFO);
 
@@ -805,8 +804,7 @@ dissect_wtp_fromudp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 static void
 dissect_wtp_fromwtls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WTP+WSP" );
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "WTLS+WTP+WSP");
     if (check_col(pinfo->cinfo, COL_INFO))
 	col_clear(pinfo->cinfo, COL_INFO);
 
diff --git a/plugins/unistim/packet-unistim.c b/plugins/unistim/packet-unistim.c
index 4767dbef6a..1a7799ab86 100644
--- a/plugins/unistim/packet-unistim.c
+++ b/plugins/unistim/packet-unistim.c
@@ -1543,8 +1543,7 @@ dissect_unistim(tvbuff_t *tvb,packet_info *pinfo,proto_tree *tree){
 
 
    size=tvb_length_remaining(tvb, offset);
-   if(check_col(pinfo->cinfo,COL_PROTOCOL))
-         col_set_str(pinfo->cinfo,COL_PROTOCOL,"UNISTIM");
+   col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNISTIM");
       /* Clear out stuff in the info column */
    if (check_col(pinfo->cinfo,COL_INFO)) {
          col_clear(pinfo->cinfo,COL_INFO);