Don't guard col_set_str (COL_PROTOCOL) with col_check

svn path=/trunk/; revision=29340

1 files changed, 12 insertions, 24 deletions

diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c
index a3459ac143..5476888a33 100644
--- a/epan/dissectors/packet-juniper.c
+++ b/epan/dissectors/packet-juniper.c
@@ -698,8 +698,7 @@ dissect_juniper_mlfr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16    mlpic_cookie;
   guint      proto,cookie_len;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLFR");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -804,8 +803,7 @@ dissect_juniper_mlppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   guint16    mlpic_cookie;
   guint      proto,cookie_len;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper MLPPP");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -873,8 +871,7 @@ dissect_juniper_pppoe(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPPoE");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -903,8 +900,7 @@ dissect_juniper_ether(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Ethernet");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -933,8 +929,7 @@ dissect_juniper_ppp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper PPP");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -963,8 +958,7 @@ dissect_juniper_frelay(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Frame-Relay");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -993,8 +987,7 @@ dissect_juniper_chdlc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper C-HDLC");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -1042,16 +1035,13 @@ dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16
 
   switch (atm_pictype) {
   case JUNIPER_PIC_ATM1:
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM1");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM1");
     break;
   case JUNIPER_PIC_ATM2:
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM2");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM2");
     break;
   default: /* should not happen */
-    if (check_col(pinfo->cinfo, COL_PROTOCOL))
-      col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM unknown");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM unknown");
     return;
 
   }
@@ -1192,8 +1182,7 @@ static void dissect_juniper_ggsn(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
   guint8     flags;
   guint16    proto;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper GGSN");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);
     
@@ -1224,8 +1213,7 @@ static void dissect_juniper_vp(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tr
   int        bytes_processed;
   guint8     flags;
 
-  if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC");
+  col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper Voice PIC");
   if (check_col(pinfo->cinfo, COL_INFO))
     col_clear(pinfo->cinfo, COL_INFO);