Use col_set_str instead of col_add_fstr/col_add_str when adding constant strings...

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

diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c
index 1ce23b9bda612425e9e4ee18b3698f78b1674649..9e1e72e2e87f5a2230a07359beea23590c7da757 100644 (file)
--- a/epan/dissectors/packet-ansi_tcap.c
+++ b/epan/dissectors/packet-ansi_tcap.c
@@ -1072,7 +1072,7 @@ dissect_ansi_tcap_T_unidirectional(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 #line 85 "ansi_tcap.cnf"
 gp_tcapsrt_info->ope=TC_ANSI_ALL;
 if (check_col(actx->pinfo->cinfo, COL_INFO))
-               col_add_str(actx->pinfo->cinfo, COL_INFO, "unidirectional ");
+               col_set_str(actx->pinfo->cinfo, COL_INFO, "unidirectional ");
 
 
   offset = dissect_ansi_tcap_UniTransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1103,7 +1103,7 @@ dissect_ansi_tcap_T_queryWithPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U_,
 #line 90 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1118,7 +1118,7 @@ dissect_ansi_tcap_T_queryWithoutPerm(gboolean implicit_tag _U_, tvbuff_t *tvb _U
 #line 95 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1133,7 +1133,7 @@ dissect_ansi_tcap_T_response(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 #line 100 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1148,7 +1148,7 @@ dissect_ansi_tcap_T_conversationWithPerm(gboolean implicit_tag _U_, tvbuff_t *tv
 #line 105 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1163,7 +1163,7 @@ dissect_ansi_tcap_T_conversationWithoutPerm(gboolean implicit_tag _U_, tvbuff_t
 #line 110 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_TransactionPDU(implicit_tag, tvb, offset, actx, tree, hf_index);
@@ -1260,7 +1260,7 @@ dissect_ansi_tcap_T_abort(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 #line 115 "ansi_tcap.cnf"
 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 ");
 
 
   offset = dissect_ansi_tcap_Abort(implicit_tag, tvb, offset, actx, tree, hf_index);

diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 21c614387204927ef59ed679f93dc92c90c88bf2..ca3fc31ebd5e64b1a355fa7ec2c913c88a408956 100644 (file)
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -2560,8 +2560,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (next_tvb) { /* Reassembled */
           /* We have the complete payload */
           if (check_col (pinfo->cinfo, COL_INFO))
-            col_add_str (pinfo->cinfo, COL_INFO,
-                "Reassembled Application Layer");
+            col_set_str(pinfo->cinfo, COL_INFO, "Reassembled Application Layer");
             col_set_fence(pinfo->cinfo, COL_INFO);
         }
         else

diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index 0cd48dc515dbbcd81fed91cffebde4574e6db613..5ad03663f6376b4c3c6ef1c699227b49f6a14a47 100644 (file)
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -1640,7 +1640,7 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 col_clear(pinfo->cinfo, COL_PROTOCOL);
                 col_set_str(pinfo->cinfo, COL_PROTOCOL, "Teredo");
             }    
-            col_add_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test");
+            col_set_str(pinfo->cinfo, COL_INFO, "Direct IPv6 Connectivity Test");
         } else {   
             if (coltypename && strcmp(coltypename, "Unknown") == 0) {
                 g_snprintf(typebuf, sizeof(typebuf), "Unknown (0x%02x)",

diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c
index 3f9ad2907f8533eda55e649128ef2960703f6d9e..26944d78a78e5160a91bd6d539b94eb9d3d538b6 100644 (file)
--- a/epan/dissectors/packet-ipars.c
+++ b/epan/dissectors/packet-ipars.c
@@ -90,7 +90,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
                                        col_add_fstr(pinfo->cinfo, COL_INFO, "GoAhead NextIA (0x%2.2X)", ta);
                        } else {
                                if (check_col(pinfo->cinfo, COL_INFO))
-                                       col_add_str(pinfo->cinfo, COL_INFO, "GoAhead NextIA");
+                                       col_set_str(pinfo->cinfo, COL_INFO, "GoAhead NextIA");
                        }
                }
        } else {                                                                                                                                                /* if its not a 'go ahead'... it must be some kind of data message */
@@ -125,7 +125,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree)
                        if (ia == 0x03) {
                                proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 0, 1, "GoAhead Next IA");
                                if (check_col(pinfo->cinfo, COL_INFO))
-                                       col_add_str(pinfo->cinfo, COL_INFO, "GoAhead");
+                                       col_set_str(pinfo->cinfo, COL_INFO, "GoAhead");
                                return;
                        } else if (ia != S1) {
                                proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb,

diff --git a/epan/dissectors/packet-ipsi-ctl.c b/epan/dissectors/packet-ipsi-ctl.c
index 1ac965550d1f1b4e0fcd4d20c69f08804c43fb90..89c828a43efc53d9bc2073325d593d9f2b004c23 100644 (file)
--- a/epan/dissectors/packet-ipsi-ctl.c
+++ b/epan/dissectors/packet-ipsi-ctl.c
@@ -201,7 +201,7 @@ static void dissect_ipsictl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     }
   }else{
     if (check_col(pinfo->cinfo, COL_INFO)) {
-        col_add_str(pinfo->cinfo, COL_INFO, "Initialization");
+        col_set_str(pinfo->cinfo, COL_INFO, "Initialization");
     }
   }
 

diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 17b2bb53ffac5417989c69f2fa1ccdbac4b5c13d..7c95225186e7bdf69b15d80b8d987c8b74e58fc2 100644 (file)
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -491,7 +491,7 @@ dissect_ldss_transfer (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                gboolean already_dissected = TRUE;
 
                if (check_col(pinfo->cinfo, COL_INFO)) {
-                       col_add_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)");
+                       col_set_str(pinfo->cinfo, COL_INFO, "LDSS File Transfer (Requesting file - pull)");
                }
 
                if (highest_num_seen == 0 ||

diff --git a/plugins/docsis/packet-rngreq.c b/plugins/docsis/packet-rngreq.c
index 3445e3ce836dafd795c68b3da72ba62b114139b0..c11a92e6a8d61c95e2ba4cf80a266fc72f9c2fb3 100644 (file)
--- a/plugins/docsis/packet-rngreq.c
+++ b/plugins/docsis/packet-rngreq.c
@@ -58,8 +58,7 @@ dissect_rngreq (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
        col_add_fstr (pinfo->cinfo, COL_INFO, "Ranging Request: SID = %u",
                      sid);
       else
-       col_add_str (pinfo->cinfo, COL_INFO,
-                    "Initial Ranging Request SID = 0");
+       col_set_str(pinfo->cinfo, COL_INFO, "Initial Ranging Request SID = 0");
     }
 
   if (tree)

diff --git a/plugins/irda/packet-irda.c b/plugins/irda/packet-irda.c
index 35cf0cf7f9759ab029e556a8a3876533c5d8a621..a1962272e68c5d03bcbd0eea99a3743465dff833 100644 (file)
--- a/plugins/irda/packet-irda.c
+++ b/plugins/irda/packet-irda.c
@@ -733,7 +733,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
 
     if (check_col(pinfo->cinfo, COL_INFO))
     {
-        col_add_str(pinfo->cinfo, COL_INFO, "Result: ");
+        col_set_str(pinfo->cinfo, COL_INFO, "Result: ");
         col_append_str(pinfo->cinfo, COL_INFO, val_to_str(retcode, iap_return_vals, "0x%02X"));
 
         switch (op)

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index 31b28149aa7e47ab978d756f0f537d868044577e..3055a5cb92ea4f8a1b716952e6074757edad5306 100644 (file)
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -7366,7 +7366,7 @@ dissect_PNIO_heur(tvbuff_t *tvb,
     /* is this a PNIO high priority alarm packet? */
     if(u16FrameID == 0xfc01) {
        if (check_col(pinfo->cinfo, COL_INFO))
-               col_add_str(pinfo->cinfo, COL_INFO, "Alarm High");
+               col_set_str(pinfo->cinfo, COL_INFO, "Alarm High");
 
         dissect_PNIO_RTA(tvb, 0, pinfo, tree, drep);
         return TRUE;
@@ -7375,7 +7375,7 @@ dissect_PNIO_heur(tvbuff_t *tvb,
     /* is this a PNIO low priority alarm packet? */
     if(u16FrameID == 0xfe01) {
        if (check_col(pinfo->cinfo, COL_INFO))
-               col_add_str(pinfo->cinfo, COL_INFO, "Alarm Low");
+               col_set_str(pinfo->cinfo, COL_INFO, "Alarm Low");
 
         dissect_PNIO_RTA(tvb, 0, pinfo, tree, drep);
         return TRUE;

diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 848fa96c6307dec1b5721a1861f8fe311f233faf..149916b691cb99f0ba62d759188e934b9b607dba 100644 (file)
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -358,7 +358,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   if (check_col(pinfo->cinfo, COL_PROTOCOL))
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-RT");
   if (check_col(pinfo->cinfo, COL_INFO))
-    col_add_str(pinfo->cinfo, COL_INFO, "PROFINET Real-Time");
+    col_set_str(pinfo->cinfo, COL_INFO, "PROFINET Real-Time");
 
   if (tvb_len < 6) {
     dissect_pn_malformed(tvb, 0, pinfo, tree, tvb_len);