Get rid of check_col, while at it set ENC.

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

10 files changed, 69 insertions, 155 deletions

diff --git a/asn1/q932/packet-q932-template.c b/asn1/q932/packet-q932-template.c
index 67340a0e4e..5fc1f87662 100644
--- a/asn1/q932/packet-q932-template.c
+++ b/asn1/q932/packet-q932-template.c
@@ -134,7 +134,7 @@ dissect_q932_facility_ie(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr
   tvbuff_t *next_tvb;
 
   ie_end = offset + length;
-  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, FALSE);
+  proto_tree_add_item(tree, hf_q932_pp, tvb, offset, 1, ENC_BIG_ENDIAN);
   offset++;
   while (offset < ie_end) {
     hoffset = offset;
@@ -235,7 +235,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   offset = 0;
 
-  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, FALSE);
+  ti = proto_tree_add_item(tree, proto_q932, tvb, offset, -1, ENC_NA);
   PROTO_ITEM_SET_HIDDEN(ti);
 
   ie_type = tvb_get_guint8(tvb, offset);
@@ -244,8 +244,8 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
   ti_ie = proto_tree_add_text(tree, tvb, offset, -1, "%s",
             val_to_str(ie_type, VALS(q932_str_ie_type), "unknown (0x%02X)"));
   ie_tree = proto_item_add_subtree(ti_ie, ett_q932_ie); 
-  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, FALSE);
-  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, FALSE);
+  proto_tree_add_item(ie_tree, hf_q932_ie_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+  proto_tree_add_item(ie_tree, hf_q932_ie_len, tvb, offset + 1, 1, ENC_BIG_ENDIAN);
   offset += 2;
   if (tvb_length_remaining(tvb, offset) <= 0)
     return;
@@ -258,7 +258,7 @@ dissect_q932_ie(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
       break;
     default:
       if (ie_len > 0) {
-        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, FALSE);
+        if (tree) proto_tree_add_item(ie_tree, hf_q932_ie_data, tvb, offset, ie_len, ENC_NA);
       }
   }
 }
diff --git a/asn1/rnsap/packet-rnsap-template.c b/asn1/rnsap/packet-rnsap-template.c
index ee34f4f5e6..62cddff8ac 100644
--- a/asn1/rnsap/packet-rnsap-template.c
+++ b/asn1/rnsap/packet-rnsap-template.c
@@ -123,7 +123,7 @@ dissect_rnsap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	col_set_str(pinfo->cinfo, COL_PROTOCOL, "RNSAP");
 
 	/* create the rnsap protocol tree */
-	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, FALSE);
+	rnsap_item = proto_tree_add_item(tree, proto_rnsap, tvb, 0, -1, ENC_NA);
 	rnsap_tree = proto_item_add_subtree(rnsap_item, ett_rnsap);
 	
 	dissect_RNSAP_PDU_PDU(tvb, pinfo, rnsap_tree);
diff --git a/asn1/rnsap/rnsap.cnf b/asn1/rnsap/rnsap.cnf
index 16f842ac1f..4447dc1ccc 100644
--- a/asn1/rnsap/rnsap.cnf
+++ b/asn1/rnsap/rnsap.cnf
@@ -74,10 +74,9 @@ ProtocolIE-ContainerPairList
 
 #.FN_PARS  ProcedureCode  VAL_PTR = &ProcedureCode
 #.FN_FTR ProcedureCode
-	if (check_col(actx->pinfo->cinfo, COL_INFO))
-       col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
-                   val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
-                              "unknown message"));
+   col_add_fstr(actx->pinfo->cinfo, COL_INFO, "%s ",
+                val_to_str_ext_const(ProcedureCode, &rnsap_ProcedureCode_vals_ext,
+                           "unknown message"));
 #.END
 #.FN_PARS ProcedureID/ddMode VAL_PTR = &ddMode
 
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index d6a3577bcd..b9561b3c4c 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -98,7 +98,7 @@ RTABapdu
   offset = dissect_ber_integer(TRUE, actx, tree, tvb, offset, hf_index, &app_proto);
 
 #.FN_BODY SessionConnectionIdentifier
-  if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request)
     col_append_str(actx->pinfo->cinfo, COL_INFO, "Recover");
   %(DEFAULT_BODY)s
 
@@ -107,7 +107,7 @@ RTABapdu
 #.FN_BODY CallingSSuserReference/t61String  VAL_PTR=&string
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.FN_PARS CommonReference
@@ -115,7 +115,7 @@ RTABapdu
 #.FN_BODY CommonReference
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.END
@@ -123,7 +123,7 @@ RTABapdu
 #.FN_BODY CallingSSuserReference/octetString  VAL_PTR=&string
   tvbuff_t *string = NULL;
   %(DEFAULT_BODY)s
-  if(open_request && string && check_col(actx->pinfo->cinfo, COL_INFO))
+  if(open_request && string)
     col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", tvb_format_text(string, 0, tvb_length(string)));
 
 #.FN_BODY RTTPapdu  VAL_PTR=&priority
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 6878a3ec26..ed91180cd4 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -381,8 +381,7 @@ force_reassemble_seq(packet_info *pinfo, guint32 id,
 	fd_head->flags |= FD_DEFRAGMENTED;
 	fd_head->reassembled_in=pinfo->fd->num;
 
-	if (check_col(pinfo->cinfo, COL_INFO))
-			col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
+	col_append_fstr(pinfo->cinfo, COL_INFO, " (t4-data Reassembled: %d pack lost, %d pack burst lost)", packet_lost, burst_lost);
 	
 	p_t38_packet_conv_info->packet_lost = packet_lost;
 	p_t38_packet_conv_info->burst_lost = burst_lost;
@@ -590,11 +589,8 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				}
 				col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
 				break;
-			} 
-			else {
-				if (check_col(pinfo->cinfo, COL_INFO)){
-					col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
-				}
+			}else {
+				col_append_fstr(pinfo->cinfo, COL_INFO, " IFPPacket#%u",ifp_packet_number);
 			}
 		}
 	}
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
index 80f9f4a96a..ae82680e38 100644
--- a/asn1/t38/t38.cnf
+++ b/asn1/t38/t38.cnf
@@ -28,7 +28,7 @@ UDPTLPacket
 
 #.FN_PARS Type-of-msg/t30-indicator  VAL_PTR=&T30ind_value
 #.FN_FTR Type-of-msg/t30-indicator
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " t30ind: %s",
          val_to_str(T30ind_value,t38_T30_indicator_vals,"<unknown>"));
     }
@@ -40,7 +40,7 @@ UDPTLPacket
 
 #.FN_PARS Type-of-msg/t30-data  VAL_PTR=&Data_value
 #.FN_FTR Type-of-msg/t30-data
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " data:%s:",
          val_to_str(Data_value,t38_T30_data_vals,"<unknown>"));
     }
@@ -60,7 +60,7 @@ EXT=(use_pre_corrigendum_asn1_specification)?FALSE:TRUE
 EXT_NUM=(use_pre_corrigendum_asn1_specification)?0:4
 VAL_PTR=&Data_Field_field_type_value
 #.FN_FTR Data-Field/_item/field-type
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s",
          val_to_str(Data_Field_field_type_value,t38_T_field_type_vals,"<unknown>"));
     }
@@ -156,7 +156,7 @@ VAL_PTR=&Data_Field_field_type_value
     value_len = tvb_length(value_tvb);
 
 #.FN_FTR Data-Field/_item/field-data
-    if (check_col(actx->pinfo->cinfo, COL_INFO) && primary_part){
+    if (primary_part){
         if(value_len < 8){
             col_append_fstr(actx->pinfo->cinfo, COL_INFO, "[%s]",
                tvb_bytes_to_str(value_tvb,0,value_len));
@@ -204,11 +204,9 @@ VAL_PTR=&Data_Field_field_type_value
 
             if (!frag_msg) { /* Not last packet of reassembled */
                 if (Data_Field_field_type_value == 0) {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (HDLC fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 } else {
-                    if (check_col(actx->pinfo->cinfo, COL_INFO))
-                        col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
+                    col_append_fstr(actx->pinfo->cinfo, COL_INFO," (t4-data fragment %u)", seq_number - (guint32)p_t38_packet_conv_info->reass_start_seqnum);
                 }
             }
 
@@ -230,9 +228,7 @@ VAL_PTR=&Data_Field_field_type_value
     if (primary_part)
         t38_info->seq_num = seq_number;
 
-      if (check_col(actx->pinfo->cinfo, COL_INFO)){
-        col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
-    }
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Seq=%05u ",seq_number);
 #.END
 
 #.FN_HDR UDPTLPacket/primary-ifp-packet
diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c
index 673cf092f5..5034d15d1a 100644
--- a/asn1/tcap/packet-tcap-template.c
+++ b/asn1/tcap/packet-tcap-template.c
@@ -204,7 +204,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
     /* create display subtree for the protocol */
     if(parent_tree){
-      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, FALSE);
+      item = proto_tree_add_item(parent_tree, proto_tcap, tvb, 0, -1, ENC_NA);
       tree = proto_item_add_subtree(item, ett_tcap);
       tcap_stat_tree=tree;
     }
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index d0d39c28e0..74b9f06ccd 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -141,7 +141,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "otid(");
 	   	for(i=0;i<len;i++)
         		  col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
@@ -180,7 +180,7 @@ if (parameter_tvb){
 		break;
 	}
 
-	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
+	if (len){
 		col_append_str(actx->pinfo->cinfo, COL_INFO, "dtid(");
 		for(i=0;i<len;i++)
           		col_append_fstr(actx->pinfo->cinfo, COL_INFO, "%%02x",tvb_get_guint8(parameter_tvb,i));
@@ -197,30 +197,26 @@ gp_tcapsrt_info->ope=TC_BEGIN;
  *  If there's something there that should not be overwritten, whoever
  *  put that info there should call col_set_fence() to protect it.
  */
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
 #.END
 
 
 #.FN_HDR End
 gp_tcapsrt_info->ope=TC_END;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
 #.END
 
 
 #.FN_HDR Continue
 gp_tcapsrt_info->ope=TC_CONT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
 #.END
 
 
 #.FN_HDR Abort
 gp_tcapsrt_info->ope=TC_ABORT;
 
-if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+	col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 #.END
diff --git a/asn1/tetra/packet-tetra-template.c b/asn1/tetra/packet-tetra-template.c
index 0fde816511..ff04cbed83 100644
--- a/asn1/tetra/packet-tetra-template.c
+++ b/asn1/tetra/packet-tetra-template.c
@@ -223,7 +223,7 @@ void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *tre
 	guint8 p;
 
 	tetra_sub_item = proto_tree_add_item(tree, hf_tetra_pdu,
-					     pdu, 0, tvb_length(pdu), FALSE);
+					     pdu, 0, tvb_length(pdu), ENC_NA);
 
 	tetra_sub_tree = proto_item_add_subtree(tetra_sub_item, ett_tetra);
 
@@ -484,7 +484,7 @@ dissect_tetra(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		guint32 txtimer = 0;
 		guint32 tslot = 0;
 
-		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, FALSE);
+		tetra_item = proto_tree_add_item(tree, proto_tetra, tvb, 0, -1, ENC_NA);
 		tetra_tree = proto_item_add_subtree(tetra_item, ett_tetra);
 		tetra_header_tree = proto_item_add_subtree(tetra_item, ett_tetra);
 
diff --git a/asn1/tetra/tetra.cnf b/asn1/tetra/tetra.cnf
index c79d8bc8a4..9cf757bc30 100644
--- a/asn1/tetra/tetra.cnf
+++ b/asn1/tetra/tetra.cnf
@@ -68,267 +68,194 @@ BNCH
 
 #.FN_BODY U-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
 #.END
 
 #.FN_BODY D-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
 #.END
 
 
 
 #.FN_BODY D-CALL-PROCEEDING
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-PROCEEDING");
 #.END
 
 #.FN_BODY D-SETUP
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SETUP");
 #.END
 
 
 #.FN_BODY U-LOCATION-UPDATE-DEMAND
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-LOCATION-UPDATE-DEMAND");
 #.END
 
 
 #.FN_BODY D-LOCATION-UPDATE-ACCEPT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-ACCEPT");
 #.END
 
 
 #.FN_BODY D-CONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT");
 #.END
 
 #.FN_BODY D-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-RELEASE");
 #.END
 
 #.FN_BODY D-CONNECT-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CONNECT-ACK");
 #.END
 
 #.FN_BODY D-INFO
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-INFO");
 #.END
 
 #.FN_BODY D-DISCONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-DISCONNECT");
 #.END
 
 #.FN_BODY D-ALERT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-ALERT");
 #.END
 
 #.FN_BODY D-TX-CEASED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CEASED");
 #.END
 
 
 #.FN_BODY D-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-STATUS");
 #.END
 
 #.FN_BODY D-TX-CONTINUE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-CONTINUE");
 #.END
 
 #.FN_BODY D-TX-GRANTED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-GRANTED");
+
 #.END
 
 #.FN_BODY D-TX-WAIT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
 #.END
 
 #.FN_BODY D-CALL-RESTORE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-CALL-RESTORE");
 #.END
 
 #.FN_BODY D-SDS-DATA
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-SDS-DATA");
 #.END
 
 #.FN_BODY D-TX-WAIT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-TX-WAIT");
 #.END
 
 
 #.FN_BODY U-ALERT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ALERT");
 #.END
 
 #.FN_BODY U-CONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CONNECT");
 #.END
 
 #.FN_BODY U-DISCONNECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-DISCONNECT");
 #.END
 
 #.FN_BODY U-RELEASE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-RELEASE");
 #.END
 
 #.FN_BODY U-SETUP
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SETUP");
 #.END
 
 #.FN_BODY U-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-STATUS");
 #.END
 
 #.FN_BODY U-SDS-DATA
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-SDS-DATA");
 #.END
 
 #.FN_BODY U-CALL-RESTORE
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-CALL-RESTORE");
 #.END
 
 #.FN_BODY U-TX-DEMAND
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-DEMAND");
 #.END
 
 #.FN_BODY U-TX-CEASED
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-TX-CEASED");
 #.END
 
 
 #.FN_BODY U-MM-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 #.END
 
 #.FN_BODY D-MM-STATUS
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-MM-STATUS");
 #.END
 
 #.FN_BODY U-ATTACH-DETACH-GROUP-IDENTITY
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 #.END
 
 #.FN_BODY U-ATTACH-DETACH-GROUP-IDENTITY-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
 #.END
 
 #.FN_BODY D-LOCATION-UPDATE-REJECT
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
 		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "D-LOCATION-UPDATE-REJECT");
-	}
 #.END
 
 #.FN_BODY D-ATTACH-DETACH-GROUP-IDENTITY
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
-	}
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY");
 #.END
 
 #.FN_BODY D-ATTACH-DETACH-GROUP-IDENTITY-ACK
 %(DEFAULT_BODY)s
-	if (check_col(actx->pinfo->cinfo, COL_INFO)){
-		col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
-	}
-#.END
\ No newline at end of file
+	col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "U-ATTACH-DETACH-GROUP-IDENTITY-ACK");
+#.END