Apply yet another set of the optimization patches:

-set_str2add_str_val_to_str

svn path=/trunk/; revision=23406

27 files changed, 35 insertions, 35 deletions

diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index b91a812546..426bcac799 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -7082,8 +7082,8 @@ 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_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str(camel_pdu_type, camel_Component_vals, "Unknown Camel (%u)"));
+    col_append_str(actx->pinfo->cinfo, COL_INFO, " ");
   }
 
   is_ExtensionField =FALSE;
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index bec49b89c5..78a4f3c345 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -1486,7 +1486,7 @@ static void dissect_cmp_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *p
 	proto_tree_add_uint(tree, hf_cmp_type, tvb, 4, 1, pdu_type);
 
         if (check_col (pinfo->cinfo, COL_INFO)) {
-            col_set_str (pinfo->cinfo, COL_INFO, val_to_str (pdu_type, cmp_pdu_types, "0x%x"));
+            col_add_str (pinfo->cinfo, COL_INFO, val_to_str (pdu_type, cmp_pdu_types, "0x%x"));
         }
 
 	switch(pdu_type){
diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index f8b23c7ffb..27f97335e9 100644
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -884,7 +884,7 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
            
            if (!off) {
               if (check_col(pinfo->cinfo, COL_INFO)) {
-                 col_set_str(pinfo->cinfo, COL_INFO,
+                 col_add_str(pinfo->cinfo, COL_INFO,
                              val_to_str(msgtype,
                                         msgtype_vals,
                                         "Message Type %u"));
@@ -911,7 +911,7 @@ dissect_dhcpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
            if (!off) {
               if (check_col(pinfo->cinfo, COL_INFO)) {
-                 col_set_str(pinfo->cinfo, COL_INFO,
+                 col_add_str(pinfo->cinfo, COL_INFO,
                              val_to_str(msgtype,
                                         msgtype_vals,
                                         "Message Type %u"));
diff --git a/epan/dissectors/packet-dtpt.c b/epan/dissectors/packet-dtpt.c
index 3800616a08..5d041e5b18 100644
--- a/epan/dissectors/packet-dtpt.c
+++ b/epan/dissectors/packet-dtpt.c
@@ -734,7 +734,7 @@ dissect_dtpt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "DTPT");
 	if (check_col(pinfo->cinfo, COL_INFO))
-		col_set_str(pinfo->cinfo, COL_INFO, match_strval(message_type, names_message_type));
+		col_add_str(pinfo->cinfo, COL_INFO, match_strval(message_type, names_message_type));
 
 	if (message_type == LookupBeginRequest) {
 		conversation_t *c;
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 18585a88c0..500495ee40 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -1579,7 +1579,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             g_hash_table_insert (fcdns_req_hash, req_key, cdata);
         }
         if (check_col (pinfo->cinfo, COL_INFO)) {
-            col_set_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_dns_opcode_val,
+            col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_dns_opcode_val,
                                                           "0x%x"));
         }
     }
@@ -1592,7 +1592,7 @@ dissect_fcdns (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (!conversation) {
             if (tree && (opcode == FCCT_MSG_ACC)) {
                 if (check_col (pinfo->cinfo, COL_INFO)) {
-                    col_set_str (pinfo->cinfo, COL_INFO,
+                    col_add_str (pinfo->cinfo, COL_INFO,
                                  val_to_str (opcode, fc_dns_opcode_val,
                                              "0x%x"));
                 }
diff --git a/epan/dissectors/packet-fcfcs.c b/epan/dissectors/packet-fcfcs.c
index 18d7ee7816..4b4dd57f16 100644
--- a/epan/dissectors/packet-fcfcs.c
+++ b/epan/dissectors/packet-fcfcs.c
@@ -849,7 +849,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             g_hash_table_insert (fcfcs_req_hash, req_key, cdata);
         }
         if (check_col (pinfo->cinfo, COL_INFO)) {
-            col_set_str (pinfo->cinfo, COL_INFO,
+            col_add_str (pinfo->cinfo, COL_INFO,
                          val_to_str (opcode, fc_fcs_opcode_abbrev_val, "0x%x"));
         }
     }
@@ -862,7 +862,7 @@ dissect_fcfcs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (!conversation) {
             if (tree && (opcode == FCCT_MSG_ACC)) {
                 if (check_col (pinfo->cinfo, COL_INFO)) {
-                    col_set_str (pinfo->cinfo, COL_INFO,
+                    col_add_str (pinfo->cinfo, COL_INFO,
                                  val_to_str (opcode, fc_fcs_opcode_abbrev_val,
                                              "0x%x"));
                 }
diff --git a/epan/dissectors/packet-fcfzs.c b/epan/dissectors/packet-fcfzs.c
index 011a3d5469..1a954dc5c9 100644
--- a/epan/dissectors/packet-fcfzs.c
+++ b/epan/dissectors/packet-fcfzs.c
@@ -703,7 +703,7 @@ dissect_fcfzs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
             g_hash_table_insert (fcfzs_req_hash, req_key, cdata);
         }
         if (check_col (pinfo->cinfo, COL_INFO)) {
-            col_set_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_fzs_opcode_val,
+            col_add_str (pinfo->cinfo, COL_INFO, val_to_str (opcode, fc_fzs_opcode_val,
                                                           "0x%x"));
         }
     }
@@ -716,7 +716,7 @@ dissect_fcfzs (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (!conversation) {
             if (tree && (opcode == FCCT_MSG_ACC)) {
                 if (check_col (pinfo->cinfo, COL_INFO)) {
-                    col_set_str (pinfo->cinfo, COL_INFO,
+                    col_add_str (pinfo->cinfo, COL_INFO,
                                  val_to_str (opcode, fc_fzs_opcode_val,
                                              "0x%x"));
                 }
diff --git a/epan/dissectors/packet-fcp.c b/epan/dissectors/packet-fcp.c
index e12e2ab708..f5d1f5f3ee 100644
--- a/epan/dissectors/packet-fcp.c
+++ b/epan/dissectors/packet-fcp.c
@@ -633,7 +633,7 @@ dissect_fcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     r_ctl &= 0xF;
 
     if (check_col (pinfo->cinfo, COL_INFO)) {
-        col_set_str (pinfo->cinfo, COL_INFO, val_to_str (r_ctl, fcp_iu_val,
+        col_add_str (pinfo->cinfo, COL_INFO, val_to_str (r_ctl, fcp_iu_val,
                                                       "0x%x"));
     }
 
diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c
index 99ff7fe51a..f45f289118 100644
--- a/epan/dissectors/packet-fcsb3.c
+++ b/epan/dissectors/packet-fcsb3.c
@@ -770,7 +770,7 @@ dissect_fc_sbccs_sb3_iu_hdr (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
     type = get_fc_sbccs_iu_type (tvb, offset);
 
     if (check_col (pinfo->cinfo, COL_INFO)) {
-        col_set_str (pinfo->cinfo, COL_INFO, val_to_str (type, fc_sbccs_iu_val,
+        col_add_str (pinfo->cinfo, COL_INFO, val_to_str (type, fc_sbccs_iu_val,
                                                          "0x%x"));
     }
     
@@ -1027,7 +1027,7 @@ static void dissect_fc_sbccs (tvbuff_t *tvb, packet_info *pinfo,
     get_fc_sbccs_conv_data (tvb, offset, &ch_cu_id, &dev_addr, &ccw);
 
     if (check_col (pinfo->cinfo, COL_INFO)) {
-        col_set_str (pinfo->cinfo, COL_INFO, val_to_str (type, fc_sbccs_iu_val,
+        col_add_str (pinfo->cinfo, COL_INFO, val_to_str (type, fc_sbccs_iu_val,
                                                          "0x%x"));
     }
     
diff --git a/epan/dissectors/packet-fcsp.c b/epan/dissectors/packet-fcsp.c
index e323ce7c0c..528a564d88 100644
--- a/epan/dissectors/packet-fcsp.c
+++ b/epan/dissectors/packet-fcsp.c
@@ -413,7 +413,7 @@ static void dissect_fcsp (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     opcode = tvb_get_guint8 (tvb, 2);
 
     if (check_col (pinfo->cinfo, COL_INFO)) {
-        col_set_str (pinfo->cinfo, COL_INFO,
+        col_add_str (pinfo->cinfo, COL_INFO,
                      val_to_str (opcode, fcauth_msgcode_vals, "0x%x"));
     }
     
diff --git a/epan/dissectors/packet-inap.c b/epan/dissectors/packet-inap.c
index adea4db4f0..a1124204d1 100644
--- a/epan/dissectors/packet-inap.c
+++ b/epan/dissectors/packet-inap.c
@@ -1195,7 +1195,7 @@ dissect_inap_INAPLocalErrorcode(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
   offset = dissect_ber_integer(FALSE, actx, tree, tvb, offset, hf_index, &errorCode);
 
   if (check_col(actx->pinfo->cinfo, COL_INFO)){
-    col_set_str(actx->pinfo->cinfo, COL_INFO, val_to_str(errorCode, inap_error_code_strings, "Unknown Inap (%u)"));
+    col_add_str(actx->pinfo->cinfo, COL_INFO, val_to_str(errorCode, inap_error_code_strings, "Unknown Inap (%u)"));
   }
 
 
diff --git a/epan/dissectors/packet-iuup.c b/epan/dissectors/packet-iuup.c
index 9d256ce7c7..537e911754 100644
--- a/epan/dissectors/packet-iuup.c
+++ b/epan/dissectors/packet-iuup.c
@@ -647,7 +647,7 @@ static void dissect_iuup(tvbuff_t* tvb_in, packet_info* pinfo, proto_tree* tree)
     }
 
     if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_set_str(pinfo->cinfo, COL_INFO, val_to_str(pdutype, iuup_colinfo_pdu_types, "Unknown PDU Type(%u) "));
+        col_add_str(pinfo->cinfo, COL_INFO, val_to_str(pdutype, iuup_colinfo_pdu_types, "Unknown PDU Type(%u) "));
     }
     
     switch(pdutype) {
diff --git a/epan/dissectors/packet-kpasswd.c b/epan/dissectors/packet-kpasswd.c
index 633e1da05d..573f13b2d3 100644
--- a/epan/dissectors/packet-kpasswd.c
+++ b/epan/dissectors/packet-kpasswd.c
@@ -148,7 +148,7 @@ dissect_kpasswd_user_data_reply(packet_info *pinfo, tvbuff_t *tvb, proto_tree *t
     proto_tree_add_uint(tree, hf_kpasswd_result, tvb, offset, 2, result);
     offset+=2;
     if (check_col(pinfo->cinfo, COL_INFO))
-        col_set_str(pinfo->cinfo, COL_INFO, 
+        col_add_str(pinfo->cinfo, COL_INFO, 
                    val_to_str(result, kpasswd_result_types, "Result: %u"));
 
    
@@ -244,7 +244,7 @@ dissect_kpasswd_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboo
 	proto_tree_add_uint(kpasswd_tree, hf_kpasswd_message_len, tvb, offset, 2, message_len);
 	proto_tree_add_uint(kpasswd_tree, hf_kpasswd_version, tvb, offset+2, 2, version);
 	if (check_col(pinfo->cinfo, COL_INFO))
-		col_set_str(pinfo->cinfo, COL_INFO, val_to_str(version, vers_vals, "Unknown command"));
+		col_add_str(pinfo->cinfo, COL_INFO, val_to_str(version, vers_vals, "Unknown command"));
 	proto_tree_add_uint(kpasswd_tree, hf_kpasswd_ap_req_len, tvb, offset+4, 2, ap_req_len);
 	offset+=6;
 
diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c
index 5b9031fbed..435f7fdd48 100644
--- a/epan/dissectors/packet-lpd.c
+++ b/epan/dissectors/packet-lpd.c
@@ -96,7 +96,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		if (lpr_packet_type == request && code !=0) {
-			col_set_str(pinfo->cinfo, COL_INFO, val_to_str(code, lpd_client_code, "Unknown client code: %u"));
+			col_add_str(pinfo->cinfo, COL_INFO, val_to_str(code, lpd_client_code, "Unknown client code: %u"));
 		}
 		else if (lpr_packet_type == response) {
 			col_set_str(pinfo->cinfo, COL_INFO, "LPD response");
diff --git a/epan/dissectors/packet-mpls-echo.c b/epan/dissectors/packet-mpls-echo.c
index 5846e820cf..4643cedbe4 100644
--- a/epan/dissectors/packet-mpls-echo.c
+++ b/epan/dissectors/packet-mpls-echo.c
@@ -976,7 +976,7 @@ dissect_mpls_echo(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         }
 
         if (check_col(pinfo->cinfo, COL_INFO))
-            col_set_str(pinfo->cinfo, COL_INFO,
+            col_add_str(pinfo->cinfo, COL_INFO,
                 val_to_str(msgtype, mpls_echo_msgtype, "Unknown Message Type (0x%02X)"));
 
 
diff --git a/epan/dissectors/packet-msdp.c b/epan/dissectors/packet-msdp.c
index 228fa1d408..6c85ba4bde 100644
--- a/epan/dissectors/packet-msdp.c
+++ b/epan/dissectors/packet-msdp.c
@@ -187,7 +187,7 @@ dissect_msdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 col_set_str(pinfo->cinfo, COL_PROTOCOL, "MSDP");
 
         if (check_col(pinfo->cinfo, COL_INFO))
-                col_set_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(tvb, 0),
+                col_add_str(pinfo->cinfo, COL_INFO, val_to_str(tvb_get_guint8(tvb, 0),
                                                             msdp_types,
                                                             "<Unknown MSDP message type>"));
 
diff --git a/epan/dissectors/packet-nettl.c b/epan/dissectors/packet-nettl.c
index e7008545dc..9ab0b93bd0 100644
--- a/epan/dissectors/packet-nettl.c
+++ b/epan/dissectors/packet-nettl.c
@@ -206,7 +206,7 @@ dissect_nettl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
       pinfo->current_proto = "nettl";
 
       if (check_col(pinfo->cinfo, COL_HPUX_SUBSYS))
-            col_set_str(pinfo->cinfo, COL_HPUX_SUBSYS,
+            col_add_str(pinfo->cinfo, COL_HPUX_SUBSYS,
 		val_to_str(pinfo->pseudo_header->nettl.subsys, subsystem, "Unknown"));
       if (check_col(pinfo->cinfo, COL_HPUX_DEVID)) {
             col_clear(pinfo->cinfo, COL_HPUX_DEVID);
diff --git a/epan/dissectors/packet-ntp.c b/epan/dissectors/packet-ntp.c
index 178ccd6b87..933dad30c7 100644
--- a/epan/dissectors/packet-ntp.c
+++ b/epan/dissectors/packet-ntp.c
@@ -452,7 +452,7 @@ dissect_ntp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	}
 
 	if (check_col(pinfo->cinfo, COL_INFO))
-		col_set_str(pinfo->cinfo, COL_INFO, 
+		col_add_str(pinfo->cinfo, COL_INFO, 
 			val_to_str(flags & NTP_MODE_MASK, info_mode_types, "Unknown"));
 
 	if (tree) {
diff --git a/epan/dissectors/packet-pktc.c b/epan/dissectors/packet-pktc.c
index 0751abfa10..273bca4dc5 100644
--- a/epan/dissectors/packet-pktc.c
+++ b/epan/dissectors/packet-pktc.c
@@ -489,7 +489,7 @@ dissect_pktc_mtafqdn_krbsafeuserdata(packet_info *pinfo, tvbuff_t *tvb, proto_tr
     offset+=1;
 
     if (check_col(pinfo->cinfo, COL_INFO))
-        col_set_str(pinfo->cinfo, COL_INFO,
+        col_add_str(pinfo->cinfo, COL_INFO,
                    val_to_str(msgtype, pktc_mtafqdn_msgtype_vals, "MsgType %u"));
 
     /* enterprise */
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c
index 23478d1600..0c7d799092 100644
--- a/epan/dissectors/packet-pvfs2.c
+++ b/epan/dissectors/packet-pvfs2.c
@@ -3202,7 +3202,7 @@ dissect_pvfs_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree,
 	/* Update column info display */
 	if (check_col(pinfo->cinfo, COL_INFO))
 	{
-		col_set_str(pinfo->cinfo, COL_INFO, 
+		col_add_str(pinfo->cinfo, COL_INFO, 
 				val_to_str(server_op, names_pvfs_server_op, "%u (unknown)"));
 
 		col_append_str(pinfo->cinfo, COL_INFO, 
diff --git a/epan/dissectors/packet-qllc.c b/epan/dissectors/packet-qllc.c
index 5c34afbe38..65b7e3c8a2 100644
--- a/epan/dissectors/packet-qllc.c
+++ b/epan/dissectors/packet-qllc.c
@@ -147,7 +147,7 @@ dissect_qllc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     else {
         /* Non-ambiguous control field value */
         if (check_col(pinfo->cinfo, COL_INFO)) {
-            col_set_str(pinfo->cinfo, COL_INFO,
+            col_add_str(pinfo->cinfo, COL_INFO,
                     val_to_str(ctrl, qllc_control_vals,
                         "Control Field: 0x%02x (unknown)"));
         }
diff --git a/epan/dissectors/packet-quake2.c b/epan/dissectors/packet-quake2.c
index 873b1b087c..9b480f0fe2 100644
--- a/epan/dissectors/packet-quake2.c
+++ b/epan/dissectors/packet-quake2.c
@@ -715,7 +715,7 @@ dissect_quake2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKE2");
 	if (check_col(pinfo->cinfo, COL_INFO))
-		col_set_str(pinfo->cinfo, COL_INFO, val_to_str(direction,
+		col_add_str(pinfo->cinfo, COL_INFO, val_to_str(direction,
 			names_direction, "%u"));
 
 	if (tree) {
diff --git a/epan/dissectors/packet-quakeworld.c b/epan/dissectors/packet-quakeworld.c
index 8151777c05..62b32a4195 100644
--- a/epan/dissectors/packet-quakeworld.c
+++ b/epan/dissectors/packet-quakeworld.c
@@ -721,7 +721,7 @@ dissect_quakeworld(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	if (check_col(pinfo->cinfo, COL_PROTOCOL))
 		col_set_str(pinfo->cinfo, COL_PROTOCOL, "QUAKEWORLD");
 	if (check_col(pinfo->cinfo, COL_INFO))
-		col_set_str(pinfo->cinfo, COL_INFO, val_to_str(direction,
+		col_add_str(pinfo->cinfo, COL_INFO, val_to_str(direction,
 			names_direction, "%u"));
 
 	if (tree) {
diff --git a/epan/dissectors/packet-rmp.c b/epan/dissectors/packet-rmp.c
index 7d38c44402..1227f1cb5f 100644
--- a/epan/dissectors/packet-rmp.c
+++ b/epan/dissectors/packet-rmp.c
@@ -117,7 +117,7 @@ dissect_rmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	type = tvb_get_guint8(tvb, 0);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_set_str(pinfo->cinfo, COL_INFO,
+		col_add_str(pinfo->cinfo, COL_INFO,
 		    val_to_str(type, rmp_type_vals, "Unknown Type"));
 	}
 
diff --git a/epan/dissectors/packet-smb-browse.c b/epan/dissectors/packet-smb-browse.c
index 58586b5fce..e8381d9933 100644
--- a/epan/dissectors/packet-smb-browse.c
+++ b/epan/dissectors/packet-smb-browse.c
@@ -574,7 +574,7 @@ dissect_mailslot_browse(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		/* Put in something, and replace it later */
-		col_set_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
+		col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
 	}
 
 
@@ -819,7 +819,7 @@ dissect_mailslot_lanman(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tr
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
 		/* Put in something, and replace it later */
-		col_set_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
+		col_add_str(pinfo->cinfo, COL_INFO, val_to_str(cmd, commands, "Unknown command:0x%02x"));
 	}
 
 
diff --git a/epan/dissectors/packet-teimanagement.c b/epan/dissectors/packet-teimanagement.c
index 3a186e48be..e182bc50c0 100644
--- a/epan/dissectors/packet-teimanagement.c
+++ b/epan/dissectors/packet-teimanagement.c
@@ -91,7 +91,7 @@ dissect_teimanagement(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     message = tvb_get_guint8(tvb, 3);
     if (check_col(pinfo->cinfo, COL_INFO))
-	col_set_str(pinfo->cinfo, COL_INFO,
+	col_add_str(pinfo->cinfo, COL_INFO,
 	    val_to_str(message, tei_msg_vals, "Unknown message type (0x%04x)"));
     if (tree) {
 	proto_tree_add_uint(tei_tree, lm_message, tvb, 3, 1, message);
diff --git a/epan/dissectors/packet-umts_fp.c b/epan/dissectors/packet-umts_fp.c
index 509121d4f0..ee77cafa6b 100644
--- a/epan/dissectors/packet-umts_fp.c
+++ b/epan/dissectors/packet-umts_fp.c
@@ -2140,7 +2140,7 @@ void dissect_fp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     /* Show channel type in info column, tree */
     if (check_col(pinfo->cinfo, COL_INFO))
     {
-        col_set_str(pinfo->cinfo, COL_INFO,
+        col_add_str(pinfo->cinfo, COL_INFO,
                     val_to_str(p_fp_info->channel,
                                channel_type_vals,
                                "Unknown channel type"));