Use col_set_str instead of col_add_fstri/col_add_str when adding constant strings to COL_PROTOCOL

svn path=/trunk/; revision=30088

8 files changed, 9 insertions, 9 deletions

diff --git a/epan/dissectors/packet-i2c.c b/epan/dissectors/packet-i2c.c
index b078aae198..b265c9602d 100644
--- 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 5bc5f4bb52..17b2bb53ff 100644
--- 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 f804c519bd..5ef1c26169 100644
--- 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 c728df2064..84c7878023 100644
--- 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 24bcdf36b8..c640da6b89 100644
--- 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 c08d9888a1..962a6e353f 100644
--- 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 7bd0853e3d..c5c2546440 100644
--- 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 6d675736eb..e752faeba2 100644
--- 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) {