Don't guard col_set_str (COL_RES_DL_SRC/COL_RES_DL_DST) with col_check

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@29343 f5534014-38df-0310-8fa8-9805f1628bb7

16 files changed, 56 insertions, 112 deletions

diff --git a/epan/dissectors/packet-ascend.c b/epan/dissectors/packet-ascend.c
index a55167c867..3d370edbc8 100644
--- a/epan/dissectors/packet-ascend.c
+++ b/epan/dissectors/packet-ascend.c
@@ -57,10 +57,8 @@ dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* load the top pane info. This should be overwritten by
      the next protocol in the stack */
-  if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-    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" );
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   col_set_str(pinfo->cinfo, COL_INFO, "Lucent/Ascend packet trace");
 
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index 661a20acce..181f80b5bb 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -1815,18 +1815,14 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     case 0:
       /* Traffic from DTE to DCE. */
-      if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-        col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
-      if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-        col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
       break;
 
     case 1:
       /* Traffic from DCE to DTE. */
-      if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-        col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
-      if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-        col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
       break;
     }
   }
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 4eb943e348..9202068fd2 100644
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -4204,8 +4204,7 @@ dissect_ber(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "BER");
 
-  if (check_col(pinfo->cinfo, COL_DEF_SRC))
-    col_set_str(pinfo->cinfo, COL_DEF_SRC, "BER encoded file");
+  col_set_str(pinfo->cinfo, COL_DEF_SRC, "BER encoded file");
 
   if(!decode_as_syntax) {
  
diff --git a/epan/dissectors/packet-chdlc.c b/epan/dissectors/packet-chdlc.c
index 1507305f4e..c4cfdedf89 100644
--- a/epan/dissectors/packet-chdlc.c
+++ b/epan/dissectors/packet-chdlc.c
@@ -170,24 +170,18 @@ dissect_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   switch (pinfo->p2p_dir) {
 
   case P2P_DIR_SENT:
-    if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
-    if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
     break;
 
   case P2P_DIR_RECV:
-    if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
-    if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
     break;
 
   default:
-    if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      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");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
     break;
   }
 
diff --git a/epan/dissectors/packet-clip.c b/epan/dissectors/packet-clip.c
index b338a1d250..36643406dd 100644
--- a/epan/dissectors/packet-clip.c
+++ b/epan/dissectors/packet-clip.c
@@ -54,10 +54,8 @@ dissect_clip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* load the top pane info. This should be overwritten by
      the next protocol in the stack */
-  if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-    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" );
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "CLIP");
   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 259a660fce..40772fee77 100644
--- a/epan/dissectors/packet-cosine.c
+++ b/epan/dissectors/packet-cosine.c
@@ -62,10 +62,8 @@ dissect_cosine(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* load the top pane info. This should be overwritten by
      the next protocol in the stack */
-  if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-    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" );
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   col_set_str(pinfo->cinfo, COL_INFO, "CoSine IPNOS L2 debug output");
 
diff --git a/epan/dissectors/packet-fr.c b/epan/dissectors/packet-fr.c
index 21923fd386..de5326307b 100644
--- a/epan/dissectors/packet-fr.c
+++ b/epan/dissectors/packet-fr.c
@@ -417,15 +417,11 @@ dissect_fr_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
   if (has_direction) {
     if (pinfo->pseudo_header->x25.flags & FROM_DCE) {
-      if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
-      if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
     } else {
-      if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
-      if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
     }
   }
 
diff --git a/epan/dissectors/packet-gsm_um.c b/epan/dissectors/packet-gsm_um.c
index 0788b1466d..eb995cdad3 100644
--- a/epan/dissectors/packet-gsm_um.c
+++ b/epan/dissectors/packet-gsm_um.c
@@ -120,10 +120,8 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "GSM Um");
 
 	if (pinfo->pseudo_header->gsm_um.uplink) {
-		if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-			col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS");
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-			col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS");
+		col_set_str(pinfo->cinfo, COL_RES_DL_DST, "BTS");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "MS");
 	}
 	else {
 		switch (pinfo->pseudo_header->gsm_um.channel) {
@@ -131,16 +129,13 @@ dissect_gsm_um(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			case GSM_UM_CHANNEL_CCCH:
 			case GSM_UM_CHANNEL_PCH:
 			case GSM_UM_CHANNEL_AGCH:
-				if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-				    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast");
+				col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Broadcast");
 				break;
 			default:
-				if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-				    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS");
+				col_set_str(pinfo->cinfo, COL_RES_DL_DST, "MS");
 				break;
 		}
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-		    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "BTS");
 	}
 
 	if (tree) {
diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c
index f81f90482b..7593613ef5 100644
--- a/epan/dissectors/packet-isdn.c
+++ b/epan/dissectors/packet-isdn.c
@@ -88,15 +88,11 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISDN");
 
 	if (pinfo->pseudo_header->isdn.uton) {
-		if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-			col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Network");
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-			col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "User");
+		col_set_str(pinfo->cinfo, COL_RES_DL_DST, "Network");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "User");
 	} else {
-		if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-		    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "User");
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-		    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network");
+		col_set_str(pinfo->cinfo, COL_RES_DL_DST, "User");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "Network");
 	}
 
 	pinfo->ctype = CT_ISDN;
diff --git a/epan/dissectors/packet-lapb.c b/epan/dissectors/packet-lapb.c
index 05de29a474..d0914857d3 100644
--- a/epan/dissectors/packet-lapb.c
+++ b/epan/dissectors/packet-lapb.c
@@ -79,24 +79,18 @@ dissect_lapb(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     switch (pinfo->p2p_dir) {
 
     case P2P_DIR_SENT:
-	if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
-	if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
 	break;
 
     case P2P_DIR_RECV:
-	if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
-	if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
 	break;
 
     default:
-	if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	    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");
+	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
 	break;
     }
 
diff --git a/epan/dissectors/packet-null.c b/epan/dissectors/packet-null.c
index 768dab851e..6d6c683f0f 100644
--- a/epan/dissectors/packet-null.c
+++ b/epan/dissectors/packet-null.c
@@ -367,10 +367,8 @@ dissect_null(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* load the top pane info. This should be overwritten by
        the next protocol in the stack */
-    if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      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" );
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
     col_set_str(pinfo->cinfo, COL_INFO, "Null/Loopback");
 
diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index d779a93d9a..68bb83376a 100644
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -3640,24 +3640,18 @@ dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
   switch (pinfo->p2p_dir) {
 
   case P2P_DIR_SENT:
-    if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
-    if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
     break;
 
   case P2P_DIR_RECV:
-    if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
-    if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-      col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
     break;
 
   default:
-    if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-      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");
+    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
     break;
   }
 
diff --git a/epan/dissectors/packet-raw.c b/epan/dissectors/packet-raw.c
index 0da4a2f124..6280977c5e 100644
--- a/epan/dissectors/packet-raw.c
+++ b/epan/dissectors/packet-raw.c
@@ -107,10 +107,8 @@ dissect_raw(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
   /* load the top pane info. This should be overwritten by
      the next protocol in the stack */
-  if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-    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" );
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "N/A");
   col_set_str(pinfo->cinfo, COL_INFO, "Raw packet data");
 
diff --git a/epan/dissectors/packet-sdlc.c b/epan/dissectors/packet-sdlc.c
index ef682abb5c..33af1b5732 100644
--- a/epan/dissectors/packet-sdlc.c
+++ b/epan/dissectors/packet-sdlc.c
@@ -94,18 +94,14 @@ dissect_sdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	 */
 	if (pinfo->p2p_dir == P2P_DIR_SENT) {
 		is_response = FALSE;
-		if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-			col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-			col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+		col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
 	}
 	else {
 		/* XXX - what if the direction is unknown? */
 		is_response = TRUE;
-		if (check_col(pinfo->cinfo, COL_RES_DL_DST))
-		    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
-		if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-		    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+		col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+		col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
 	}
 
 	if (tree) {
diff --git a/epan/dissectors/packet-v120.c b/epan/dissectors/packet-v120.c
index 197eccf97c..9e051687e2 100644
--- a/epan/dissectors/packet-v120.c
+++ b/epan/dissectors/packet-v120.c
@@ -122,17 +122,13 @@ dissect_v120(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     if (pinfo->p2p_dir == P2P_DIR_SENT) {
 	is_response = (byte0 & 0x02) ? FALSE: TRUE;
-	if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
-	if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
     } else {
 	/* XXX - what if the direction is unknown? */
 	is_response = (byte0 & 0x02) ? TRUE : FALSE;
-	if(check_col(pinfo->cinfo, COL_RES_DL_DST))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
-	if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
-	    col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+	col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
     }
 
     if (tree) {
diff --git a/epan/dissectors/packet-wfleet-hdlc.c b/epan/dissectors/packet-wfleet-hdlc.c
index fe432f54fd..54a3a9e76a 100644
--- a/epan/dissectors/packet-wfleet-hdlc.c
+++ b/epan/dissectors/packet-wfleet-hdlc.c
@@ -56,10 +56,8 @@ dissect_wfleet_hdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint8     addr;
   guint8     cmd;
 
-  if (check_col(pinfo->cinfo, COL_RES_DL_SRC))
-    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");
+  col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+  col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
   col_set_str(pinfo->cinfo, COL_PROTOCOL, "WHDLC");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);