Apply the small performance enhancment patches for:

- if offset is 0, tvb_length is the same as tvb_length_remaining, just faster.
Replace 
- col_append_fstr() with faster  col_append_str() 
- col_add_str() with col_set_str()
when it's safe

svn path=/trunk/; revision=23252

24 files changed, 50 insertions, 51 deletions

diff --git a/asn1/camel/camel.cnf b/asn1/camel/camel.cnf
index 9ee0af45ac..ed4b3c9a0e 100644
--- a/asn1/camel/camel.cnf
+++ b/asn1/camel/camel.cnf
@@ -199,14 +199,14 @@ static const camel_err_t camel_err_tab[] = {
 	if (camel_opcode_type == CAMEL_OPCODE_RETURN_ERROR){
 	  errorCode = opcode;	
 	  if (check_col(actx->pinfo->cinfo, COL_INFO)){
-	    col_append_fstr(actx->pinfo->cinfo, COL_INFO, 
+	    col_append_str(actx->pinfo->cinfo, COL_INFO, 
 	       val_to_str(errorCode, camel_err_code_string_vals, "Unknown CAMEL error (%%u)"));
 	    col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
 	    col_set_fence(actx->pinfo->cinfo, COL_INFO);
 	  }
 	}else{
 	  if (check_col(actx->pinfo->cinfo, COL_INFO)){
-	    col_append_fstr(actx->pinfo->cinfo, COL_INFO, 
+	    col_append_str(actx->pinfo->cinfo, COL_INFO, 
 	       val_to_str(opcode, camel_opr_code_strings, "Unknown CAMEL (%%u)"));
 	    col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
 	    col_set_fence(actx->pinfo->cinfo, COL_INFO);
diff --git a/asn1/camel/packet-camel-template.c b/asn1/camel/packet-camel-template.c
index 945c7dba41..7cf3303d27 100644
--- a/asn1/camel/packet-camel-template.c
+++ b/asn1/camel/packet-camel-template.c
@@ -339,7 +339,7 @@ dissect_camel_camelPDU(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, asn
   if (check_col(actx->pinfo->cinfo, COL_INFO)){
     /* Populate the info column with PDU type*/
     col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camel_Component_vals, "Unknown Camel (%u)"));
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " ");
+    col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
   }
 
   is_ExtensionField =FALSE;
diff --git a/asn1/cdt/cdt.cnf b/asn1/cdt/cdt.cnf
index 3ec13ff8ce..2502e6a553 100644
--- a/asn1/cdt/cdt.cnf
+++ b/asn1/cdt/cdt.cnf
@@ -76,7 +76,7 @@ CompressedData    B "1.3.26.0.4406.0.4.2"  "cdt"
     expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR,
                             "Unable to get compressed content");
     if (check_col (actx->pinfo->cinfo, COL_INFO))
-      col_append_fstr (actx->pinfo->cinfo, COL_INFO, 
+      col_append_str (actx->pinfo->cinfo, COL_INFO, 
                        "[Error: Unable to get compressed content]");
     return offset;
   }
@@ -89,7 +89,7 @@ CompressedData    B "1.3.26.0.4406.0.4.2"  "cdt"
     expert_add_info_format (actx->pinfo, tf, PI_UNDECODED, PI_ERROR,
                             "Unable to uncompress content");
     if (check_col (actx->pinfo->cinfo, COL_INFO))
-      col_append_fstr (actx->pinfo->cinfo, COL_INFO, 
+      col_append_str (actx->pinfo->cinfo, COL_INFO, 
                        "[Error: Unable to uncompress content]");
     return offset;
   }
diff --git a/asn1/cmip/cmip.cnf b/asn1/cmip/cmip.cnf
index a1c120ea0c..14874bc913 100644
--- a/asn1/cmip/cmip.cnf
+++ b/asn1/cmip/cmip.cnf
@@ -220,13 +220,13 @@ RejectProblem
 
 #.FN_HDR CMIPAbortInfo
   if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
+    col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ABORT");
   }
 #.END
 
 #.FN_HDR CMIPUserInfo
   if(check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
+    col_append_str(actx->pinfo->cinfo, COL_INFO, "CMIP-A-ASSOCIATE");
   }
 #.END
 
diff --git a/asn1/dap/dap.cnf b/asn1/dap/dap.cnf
index ac7901ddb9..21c7ecbd13 100644
--- a/asn1/dap/dap.cnf
+++ b/asn1/dap/dap.cnf
@@ -147,7 +147,7 @@ PagedResultsRequest/queryReference	pagedResultsQueryReference
 		proto_tree_add_text(tree, tvb, offset, -1,"Anonymous");
 
 		if(check_col(actx->pinfo->cinfo, COL_INFO))
-			col_append_fstr(actx->pinfo->cinfo, COL_INFO, " anonymous");
+			col_append_str(actx->pinfo->cinfo, COL_INFO, " anonymous");
 
 	}
 	/* do the default thing */
diff --git a/asn1/dap/packet-dap-template.c b/asn1/dap/packet-dap-template.c
index e1b496aefe..d198a05fa1 100644
--- a/asn1/dap/packet-dap-template.c
+++ b/asn1/dap/packet-dap-template.c
@@ -258,7 +258,7 @@ dissect_dap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 	if(dap_dissector) {
 	  if (check_col(pinfo->cinfo, COL_INFO))
-	    col_add_str(pinfo->cinfo, COL_INFO, dap_op_name);
+	    col_set_str(pinfo->cinfo, COL_INFO, dap_op_name);
 
 	  while (tvb_reported_length_remaining(tvb, offset) > 0){
 	    old_offset=offset;
diff --git a/asn1/disp/packet-disp-template.c b/asn1/disp/packet-disp-template.c
index 5129c83339..f4d84fa4d1 100644
--- a/asn1/disp/packet-disp-template.c
+++ b/asn1/disp/packet-disp-template.c
@@ -184,7 +184,7 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 	if(disp_dissector) {
 	  if (check_col(pinfo->cinfo, COL_INFO))
-	    col_add_str(pinfo->cinfo, COL_INFO, disp_op_name);
+	    col_set_str(pinfo->cinfo, COL_INFO, disp_op_name);
 
 	  while (tvb_reported_length_remaining(tvb, offset) > 0){
 	    old_offset=offset;
diff --git a/asn1/dop/packet-dop-template.c b/asn1/dop/packet-dop-template.c
index 69e23ec261..d7c506dd26 100644
--- a/asn1/dop/packet-dop-template.c
+++ b/asn1/dop/packet-dop-template.c
@@ -227,7 +227,7 @@ dissect_dop(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 	if(dop_dissector) {
 	  if (check_col(pinfo->cinfo, COL_INFO))
-	    col_add_str(pinfo->cinfo, COL_INFO, dop_op_name);
+	    col_set_str(pinfo->cinfo, COL_INFO, dop_op_name);
 
 	  while (tvb_reported_length_remaining(tvb, offset) > 0){
 	    old_offset=offset;
diff --git a/asn1/dsp/packet-dsp-template.c b/asn1/dsp/packet-dsp-template.c
index a0ebb77d76..4c40eda089 100644
--- a/asn1/dsp/packet-dsp-template.c
+++ b/asn1/dsp/packet-dsp-template.c
@@ -258,7 +258,7 @@ dissect_dsp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 
 	if(dsp_dissector) {
 	  if (check_col(pinfo->cinfo, COL_INFO))
-	    col_add_str(pinfo->cinfo, COL_INFO, dsp_op_name);
+	    col_set_str(pinfo->cinfo, COL_INFO, dsp_op_name);
 
 	  while (tvb_reported_length_remaining(tvb, offset) > 0){
 	    old_offset=offset;
diff --git a/asn1/gsmmap/gsmmap.cnf b/asn1/gsmmap/gsmmap.cnf
index 08d54ef036..0ffb17e100 100644
--- a/asn1/gsmmap/gsmmap.cnf
+++ b/asn1/gsmmap/gsmmap.cnf
@@ -143,7 +143,7 @@ MAP-DialoguePDU				B "0.4.0.0.1.1.1.1" "map-DialogueAS"
 
 %(DEFAULT_BODY)s 
   if (check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
+    col_append_str(actx->pinfo->cinfo, COL_INFO, gsm_map_opr_code(opcode));
   }
 
 #.FN_PARS  GSMMAPLocalErrorcode
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 16f446173b..783d6b17e9 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -865,8 +865,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i
              * been decrypted; dissect the decrypted LDAP message.
              */
             if (check_col(pinfo->cinfo, COL_INFO)) {
-	      col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
-
+				col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Privacy (decrypted): ");
             }
 
             if (sasl_tree) {
@@ -886,7 +885,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i
 	     * dissect the plain LDAP message.
              */
             if (check_col(pinfo->cinfo, COL_INFO)) {
-	      col_add_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
+				col_set_str(pinfo->cinfo, COL_INFO, "SASL GSS-API Integrity: ");
             }
 
 	    if (sasl_tree) {
diff --git a/asn1/ocsp/packet-ocsp-template.c b/asn1/ocsp/packet-ocsp-template.c
index d5bd0a12a0..e0f5111898 100644
--- a/asn1/ocsp/packet-ocsp-template.c
+++ b/asn1/ocsp/packet-ocsp-template.c
@@ -74,7 +74,7 @@ dissect_ocsp_request(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Request");
+		col_set_str(pinfo->cinfo, COL_INFO, "Request");
 	}
 
 
@@ -101,7 +101,7 @@ dissect_ocsp_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Response");
+		col_set_str(pinfo->cinfo, COL_INFO, "Response");
 	}
 
 
diff --git a/asn1/pkixcmp/packet-cmp-template.c b/asn1/pkixcmp/packet-cmp-template.c
index e53b6f5b4e..5a2bf334fc 100644
--- a/asn1/pkixcmp/packet-cmp-template.c
+++ b/asn1/pkixcmp/packet-cmp-template.c
@@ -115,7 +115,7 @@ static void dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "PKIXCMP");
+		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
 
@@ -240,7 +240,7 @@ dissect_cmp_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "PKIXCMP");
+		col_set_str(pinfo->cinfo, COL_INFO, "PKIXCMP");
 	}
 
 
diff --git a/asn1/pkixtsp/packet-pkixtsp-template.c b/asn1/pkixtsp/packet-pkixtsp-template.c
index b5f79b02e5..970488a6c9 100644
--- a/asn1/pkixtsp/packet-pkixtsp-template.c
+++ b/asn1/pkixtsp/packet-pkixtsp-template.c
@@ -70,7 +70,7 @@ dissect_timestamp_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Reply");
+		col_set_str(pinfo->cinfo, COL_INFO, "Reply");
 	}
 
 
@@ -96,7 +96,7 @@ dissect_timestamp_query(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Query");
+		col_set_str(pinfo->cinfo, COL_INFO, "Query");
 	}
 
 
diff --git a/asn1/rtse/rtse.cnf b/asn1/rtse/rtse.cnf
index cc2144b774..d47ab6556d 100644
--- a/asn1/rtse/rtse.cnf
+++ b/asn1/rtse/rtse.cnf
@@ -119,7 +119,7 @@ EXTERNALt
 
 #.FN_BODY SessionConnectionIdentifier
   if(open_request && check_col(actx->pinfo->cinfo, COL_INFO))
-    col_append_fstr(actx->pinfo->cinfo, COL_INFO, "Recover");
+    col_append_str(actx->pinfo->cinfo, COL_INFO, "Recover");
   %(DEFAULT_BODY)s
 
 #.END
diff --git a/asn1/s4406/packet-s4406-template.c b/asn1/s4406/packet-s4406-template.c
index 438ee54739..f5e76e4a8c 100644
--- a/asn1/s4406/packet-s4406-template.c
+++ b/asn1/s4406/packet-s4406-template.c
@@ -79,7 +79,7 @@ dissect_s4406(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "S4406");
 	if (check_col(pinfo->cinfo, COL_INFO))
-	  col_add_str(pinfo->cinfo, COL_INFO, "Military");
+	  col_set_str(pinfo->cinfo, COL_INFO, "Military");
 
 	dissect_s4406_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
 }
diff --git a/asn1/snmp/snmp.cnf b/asn1/snmp/snmp.cnf
index 655736fa76..94b4a5057c 100644
--- a/asn1/snmp/snmp.cnf
+++ b/asn1/snmp/snmp.cnf
@@ -231,7 +231,7 @@ gint pdu_type;
 				"Failed to decrypt encryptedPDU: %%s", error);
 
 			if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Failed to decrypt");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Failed to decrypt");
 				
 			return offset;
 		} else {
@@ -246,7 +246,7 @@ gint pdu_type;
 									   "Decrypted data not formated as expected");
 
 				if (check_col(actx->pinfo->cinfo, COL_INFO))
-					col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formated as expected");
+					col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: Decrypted data not formated as expected");
 				
 				return offset;
 			}
@@ -261,7 +261,7 @@ gint pdu_type;
 		 }
 	} else {
 			if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: privKey Unknown");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "encryptedPDU: privKey Unknown");
 	}
 
 #.FN_BODY SNMPv3Message/msgSecurityParameters
diff --git a/asn1/t38/packet-t38-template.c b/asn1/t38/packet-t38-template.c
index 61fe14404c..0b2b46e69c 100644
--- a/asn1/t38/packet-t38-template.c
+++ b/asn1/t38/packet-t38-template.c
@@ -543,7 +543,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_append_fstr(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
+		col_append_str(pinfo->cinfo, COL_INFO, "UDP: UDPTLPacket ");
 	}
 
 	offset = dissect_UDPTLPacket_PDU(tvb, pinfo, tr);
@@ -554,7 +554,7 @@ dissect_t38_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				"[MALFORMED PACKET or wrong preference settings]");
 		}
 		if (check_col(pinfo->cinfo, COL_INFO)){
-			col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+			col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
 		}
 	}
 }
@@ -592,7 +592,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO)){
-		col_append_fstr(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
+		col_append_str(pinfo->cinfo, COL_INFO, "TCP: IFPPacket");
 	}
 
 	while(tvb_length_remaining(tvb,offset)>0)
@@ -608,7 +608,7 @@ dissect_t38_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 						"[MALFORMED PACKET or wrong preference settings]");
 				}
 				if (check_col(pinfo->cinfo, COL_INFO)){
-					col_append_fstr(pinfo->cinfo, COL_INFO, " [Malformed?]");
+					col_append_str(pinfo->cinfo, COL_INFO, " [Malformed?]");
 				}
 				break;
 			} 
diff --git a/asn1/t38/t38.cnf b/asn1/t38/t38.cnf
index 9b53052f3f..9e4bf2bae5 100644
--- a/asn1/t38/t38.cnf
+++ b/asn1/t38/t38.cnf
@@ -136,7 +136,7 @@ VAL_PTR=&Data_Field_field_type_value
                         "[RECEIVED END OF FRAGMENT W/OUT ANY FRAGMENT DATA]");
                 }
                 if (check_col(actx->pinfo->cinfo, COL_INFO)){
-                    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
+                    col_append_str(actx->pinfo->cinfo, COL_INFO, " [Malformed?]");
                 }
                 actx->pinfo->fragmented = save_fragmented;
             }
diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf
index b9069665a6..b2eec8da62 100644
--- a/asn1/tcap/tcap.cnf
+++ b/asn1/tcap/tcap.cnf
@@ -231,10 +231,10 @@ if (parameter_tvb){
 	}
 
 	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
-		col_append_fstr(actx->pinfo->cinfo, COL_INFO, "otid(");
+		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));
-        	col_append_fstr(actx->pinfo->cinfo, COL_INFO, ") ");
+        	col_append_str(actx->pinfo->cinfo, COL_INFO, ") ");
 	}
 
 }
@@ -270,10 +270,10 @@ if (parameter_tvb){
 	}
 
 	if ((len)&&(check_col(actx->pinfo->cinfo, COL_INFO))){
-		col_append_fstr(actx->pinfo->cinfo, COL_INFO, "dtid(");
+		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));
-        	col_append_fstr(actx->pinfo->cinfo, COL_INFO, ") ");
+        	col_append_str(actx->pinfo->cinfo, COL_INFO, ") ");
 	   }
 }
 #.FN_HDR Begin
@@ -287,7 +287,7 @@ gp_tcapsrt_info->ope=TC_BEGIN;
  *  put that info there should call col_set_fence() to protect it.
  */
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_add_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
+		col_set_str(actx->pinfo->cinfo, COL_INFO, "Begin ");
 #.END
 
 
@@ -295,7 +295,7 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
 gp_tcapsrt_info->ope=TC_END;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_add_str(actx->pinfo->cinfo, COL_INFO, "End ");
+		col_set_str(actx->pinfo->cinfo, COL_INFO, "End ");
 #.END
 
 
@@ -303,7 +303,7 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
 gp_tcapsrt_info->ope=TC_CONT;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_add_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
+		col_set_str(actx->pinfo->cinfo, COL_INFO, "Continue ");
 #.END
 
 
@@ -311,7 +311,7 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
 gp_tcapsrt_info->ope=TC_ABORT;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+		col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 #.END
 
 
@@ -319,30 +319,30 @@ if (check_col(actx->pinfo->cinfo, COL_INFO))
 gp_tcapsrt_info->ope=TC_ANSI_ABORT;
 
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-		col_add_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
+		col_set_str(actx->pinfo->cinfo, COL_INFO, "Abort ");
 #.END
 
 
 #.FN_HDR TCMessage/ansiqueryWithPerm
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "QueryWithPerm ");
 #.FN_HDR TCMessage/ansiqueryWithoutPerm
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "QueryWithOutPerm ");
 #.FN_HDR TCMessage/ansiresponse
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "Response ");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "Response ");
 #.FN_HDR TCMessage/ansiconversationWithPerm
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithPerm ");
 #.FN_HDR TCMessage/ansiconversationWithoutPerm
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-				col_add_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
+				col_set_str(actx->pinfo->cinfo, COL_INFO, "ConversationWithoutPerm ");
 
 #.END
 
diff --git a/asn1/x411/packet-x411-template.c b/asn1/x411/packet-x411-template.c
index ace11adfe4..d4823f6857 100644
--- a/asn1/x411/packet-x411-template.c
+++ b/asn1/x411/packet-x411-template.c
@@ -190,7 +190,7 @@ dissect_x411(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO))
-	  col_add_str(pinfo->cinfo, COL_INFO, x411_op_name);
+	  col_set_str(pinfo->cinfo, COL_INFO, x411_op_name);
 
 	while (tvb_reported_length_remaining(tvb, offset) > 0){
 		old_offset=offset;
diff --git a/asn1/x420/packet-x420-template.c b/asn1/x420/packet-x420-template.c
index 41bb46932e..9c10bf1d94 100644
--- a/asn1/x420/packet-x420-template.c
+++ b/asn1/x420/packet-x420-template.c
@@ -113,7 +113,7 @@ dissect_x420(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "P22");
 	if (check_col(pinfo->cinfo, COL_INFO))
-	  col_add_str(pinfo->cinfo, COL_INFO, "InterPersonal");
+	  col_set_str(pinfo->cinfo, COL_INFO, "InterPersonal");
 
 	dissect_x420_InformationObject(TRUE, tvb, offset, &asn1_ctx , tree, -1);
 }
diff --git a/asn1/x420/x420.cnf b/asn1/x420/x420.cnf
index ddbf30e569..207586d31a 100644
--- a/asn1/x420/x420.cnf
+++ b/asn1/x420/x420.cnf
@@ -140,7 +140,7 @@ ForwardedContentParameters 	B "2.6.1.11.17.1.3.26.0.4406.0.4.1" 	"id-ep-content-
 #.FN_BODY IPM
 
  if(check_col(actx->pinfo->cinfo, COL_INFO))
-   col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Message");
+   col_append_str(actx->pinfo->cinfo, COL_INFO, " Message");
 
   %(DEFAULT_BODY)s
 
@@ -148,7 +148,7 @@ ForwardedContentParameters 	B "2.6.1.11.17.1.3.26.0.4406.0.4.1" 	"id-ep-content-
 #.FN_BODY IPN
 
  if(check_col(actx->pinfo->cinfo, COL_INFO))
-   col_append_fstr(actx->pinfo->cinfo, COL_INFO, " Notification");
+   col_append_str(actx->pinfo->cinfo, COL_INFO, " Notification");
 
   %(DEFAULT_BODY)s
 
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index c8954ebd16..82a41002b9 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -81,7 +81,7 @@ dissect_pkix_crl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree)
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		col_clear(pinfo->cinfo, COL_INFO);
 		
-		col_add_fstr(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
+		col_set_str(pinfo->cinfo, COL_INFO, "Certificate Revocation List");
 	}