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

svn path=/trunk/; revision=30088

diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index b078aae1982041944f87c8547ea8e29ff9214640..b265c9602df259bb1f3fce70f2880644ee3ff2d4 100644 (file)
--- a/epan/dissectors/packet-i2c.c
+++ b/epan/dissectors/packet-i2c.c
@@ -206,7 +206,7 @@ dissect_i2c(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL)) {
                if (is_event)
-                       col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "I2C Event");
+                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "I2C Event");
                else
                        col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "I2C %s",
                                        (flags & I2C_FLAG_RD) ? "Read" : "Write");

diff --git a/epan/dissectors/packet-ldss.c b/epan/dissectors/packet-ldss.c
index 5bc5f4bb52995db11443175a37e3cf601a667606..17b2bb53ffac5417989c69f2fa1ccdbac4b5c13d 100644 (file)
--- a/epan/dissectors/packet-ldss.c
+++ b/epan/dissectors/packet-ldss.c
@@ -804,14 +804,14 @@ dissect_ldss (tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
            pinfo->ipproto == IP_PROTO_UDP) {
 
                if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-                       col_add_str(pinfo->cinfo,COL_PROTOCOL,"LDSS");
+                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
                }
                return dissect_ldss_broadcast(tvb, pinfo, tree);
        }
        else if (pinfo->ipproto == IP_PROTO_TCP) {
 
                if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-                       col_add_str(pinfo->cinfo,COL_PROTOCOL,"LDSS");
+                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "LDSS");
                }
                return dissect_ldss_transfer(tvb, pinfo, tree);
        }

diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c
index f804c519bd47fe130ad5188401c7f5bddd831302..5ef1c26169ac665933b3f1a194c6b577b35c4cb1 100644 (file)
--- a/epan/dissectors/packet-mgcp.c
+++ b/epan/dissectors/packet-mgcp.c
@@ -360,7 +360,7 @@ static int dissect_mgcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
                 * an exception.  We can set them later as well....
                 */
                if (check_col(pinfo->cinfo, COL_PROTOCOL))
-                       col_add_str(pinfo->cinfo, COL_PROTOCOL, "MGCP");
+                       col_set_str(pinfo->cinfo, COL_PROTOCOL, "MGCP");
                col_clear(pinfo->cinfo, COL_INFO);
 
                /*

diff --git a/epan/dissectors/packet-pcli.c b/epan/dissectors/packet-pcli.c
index c728df2064f9709399cf9508c0ee1f931d1b216f..84c7878023ca7a3e1ac222a66e3c632f02f69c53 100644 (file)
--- a/epan/dissectors/packet-pcli.c
+++ b/epan/dissectors/packet-pcli.c
@@ -82,7 +82,7 @@ dissect_pcli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) {
 
   /* Set the protocol column */
   if(check_col(pinfo->cinfo,COL_PROTOCOL)){
-    col_add_str(pinfo->cinfo,COL_PROTOCOL,"PCLI");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PCLI");
   }
 
   /* Get the CCCID */

diff --git a/epan/dissectors/packet-pdcp-lte.c b/epan/dissectors/packet-pdcp-lte.c
index 24bcdf36b8b9d052557d90bcf3f7be6bc64a3f81..c640da6b89f8e09dfd95a0b786739d9ef6d6953e 100644 (file)
--- a/epan/dissectors/packet-pdcp-lte.c
+++ b/epan/dissectors/packet-pdcp-lte.c
@@ -1370,7 +1370,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
     gboolean           ip_id_needed = TRUE;
 
     /* Append this protocol name rather than replace. */
-    col_add_str(pinfo->cinfo, COL_PROTOCOL, "PDCP-LTE");
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "PDCP-LTE");
 
     /* Create pdcp tree. */
     if (tree) {

diff --git a/epan/dissectors/packet-redback.c b/epan/dissectors/packet-redback.c
index c08d9888a1ae25c1b25c70f54cf6cb9abffe0abe..962a6e353f45371faf7e8fbfe7854f09464351b9 100644 (file)
--- a/epan/dissectors/packet-redback.c
+++ b/epan/dissectors/packet-redback.c
@@ -65,7 +65,7 @@ dissect_redback(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        if(check_col(pinfo->cinfo,COL_PROTOCOL))
-               col_add_str(pinfo->cinfo,COL_PROTOCOL,"RBN");
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "RBN");
 
        dataoff = tvb_get_ntohs(tvb, 20);
        l3off = tvb_get_ntohs(tvb, 22);

diff --git a/epan/dissectors/packet-redbackli.c b/epan/dissectors/packet-redbackli.c
index 7bd0853e3d314978967358002288baf02ffccb1e..c5c25464404d6274cb3ac09fabd8e91c5ba39291 100644 (file)
--- a/epan/dissectors/packet-redbackli.c
+++ b/epan/dissectors/packet-redbackli.c
@@ -145,7 +145,7 @@ redbackli_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
        tvbuff_t        *next_tvb;
 
        if(check_col(pinfo->cinfo,COL_PROTOCOL))
-               col_add_str(pinfo->cinfo,COL_PROTOCOL,"RBLI");
+               col_set_str(pinfo->cinfo, COL_PROTOCOL, "RBLI");
 
        if (tree) {
                ti = proto_tree_add_item(tree, proto_redbackli,

diff --git a/epan/dissectors/packet-zbee-nwk.c b/epan/dissectors/packet-zbee-nwk.c
index 6d675736ebaaf6045ee7fc0eaa29260e4294d8fa..e752faeba2e54f7c329d046e2e073d8926287ff9 100644 (file)
--- a/epan/dissectors/packet-zbee-nwk.c
+++ b/epan/dissectors/packet-zbee-nwk.c
@@ -1328,7 +1328,7 @@ static void dissect_zbee_beacon(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
 
     /* Add ourself to the protocol column. */
     if(check_col(pinfo->cinfo, COL_PROTOCOL)){
-        col_add_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "ZigBee");
     }
     /* Create the tree for this beacon. */
     if (tree) {

diff --git a/plugins/profinet/packet-dcerpc-pn-io.c b/plugins/profinet/packet-dcerpc-pn-io.c
index edc5924591de7e09020a815dfa594356d6c1f649..31b28149aa7e47ab978d756f0f537d868044577e 100644 (file)
--- a/plugins/profinet/packet-dcerpc-pn-io.c
+++ b/plugins/profinet/packet-dcerpc-pn-io.c
@@ -6717,7 +6717,7 @@ dissect_IPNIO_rqst_header(tvbuff_t *tvb, int offset,
 
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
 
     /* args_max */
        offset = dissect_ndr_uint32(tvb, offset, pinfo, tree, drep,
@@ -6762,7 +6762,7 @@ dissect_IPNIO_resp_header(tvbuff_t *tvb, int offset,
 
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-CM");
 
     offset = dissect_PNIO_status(tvb, offset, pinfo, tree, drep);
 
@@ -7192,7 +7192,7 @@ dissect_PNIO_C_SDU(tvbuff_t *tvb, int offset,
 
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PNIO");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO");
 
     if(tree) {
            data_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
@@ -7240,7 +7240,7 @@ dissect_PNIO_RTA(tvbuff_t *tvb, int offset,
 
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-AL");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PNIO-AL");
 
        rta_item = proto_tree_add_protocol_format(tree, proto_pn_io, tvb, offset, tvb_length(tvb),
         "PROFINET IO Alarm");

diff --git a/plugins/profinet/packet-dcom-cba-acco.c b/plugins/profinet/packet-dcom-cba-acco.c
index adf1c8953b2279c38c0509afa6458ae9935ad9cc..00a5b5b240288210aaa3735e182c16ed8a54048e 100644 (file)
--- a/plugins/profinet/packet-dcom-cba-acco.c
+++ b/plugins/profinet/packet-dcom-cba-acco.c
@@ -3225,7 +3225,7 @@ dissect_CBA_Connection_Data_heur(tvbuff_t *tvb,
     }
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PN-CBA");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-CBA");
 
     frame = cba_frame_find_by_cons(pinfo, pinfo->dl_dst.data, u16FrameID);
 

diff --git a/plugins/profinet/packet-pn-dcp.c b/plugins/profinet/packet-pn-dcp.c
index e33ecb0cd42b9239850e4f695e660bde899c6fed..6d625dfb3e7a2a4395cc765fc035e35d5e619f69 100644 (file)
--- a/plugins/profinet/packet-pn-dcp.c
+++ b/plugins/profinet/packet-pn-dcp.c
@@ -924,7 +924,7 @@ dissect_PNDCP_Data_heur(tvbuff_t *tvb,
     }
 
     if (check_col(pinfo->cinfo, COL_PROTOCOL))
-        col_add_str(pinfo->cinfo, COL_PROTOCOL, "PN-DCP");
+        col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-DCP");
     if (check_col(pinfo->cinfo, COL_INFO))
       col_add_str(pinfo->cinfo, COL_INFO, "");
 

diff --git a/plugins/profinet/packet-pn-mrrt.c b/plugins/profinet/packet-pn-mrrt.c
index 0a2fb2717f90143f25b55115a70ed219dffc4bee..8037b874dc77f217ac88d676adb6240fdc60aa68 100644 (file)
--- a/plugins/profinet/packet-pn-mrrt.c
+++ b/plugins/profinet/packet-pn-mrrt.c
@@ -190,7 +190,7 @@ dissect_PNMRRT_Data_heur(tvbuff_t *tvb,
     }
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRRT");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-MRRT");
     if (check_col(pinfo->cinfo, COL_INFO))
       col_add_str(pinfo->cinfo, COL_INFO, "");
 

diff --git a/plugins/profinet/packet-pn-ptcp.c b/plugins/profinet/packet-pn-ptcp.c
index 9ce46d912796f9e7f637f0224c7958a5936c9e3c..00099ed9aebbf05707dd24a5a7dbb5976a104e4f 100644 (file)
--- a/plugins/profinet/packet-pn-ptcp.c
+++ b/plugins/profinet/packet-pn-ptcp.c
@@ -769,7 +769,7 @@ dissect_PNPTCP_Data_heur(tvbuff_t *tvb,
     }
 
        if (check_col(pinfo->cinfo, COL_PROTOCOL))
-           col_add_str(pinfo->cinfo, COL_PROTOCOL, "PN-PTCP");
+           col_set_str(pinfo->cinfo, COL_PROTOCOL, "PN-PTCP");
     if (check_col(pinfo->cinfo, COL_INFO))
       col_add_str(pinfo->cinfo, COL_INFO, "");
 

diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index 76dce6453f5bf3edb3902baab52e23b359bd4cff..848fa96c6307dec1b5721a1861f8fe311f233faf 100644 (file)
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -356,7 +356,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
    * an exception.  We can set them (or append things) later again ....
    */
   if (check_col(pinfo->cinfo, COL_PROTOCOL))
-    col_add_str(pinfo->cinfo, COL_PROTOCOL, "PN-RT");
+    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");