Fix some "format not a string literal and no format arguments" warnings.

svn path=/trunk/; revision=26646

25 files changed, 70 insertions, 70 deletions

diff --git a/epan/dissectors/packet-acn.c b/epan/dissectors/packet-acn.c
index 8580778566..9ee9d6313a 100644
--- a/epan/dissectors/packet-acn.c
+++ b/epan/dissectors/packet-acn.c
@@ -1161,7 +1161,7 @@ dissect_acn_dmp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int off
   /* Add Vector item to tree*/
   name = val_to_str(vector, acn_dmp_vector_vals, "not valid (%d)");
   proto_item_append_text(ti, ": ");
-  proto_item_append_text(ti, name);
+  proto_item_append_text(ti, "%s", name);
 
   /* Set header offset */
   if (pdu_flags & ACN_PDU_FLAG_H) {
@@ -1469,7 +1469,7 @@ dissect_acn_sdt_wrapped_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
   /* Add Vector item to tree*/
   name = val_to_str(vector, acn_sdt_vector_vals, "not valid (%d)");
   proto_item_append_text(ti, ": ");
-  proto_item_append_text(ti, name);
+  proto_item_append_text(ti, "%s", name);
 
   /* NO HEADER DATA ON THESE* (at least so far) */
 
@@ -1644,7 +1644,7 @@ dissect_acn_sdt_client_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
   /* Add protocol to tree*/
   name = val_to_str(protocol_id, acn_protocol_id_vals, "id not valid (%d)");
   proto_item_append_text(ti, ": ");
-  proto_item_append_text(ti, name);
+  proto_item_append_text(ti, "%s", name);
 
   /* add association item */
   association = tvb_get_ntohs(tvb, header_offset);
@@ -1859,7 +1859,7 @@ dissect_acn_dmx_data_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
   /* Add Vector item to tree*/
   name = val_to_str(vector, acn_dmp_vector_vals, "not valid (%d)");
   proto_item_append_text(ti, ": ");
-  proto_item_append_text(ti, name);
+  proto_item_append_text(ti, "%s", name);
 
   /* Set header offset */
   if (pdu_flags & ACN_PDU_FLAG_H) {
@@ -2241,7 +2241,7 @@ dissect_acn_sdt_base_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, in
   /* Add Vector item to tree*/
   name = val_to_str(vector, acn_sdt_vector_vals, "not valid (%d)");
   proto_item_append_text(ti, ": ");
-  proto_item_append_text(ti, name);
+  proto_item_append_text(ti, "%s", name);
 
   /* NO HEADER DATA ON THESE* (at least so far) */
 
diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index 84aca8659f..d15886db50 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -2165,7 +2165,7 @@ catsearch_spec(tvbuff_t *tvb, proto_tree *ptree, gint offset, int ext, guint32	b
 		size = tvb_get_guint8(tvb, offset) +2;
 	}
 
-	item = proto_tree_add_text(ptree, tvb, offset, size, label);
+	item = proto_tree_add_text(ptree, tvb, offset, size, "%s", label);
 	tree = proto_item_add_subtree(item, ett_afp_cat_spec);
 
 	if (ext) {
diff --git a/epan/dissectors/packet-amr.c b/epan/dissectors/packet-amr.c
index 6efe0ca905..8046651a0c 100644
--- a/epan/dissectors/packet-amr.c
+++ b/epan/dissectors/packet-amr.c
@@ -348,10 +348,10 @@ dissect_amr_be(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree){
 		ft = (unit16val >> (11 - (bitcount % 8)))  &0x000F;
 		if (amr_mode==AMR_NB)
 			item = proto_tree_add_text(tree, tvb, bitcount/8, 1+(bitcount % 8)/5, 
-						   amr_nb_codec_mode_request_vals[ft].strptr);
+						   "%s", amr_nb_codec_mode_request_vals[ft].strptr);
 		else
 			item = proto_tree_add_text(tree, tvb, bitcount/8, 1+(bitcount % 8)/5, 
-						   amr_wb_codec_mode_request_vals[ft].strptr);
+						   "%s", amr_wb_codec_mode_request_vals[ft].strptr);
 		    	    
 		bitcount += 4;
 		if (amr_mode==AMR_NB)
diff --git a/epan/dissectors/packet-ansi_637.c b/epan/dissectors/packet-ansi_637.c
index 47ca8ededb..453d7fcde8 100644
--- a/epan/dissectors/packet-ansi_637.c
+++ b/epan/dissectors/packet-ansi_637.c
@@ -819,7 +819,7 @@ tele_param_rel_timestamp(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 off
     if (str == NULL)
     {
 	proto_tree_add_text(tree, tvb, offset, 1,
-	    str2);
+	    "%s", str2);
     }
     else
     {
@@ -987,7 +987,7 @@ tele_param_lang_ind(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
     }
 
     proto_tree_add_text(tree, tvb, offset, 1,
-	str);
+	"%s", str);
 }
 
 static void
@@ -1275,7 +1275,7 @@ trans_param_srvc_cat(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset,
     if (NULL == str) str = "Reserved";
 
     proto_tree_add_text(tree, tvb, offset, 2,
-	str);
+	"%s", str);
 
     g_snprintf(add_string, string_len, " - %s (%d)", str, value);
 }
@@ -1752,7 +1752,7 @@ trans_param_cause_codes(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offs
     }
 
     proto_tree_add_text(tree, tvb, offset, 1,
-	str);
+	"%s", str);
 }
 
 static void
@@ -1819,7 +1819,7 @@ dissect_ansi_637_tele_param(tvbuff_t *tvb, proto_tree *tree, guint32 *offset)
     param_fcn = ansi_637_tele_param_fcn[idx];
 
     item =
-	proto_tree_add_text(tree, tvb, curr_offset, -1, str);
+	proto_tree_add_text(tree, tvb, curr_offset, -1, "%s", str);
 
     subtree = proto_item_add_subtree(item, ett_param_idx);
 
@@ -2008,7 +2008,7 @@ dissect_ansi_637_trans_param(tvbuff_t *tvb, proto_tree *tree, guint32 *offset)
     param_fcn = ansi_637_trans_param_fcn[idx];
 
     item =
-	proto_tree_add_text(tree, tvb, curr_offset, -1, str);
+	proto_tree_add_text(tree, tvb, curr_offset, -1, "%s", str);
 
     subtree = proto_item_add_subtree(item, ett_param_idx);
 
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 70e8c79244..40ec58c06e 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -1099,7 +1099,7 @@ msg_validate_req(tvbuff_t *tvb, proto_tree *tree, guint len, guint32 offset)
 	item =
 	    proto_tree_add_none_format(tree, hf_ansi_683_none,
 		tvb, offset, -1,
-		str);
+		"%s", str);
 
 	subtree = proto_item_add_subtree(item, ett_for_val_block);
 
diff --git a/epan/dissectors/packet-ansi_a.c b/epan/dissectors/packet-ansi_a.c
index e2b7e82221..7bcfbe0ffc 100644
--- a/epan/dissectors/packet-ansi_a.c
+++ b/epan/dissectors/packet-ansi_a.c
@@ -7384,7 +7384,7 @@ elem_auth_event(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gcha
 	}
 
 	proto_tree_add_text(tree, tvb, curr_offset, len,
-	    str);
+	    "%s", str);
     }
     else
     {
diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
index f1ded411bb..b556936be7 100644
--- a/epan/dissectors/packet-asap.c
+++ b/epan/dissectors/packet-asap.c
@@ -170,7 +170,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
   length         = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET);
   padding_length = tvb_length(cause_tvb) - length;
 
-  cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), val_to_str(code, cause_code_values, "Unknown error cause"));
+  cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), "%s", val_to_str(code, cause_code_values, "Unknown error cause"));
   cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause);
 
   proto_tree_add_item(cause_tree, hf_cause_code,   cause_tvb, CAUSE_CODE_OFFSET,   CAUSE_CODE_LENGTH,   NETWORK_BYTE_ORDER);
@@ -610,7 +610,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
   padding_length = tvb_length(parameter_tvb) - length;
 
   /* create proto_tree stuff */
-  parameter_item   = proto_tree_add_text(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(type, parameter_type_values, "Unknown Parameter"));
+  parameter_item   = proto_tree_add_text(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str(type, parameter_type_values, "Unknown Parameter"));
   parameter_tree   = proto_item_add_subtree(parameter_item, ett_asap_parameter);
 
   /* add tag and length to the asap tree */
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c
index d689c9cbbc..dc431d1324 100644
--- a/epan/dissectors/packet-atm.c
+++ b/epan/dissectors/packet-atm.c
@@ -227,10 +227,10 @@ dissect_lan_destination(tvbuff_t *tvb, int offset, const char *type, proto_tree
     trd = proto_tree_add_text(dest_tree, tvb, offset, 2, "Route descriptor: 0x%02X",
     			route_descriptor);
     rd_tree = proto_item_add_subtree(td, ett_atm_lane_lc_lan_dest_rd);
-    proto_tree_add_text(rd_tree, tvb, offset, 2,
+    proto_tree_add_text(rd_tree, tvb, offset, 2, "%s",
 	    decode_numeric_bitfield(route_descriptor, 0xFFF0, 2*8,
 			"LAN ID = %u"));
-    proto_tree_add_text(rd_tree, tvb, offset, 2,
+    proto_tree_add_text(rd_tree, tvb, offset, 2, "%s",
 	    decode_numeric_bitfield(route_descriptor, 0x000F, 2*8,
 			"Bridge number = %u"));
     break;
diff --git a/epan/dissectors/packet-bacapp.c b/epan/dissectors/packet-bacapp.c
index 15ef32b51b..7647a88484 100644
--- a/epan/dissectors/packet-bacapp.c
+++ b/epan/dissectors/packet-bacapp.c
@@ -3168,7 +3168,7 @@ fWeeklySchedule (tvbuff_t *tvb, proto_tree *tree, guint offset)
 		if (tag_is_closing(tag_info)) {
 			return offset; /* outer encoding will print out closing tag */
 		}
-		tt = proto_tree_add_text(tree, tvb, offset, 0, val_to_str(i++, day_of_week, "day of week (%d) not found"));
+		tt = proto_tree_add_text(tree, tvb, offset, 0, "%s", val_to_str(i++, day_of_week, "day of week (%d) not found"));
 		subtree = proto_item_add_subtree(tt, ett_bacapp_value);
 		offset = fDailySchedule (tvb,subtree,offset);
 	}
@@ -5093,7 +5093,7 @@ fReadRangeRequest (tvbuff_t *tvb, proto_tree *tree, guint offset)
 		/* optional range choice */
 		fTagHeader (tvb, offset, &tag_no, &tag_info, &lvt);
 		if (tag_is_opening(tag_info)) {
-			tt = proto_tree_add_text(subtree, tvb, offset, 1, val_to_str(tag_no, BACnetReadRangeOptions, "unknown range option"));
+			tt = proto_tree_add_text(subtree, tvb, offset, 1, "%s", val_to_str(tag_no, BACnetReadRangeOptions, "unknown range option"));
 			subtree = proto_item_add_subtree(tt, ett_bacapp_value);
 			offset += fTagHeaderTree (tvb, subtree, offset, &tag_no, &tag_info, &lvt);
 			switch (tag_no) {
@@ -5168,7 +5168,7 @@ static guint fAccessMethod(tvbuff_t *tvb, proto_tree *tree, guint offset)
 
 	if (tag_is_opening(tag_info))
 	{
-		tt = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(tag_no, BACnetFileAccessOption, "invalid access method"));
+		tt = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(tag_no, BACnetFileAccessOption, "invalid access method"));
 		subtree = proto_item_add_subtree(tt, ett_bacapp_value);
 		offset += fTagHeaderTree (tvb, subtree, offset, &tag_no, &tag_info, &lvt);
 		offset = fApplicationTypes (tvb, subtree, offset, val_to_str(tag_no, BACnetFileStartOption, "invalid option"));
@@ -5209,7 +5209,7 @@ fAtomicReadFileRequest(tvbuff_t *tvb, proto_tree *tree, guint offset)
 
 	if (tag_is_opening(tag_info))
 	{
-		tt = proto_tree_add_text(subtree, tvb, offset, 1, val_to_str(tag_no, BACnetFileAccessOption, "unknown access method"));
+		tt = proto_tree_add_text(subtree, tvb, offset, 1, "%s", val_to_str(tag_no, BACnetFileAccessOption, "unknown access method"));
 		subtree = proto_item_add_subtree(tt, ett_bacapp_value);
 		offset += fTagHeaderTree (tvb, subtree, offset, &tag_no, &tag_info, &lvt);
 		offset = fSignedTag (tvb, subtree, offset, val_to_str(tag_no, BACnetFileStartOption, "unknown option"));
diff --git a/epan/dissectors/packet-beep.c b/epan/dissectors/packet-beep.c
index 0fedc6634b..0abc2cee07 100644
--- a/epan/dissectors/packet-beep.c
+++ b/epan/dissectors/packet-beep.c
@@ -566,7 +566,7 @@ dissect_beep_tree(tvbuff_t *tvb, int offset, packet_info *pinfo,
       hdr = proto_item_add_subtree(ti, ett_header);
 
       hidden_item = proto_tree_add_boolean(hdr, hf_beep_req, tvb, offset, 3, TRUE);
-      proto_tree_add_text(hdr, tvb, offset, 3, cmd_temp);
+      proto_tree_add_text(hdr, tvb, offset, 3, "%s", cmd_temp);
     }
 
     offset += 4;
diff --git a/epan/dissectors/packet-bssgp.c b/epan/dissectors/packet-bssgp.c
index 09103a14b2..02a414cd79 100644
--- a/epan/dissectors/packet-bssgp.c
+++ b/epan/dissectors/packet-bssgp.c
@@ -597,7 +597,7 @@ bit_proto_tree_add_text(proto_tree *tree, tvbuff_t *tvb,
 			guint64 bo, guint8 bl, const char *value) {
   /* XXX: Use varargs */
   return proto_tree_add_text(tree, tvb, get_start_octet(bo),
-			     get_num_octets_spanned(bo, bl), value);
+			     get_num_octets_spanned(bo, bl), "%s", value);
 }
 
 static proto_item *
@@ -1564,7 +1564,7 @@ bssgp_pi_append_pfi(proto_item *pi, tvbuff_t *tvb, int offset) {
   };
   value = tvb_get_masked_guint8(tvb, offset, MASK_PFI);
   proto_item_append_text(pi,
-		  val_to_str(value, tab_pfi, "Dynamically assigned (PFI: %d)"));
+		  "%s", val_to_str(value, tab_pfi, "Dynamically assigned (PFI: %d)"));
 }
 
 static void
@@ -2791,11 +2791,11 @@ decode_iei_qos_profile(bssgp_ie_t *ie, build_info_t *bi, int ie_start_offset) {
   proto_item_append_text(pi, "Precedence: ");
 
   if (bi->ul_data) {
-    proto_item_append_text(pi, val_to_str(value, tab_precedence_ul,
+    proto_item_append_text(pi, "%s", val_to_str(value, tab_precedence_ul,
 					  "Reserved (Low priority)"));
   }
   else {
-    proto_item_append_text(pi, val_to_str(value, tab_precedence_dl,
+    proto_item_append_text(pi, "%s", val_to_str(value, tab_precedence_dl,
 					  "Reserved (Radio priority 3)"));
   }
   proto_item_append_text(pi, " (%#x)", value);
diff --git a/epan/dissectors/packet-bthci_cmd.c b/epan/dissectors/packet-bthci_cmd.c
index ed4df5f233..755fa8a3bb 100644
--- a/epan/dissectors/packet-bthci_cmd.c
+++ b/epan/dissectors/packet-bthci_cmd.c
@@ -848,7 +848,7 @@ dissect_bthci_cmd_cod(int type, tvbuff_t *tvb, int offset, packet_info *pinfo _U
 		buf[strlen(buf)-1] = '\0'; /* skip last comma */
 
 		g_strlcat(buf, ")", sizeof(buf));
-		proto_item_append_text(item, buf);
+		proto_item_append_text(item, "%s", buf);
 	}
 	else
 	{
diff --git a/epan/dissectors/packet-bthci_evt.c b/epan/dissectors/packet-bthci_evt.c
index b459061876..97b9ad3b0c 100644
--- a/epan/dissectors/packet-bthci_evt.c
+++ b/epan/dissectors/packet-bthci_evt.c
@@ -654,7 +654,7 @@ dissect_bthci_evt_cod(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_t
 		buf[strlen(buf)-1] = 0; /* skip last comma */
 
 		g_strlcat(buf, ")", sizeof(buf));
-		proto_item_append_text(item, buf);
+		proto_item_append_text(item, "%s", buf);
 	}
 	else
 	{
diff --git a/epan/dissectors/packet-cast.c b/epan/dissectors/packet-cast.c
index f0748a0c0f..c1378187aa 100644
--- a/epan/dissectors/packet-cast.c
+++ b/epan/dissectors/packet-cast.c
@@ -849,21 +849,21 @@ static void dissect_cast_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
       val = tvb_get_letohl( tvb, i);
       ti_sub = proto_tree_add_text(cast_tree, tvb, offset, 8, "partyPIRestrictionBits");
       cast_sub_tree = proto_item_add_subtree(ti_sub, ett_cast_tree);
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x01, 4*8, "Does RestrictCallingPartyName", "Doesn't RestrictCallingPartyName"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x02, 4*8, "Does RestrictCallingPartyNumber", "Doesn't RestrictCallingPartyNumber"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x04, 4*8, "Does RestrictCalledPartyName", "Doesn't RestrictCalledPartyName"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x08, 4*8, "Does RestrictCalledPartyNumber", "Doesn't RestrictCalledPartyNumber"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x10, 4*8, "Does RestrictOriginalCalledPartyName", "Doesn't RestrictOriginalCalledPartyName"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x20, 4*8, "Does RestrictOriginalCalledPartyNumber", "Doesn't RestrictOriginalCalledPartyNumber"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x40, 4*8, "Does RestrictLastRedirectPartyName", "Doesn't RestrictLastRedirectPartyName"));
-      proto_tree_add_text(cast_sub_tree, tvb, i, 4,
+      proto_tree_add_text(cast_sub_tree, tvb, i, 4, "%s",
         decode_boolean_bitfield( val, 0x80, 4*8, "Does RestrictLastRedirectPartyNumber", "Doesn't RestrictLastRedirectPartyNumber"));
       break;
 
diff --git a/epan/dissectors/packet-cdp.c b/epan/dissectors/packet-cdp.c
index e0bd6ccd77..ffb761d49d 100644
--- a/epan/dissectors/packet-cdp.c
+++ b/epan/dissectors/packet-cdp.c
@@ -999,31 +999,31 @@ dissect_capabilities(tvbuff_t *tvb, int offset, int length, proto_tree *tree)
     ti = proto_tree_add_text(tree, tvb, offset, length, "Capabilities: 0x%08x",
         capabilities);
     capabilities_tree = proto_item_add_subtree(ti, ett_cdp_capabilities);
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x01, 4*8,
 	    "Is  a Router",
 	    "Not a Router"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x02, 4*8,
 	    "Is  a Transparent Bridge",
 	    "Not a Transparent Bridge"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x04, 4*8,
 	    "Is  a Source Route Bridge",
 	    "Not a Source Route Bridge"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x08, 4*8,
 	    "Is  a Switch",
 	    "Not a Switch"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x10, 4*8,
 	    "Is  a Host",
 	    "Not a Host"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x20, 4*8,
 	    "Is  IGMP capable",
 	    "Not IGMP capable"));
-    proto_tree_add_text(capabilities_tree, tvb, offset, 4,
+    proto_tree_add_text(capabilities_tree, tvb, offset, 4, "%s",
 	decode_boolean_bitfield(capabilities, 0x40, 4*8,
 	    "Is  a Repeater",
 	    "Not a Repeater"));
diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 31e53337fc..d29c58ceac 100644
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -2603,7 +2603,7 @@ static proto_tree *
 info_to_cops_subtree(tvbuff_t *tvb, proto_tree *st, int n, int offset, const char *str) {
      proto_item *tv;
 
-     tv  = proto_tree_add_none_format( st, hf_cops_subtree, tvb, offset, n, str);
+     tv  = proto_tree_add_none_format( st, hf_cops_subtree, tvb, offset, n, "%s", str);
      return( proto_item_add_subtree( tv, ett_cops_subtree ) );
 }
 
diff --git a/epan/dissectors/packet-cpha.c b/epan/dissectors/packet-cpha.c
index 636142515a..07db3dae2f 100644
--- a/epan/dissectors/packet-cpha.c
+++ b/epan/dissectors/packet-cpha.c
@@ -271,7 +271,7 @@ dissect_cpha(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     	proto_tree_add_uint(cpha_tree, hf_filler, tvb, offset, sizeof(hdr.filler), g_ntohs(hdr.filler));
     	offset += sizeof(hdr.filler);
     }
-    nti = proto_tree_add_text(cpha_tree, tvb, offset, -1, opcode2str_short(opcode));
+    nti = proto_tree_add_text(cpha_tree, tvb, offset, -1, "%s", opcode2str_short(opcode));
     ntree = proto_item_add_subtree(nti, ett_cphap);
 
     switch(opcode) {
diff --git a/epan/dissectors/packet-dcc.c b/epan/dissectors/packet-dcc.c
index 49ad685384..55371468e1 100644
--- a/epan/dissectors/packet-dcc.c
+++ b/epan/dissectors/packet-dcc.c
@@ -110,7 +110,7 @@ static gint ett_dcc_trace = -1;
 	hidden_item = proto_tree_add_item(dcc_tree, hf_dcc_target, tvb, \
 		offset, sizeof(DCC_TGTS), FALSE); \
 	PROTO_ITEM_SET_HIDDEN(hidden_item); \
-	proto_tree_add_text(dcc_optree, tvb, offset, sizeof(DCC_TGTS), \
+	proto_tree_add_text(dcc_optree, tvb, offset, sizeof(DCC_TGTS), "%s", \
 		val_to_str(tvb_get_ntohl(tvb,offset), dcc_target_vals, "Targets (%u)")); \
 	offset += sizeof(DCC_TGTS); \
 
diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c
index 9ce638680d..315317045e 100644
--- a/epan/dissectors/packet-dcerpc-netlogon.c
+++ b/epan/dissectors/packet-dcerpc-netlogon.c
@@ -3109,7 +3109,7 @@ netlogon_dissect_CIPHER_VALUE(tvbuff_t *tvb, int offset,
 
 	if(parent_tree){
 		item = proto_tree_add_text(parent_tree, tvb, offset, 0,
-			name);
+			"%s", name);
 		tree = proto_item_add_subtree(item, ett_CYPHER_VALUE);
 	}
 
@@ -3557,7 +3557,7 @@ netlogon_dissect_DELTA_ENUM(tvbuff_t *tvb, int offset,
 	offset = dissect_ndr_uint16(tvb, offset, pinfo, tree, drep,
 		hf_netlogon_delta_type, &type);
 
-	proto_item_append_text(item, val_to_str(
+	proto_item_append_text(item, "%s", val_to_str(
 				       type, delta_type_vals, "Unknown"));
 
 	offset = netlogon_dissect_DELTA_ID_UNION(tvb, offset,
diff --git a/epan/dissectors/packet-dcerpc-spoolss.c b/epan/dissectors/packet-dcerpc-spoolss.c
index c9297ecdea..19ab62713f 100644
--- a/epan/dissectors/packet-dcerpc-spoolss.c
+++ b/epan/dissectors/packet-dcerpc-spoolss.c
@@ -510,7 +510,7 @@ dissect_SYSTEM_TIME(tvbuff_t *tvb, int offset, packet_info *pinfo,
 	char *str;
 
 	if (add_subtree) {
-		item = proto_tree_add_text(tree, tvb, offset, 16, name);
+		item = proto_tree_add_text(tree, tvb, offset, 16, "%s", name);
 		subtree = proto_item_add_subtree(item, ett_SYSTEM_TIME);
 	}
 
diff --git a/epan/dissectors/packet-dcm.c b/epan/dissectors/packet-dcm.c
index 1f35e93d4a..a839251499 100644
--- a/epan/dissectors/packet-dcm.c
+++ b/epan/dissectors/packet-dcm.c
@@ -4474,7 +4474,7 @@ dissect_dcm_assoc_item(tvbuff_t *tvb, proto_tree *tree, guint32 offset,
     item_type = tvb_get_guint8(tvb, offset);
     item_len  = tvb_get_ntohs(tvb, offset+2);
 
-    assoc_item_pitem = proto_tree_add_text(tree, tvb, offset, item_len+4, pitem_prefix);
+    assoc_item_pitem = proto_tree_add_text(tree, tvb, offset, item_len+4, "%s", pitem_prefix);
     assoc_item_ptree = proto_item_add_subtree(assoc_item_pitem, ett_subtree);
 
     proto_tree_add_uint(assoc_item_ptree, *hf_type, tvb, offset, 1, item_type);
@@ -4561,7 +4561,7 @@ dissect_dcm_pctx(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     item_type = tvb_get_guint8(tvb, offset-4);
     item_len  = tvb_get_ntohs(tvb, offset-2);
 
-    pctx_pitem = proto_tree_add_text(tree, tvb, offset-4, item_len+4, pitem_prefix);
+    pctx_pitem = proto_tree_add_text(tree, tvb, offset-4, item_len+4, "%s", pitem_prefix);
     pctx_ptree = proto_item_add_subtree(pctx_pitem, ett_assoc_pctx);
 
     pctx_id     = tvb_get_guint8(tvb, offset);
@@ -4731,7 +4731,7 @@ dissect_dcm_userinfo(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint32 le
     item_type = tvb_get_guint8(tvb, offset-4);
     item_len  = tvb_get_ntohs(tvb, offset-2);
 
-    userinfo_pitem = proto_tree_add_text(tree, tvb, offset-4, item_len+4, pitem_prefix);
+    userinfo_pitem = proto_tree_add_text(tree, tvb, offset-4, item_len+4, "%s", pitem_prefix);
     userinfo_ptree = proto_item_add_subtree(userinfo_pitem, ett_assoc_info);
 
     proto_tree_add_uint(userinfo_ptree, hf_dcm_assoc_item_type, tvb, offset-4, 2, item_type);
@@ -5550,17 +5550,17 @@ dissect_dcm_tag(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
 
     if (vl == 0xFFFFFFFF) {
 	/* 'Just' mark header as the length of the item */
-	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, offset - offset_tag, tag_summary);
+	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, offset - offset_tag, "%s", tag_summary);
 	vl_max = 0;	    /* We don't know who long this sequence/item is */
     }
     else if (offset + vl <= endpos) {
 	/* Show real length of item */
-	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, offset + vl - offset_tag, tag_summary);
+	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, offset + vl - offset_tag, "%s", tag_summary);
 	vl_max = vl;
     }
     else {
 	/* Value is longer than what we have in the PDV, -> we do have a OPEN tag */
-	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, endpos - offset_tag, tag_summary);
+	tag_pitem = proto_tree_add_text(tree, tvb, offset_tag, endpos - offset_tag, "%s", tag_summary);
 	vl_max = endpos - offset;
     }
 
diff --git a/epan/dissectors/packet-dis-pdus.c b/epan/dissectors/packet-dis-pdus.c
index 27bc7c5817..82336f3236 100644
--- a/epan/dissectors/packet-dis-pdus.c
+++ b/epan/dissectors/packet-dis-pdus.c
@@ -257,7 +257,7 @@ gint parseFields(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode pa
         case DIS_FIELDTYPE_APPEARANCE:
 	    {
                 proto_item *newSubtree;
-                newField = proto_tree_add_text(tree, tvb, offset, 4,
+                newField = proto_tree_add_text(tree, tvb, offset, 4, "%s",
                     parserNodes[fieldIndex].fieldLabel);
                 newSubtree = proto_item_add_subtree(newField,
                     parserNodes[fieldIndex].ettVar);
@@ -359,7 +359,7 @@ gint parseFields(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode pa
         case DIS_FIELDTYPE_LOCATION_ENTITY:
         case DIS_FIELDTYPE_ENTITY_TYPE:
         case DIS_FIELDTYPE_ORIENTATION:
-            newField = proto_tree_add_text(tree, tvb, offset, -1,
+            newField = proto_tree_add_text(tree, tvb, offset, -1, "%s",
                 parserNodes[fieldIndex].fieldLabel);
             if (parserNodes[fieldIndex].children != 0)
             {
@@ -382,7 +382,7 @@ gint parseFields(tvbuff_t *tvb, proto_tree *tree, gint offset, DIS_ParserNode pa
 	        for (i = 0; i < numArticulations; ++i)
 	        {
 		    proto_item *newSubtree;
-                    newField = proto_tree_add_text(tree, tvb, offset, -1,
+                    newField = proto_tree_add_text(tree, tvb, offset, -1, "%s",
                         parserNodes[fieldIndex].fieldLabel);
                     newSubtree = proto_item_add_subtree(newField,
                         ettArticulations[i]);
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index 041d0e8efa..14dead2326 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -1011,7 +1011,7 @@ add_item_text(proto_item *item, const gchar *text, gboolean comma_needed)
   if (comma_needed) {
     proto_item_append_text(item, ", ");
   }
-  proto_item_append_text(item, text);
+  proto_item_append_text(item, "%s", text);
   return TRUE;
 }
 
@@ -1104,8 +1104,8 @@ dnp3_al_obj_procindex(tvbuff_t *tvb, int offset, guint8 al_objq_index, guint32 *
 static void
 dnp3_append_2item_text(proto_item *item1, proto_item *item2, const gchar *text)
 {
-  proto_item_append_text(item1, text);
-  proto_item_append_text(item2, text);
+  proto_item_append_text(item1, "%s", text);
+  proto_item_append_text(item2, "%s", text);
 }
 
 /*****************************************************************/
@@ -2317,7 +2317,7 @@ dissect_dnp3_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     if (dl_ctl & DNP3_CTL_RES) proto_item_append_text(tdl, "RES, ");
     if (dl_ctl & DNP3_CTL_DFC) proto_item_append_text(tdl, "DFC, ");
   }
-  proto_item_append_text(tdl, func_code_str);
+  proto_item_append_text(tdl, "%s", func_code_str);
   dl_tree = proto_item_add_subtree(tdl, ett_dnp3_dl);
 
   /* start bytes */
diff --git a/epan/dissectors/packet-dns.c b/epan/dissectors/packet-dns.c
index 7f5e54e813..8eab40cd40 100644
--- a/epan/dissectors/packet-dns.c
+++ b/epan/dissectors/packet-dns.c
@@ -1266,12 +1266,12 @@ dissect_dns_answer(tvbuff_t *tvb, int offsetx, int dns_data_offset,
 
 		case IP_PROTO_TCP:
 		  strptr += MIN(MAX_STR_LEN-(strptr-bitnames),
-				g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_tcp_port(port_num)));
+				g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), "%s", get_tcp_port(port_num)));
 		  break;
 
 		case IP_PROTO_UDP:
 		  strptr += MIN(MAX_STR_LEN-(strptr-bitnames),
-				g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), get_udp_port(port_num)));
+				g_snprintf(strptr, MAX_STR_LEN-(strptr-bitnames), "%s", get_udp_port(port_num)));
 		  break;
 
 		default:
@@ -2466,7 +2466,7 @@ dissect_query_records(tvbuff_t *tvb, int cur_off, int dns_data_offset,
   start_off = cur_off;
   if (dns_tree) {
     const char *s = (isupdate ?  "Zone" : "Queries");
-    ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, s);
+    ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, "%s", s);
     qatree = proto_item_add_subtree(ti, ett_dns_qry);
   }
   while (count-- > 0) {
@@ -2491,7 +2491,7 @@ dissect_answer_records(tvbuff_t *tvb, int cur_off, int dns_data_offset,
 
   start_off = cur_off;
   if (dns_tree) {
-    ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, name);
+    ti = proto_tree_add_text(dns_tree, tvb, start_off, -1, "%s", name);
     qatree = proto_item_add_subtree(ti, ett_dns_ans);
   }
   while (count-- > 0) {
diff --git a/epan/dissectors/packet-dua.c b/epan/dissectors/packet-dua.c
index d3908d9ebc..f0ebd9d3d2 100644
--- a/epan/dissectors/packet-dua.c
+++ b/epan/dissectors/packet-dua.c
@@ -449,7 +449,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree,
   padding_length = tvb_length(parameter_tvb) - length;
 
   /* create proto_tree stuff */
-  parameter_item   = proto_tree_add_text(dua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
+  parameter_item   = proto_tree_add_text(dua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s",
                                          val_to_str(tag, parameter_tag_values, "Unknown parameter"));
   parameter_tree   = proto_item_add_subtree(parameter_item, ett_dua_parameter);