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

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

5 files changed, 118 insertions, 118 deletions

diff --git a/epan/dissectors/packet-ros.c b/epan/dissectors/packet-ros.c
index e7ff146cbf..2961972528 100644
--- a/epan/dissectors/packet-ros.c
+++ b/epan/dissectors/packet-ros.c
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-ros.c                                                               */
-/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn Remote-Operations-Information-Objects.asn */
+/* ../../tools/asn2wrs.py -b -e -p ros -c ./ros.cnf -s ./packet-ros-template -D . ros.asn Remote-Operations-Information-Objects.asn */
 
 /* Input file: packet-ros-template.c */
 
@@ -249,7 +249,7 @@ static gboolean ros_try_string(const char *oid, tvbuff_t *tvb, packet_info *pinf
 			if (check_col(pinfo->cinfo, COL_INFO)) {
 				col_set_str(pinfo->cinfo, COL_INFO, opname);
 				if(suffix)
-					col_append_fstr(pinfo->cinfo, COL_INFO, suffix);
+					col_append_str(pinfo->cinfo, COL_INFO, suffix);
 			}
 			
 			offset = (*opdissector)(tvb, pinfo, ros_tree);
diff --git a/epan/dissectors/packet-ros.h b/epan/dissectors/packet-ros.h
index 1ec08fc250..9f29bbc2ef 100644
--- a/epan/dissectors/packet-ros.h
+++ b/epan/dissectors/packet-ros.h
@@ -1,7 +1,7 @@
 /* Do not modify this file.                                                   */
 /* It is created automatically by the ASN.1 to Wireshark dissector compiler   */
 /* packet-ros.h                                                               */
-/* ../../tools/asn2wrs.py -b -e -p ros -c ros.cnf -s packet-ros-template ros.asn Remote-Operations-Information-Objects.asn */
+/* ../../tools/asn2wrs.py -b -e -p ros -c ./ros.cnf -s ./packet-ros-template -D . ros.asn Remote-Operations-Information-Objects.asn */
 
 /* Input file: packet-ros-template.h */
 
diff --git a/epan/dissectors/packet-rsvp.c b/epan/dissectors/packet-rsvp.c
index 5798319d33..52325e69bf 100644
--- a/epan/dissectors/packet-rsvp.c
+++ b/epan/dissectors/packet-rsvp.c
@@ -2219,15 +2219,15 @@ dissect_rsvp_error (proto_item *ti, proto_tree *rsvp_object_tree,
     ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset3, 1,
 			      "Flags: 0x%02x", error_flags);
     rsvp_error_subtree = proto_item_add_subtree(ti2, TREE(TT_ERROR_FLAGS));
-    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1,
+    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1, "%s", 
 		    decode_boolean_bitfield(error_flags, 0x04, 8,
 					    "Path State Removed",
 					    ""));
-    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1,
+    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1, "%s",
 		    decode_boolean_bitfield(error_flags, 0x02, 8,
 					    "NotGuilty",
 					    ""));
-    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1,
+    proto_tree_add_text(rsvp_error_subtree, tvb, offset3, 1, "%s",
 		    decode_boolean_bitfield(error_flags, 0x01, 8,
 					    "InPlace",
 					    ""));
@@ -2522,11 +2522,11 @@ dissect_rsvp_eth_tspec_tlv(proto_item *ti, proto_tree *rsvp_object_tree,
 	    ti3 = proto_tree_add_text(rsvp_ethspec_subtree, tvb, offset+tlv_off+4, 1,
 				      "Profile: 0x%02x", profile);
 	    ethspec_profile_subtree = proto_item_add_subtree(ti3, TREE(TT_ETHSPEC_SUBTREE));
-	    proto_tree_add_text(ethspec_profile_subtree, tvb, offset+tlv_off+4, 1,
+	    proto_tree_add_text(ethspec_profile_subtree, tvb, offset+tlv_off+4, 1, "%s",
 				decode_boolean_bitfield(profile, 0x02, 8,
 					    "Color Mode (CM) set",
 					    "Color Mode (CM) NOT set"));
-	    proto_tree_add_text(ethspec_profile_subtree, tvb, offset+tlv_off+4, 1,
+	    proto_tree_add_text(ethspec_profile_subtree, tvb, offset+tlv_off+4, 1, "%s",
 				decode_boolean_bitfield(profile, 0x01, 8,
 					    "Coupling Flag (CF) set",
 					    "Coupling Flag (CF) NOT set"));
@@ -2758,11 +2758,11 @@ dissect_rsvp_tspec (proto_item *ti, proto_tree *rsvp_object_tree,
 	ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1,
 			    "Requested Concatenation (RCC): %d", tvb_get_guint8(tvb, offset2+1));
 	tspec_tree = proto_item_add_subtree(ti2, TREE(TT_TSPEC_SUBTREE));
-	proto_tree_add_text(tspec_tree, tvb, offset2+1, 1,
+	proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8,
 						    "Standard contiguous concatenation",
 						    "No standard contiguous concatenation"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+1, 1,
+	proto_tree_add_text(tspec_tree, tvb, offset2+1, 1, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8,
 						    "Arbitrary contiguous concatenation",
 						    "No arbitrary contiguous concatenation"));
@@ -2775,59 +2775,59 @@ dissect_rsvp_tspec (proto_item *ti, proto_tree *rsvp_object_tree,
 	ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
 				  "Transparency (T): 0x%0x", tvb_get_ntohl(tvb, offset2+8));
 	tspec_tree = proto_item_add_subtree(ti2, TREE(TT_TSPEC_SUBTREE));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32,
 						    "Section/Regenerator Section layer transparency",
 						    "No Section/Regenerator Section layer transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32,
 						    "Line/Multiplex Section layer transparency",
 						    "No Line/Multiplex Section layer transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32,
 						    "J0 transparency",
 						    "No J0 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32,
 						    "SOH/RSOH DCC transparency",
 						    "No SOH/RSOH DCC transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32,
 						    "LOH/MSOH DCC transparency",
 						    "No LOH/MSOH DCC transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32,
 						    "LOH/MSOH Extended DCC transparency",
 						    "No LOH/MSOH Extended DCC transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32,
 						    "K1/K2 transparency",
 						    "No K1/K2 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32,
 						    "E1 transparency",
 						    "No E1 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32,
 						    "F1 transparency",
 						    "No F1 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32,
 						    "E2 transparency",
 						    "No E2 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32,
 						    "B1 transparency",
 						    "No B1 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32,
 						    "B2 transparency",
 						    "No B2 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32,
 						    "M0 transparency",
 						    "No M0 transparency"));
-	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(tspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32,
 						    "M1 transparency",
 						    "No M1 transparency"));
@@ -3089,11 +3089,11 @@ dissect_rsvp_flowspec (proto_item *ti, proto_tree *rsvp_object_tree,
 	ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+1, 1,
 				  "Requested Concatenation (RCC): %d", tvb_get_guint8(tvb, offset2+1));
 	flowspec_tree = proto_item_add_subtree(ti2, TREE(TT_FLOWSPEC_SUBTREE));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x01, 8,
 						    "Standard contiguous concatenation",
 						    "No standard contiguous concatenation"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+1, 1, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+1), 0x02, 8,
 						    "Arbitrary contiguous concatenation",
 						    "No arbitrary contiguous concatenation"));
@@ -3106,59 +3106,59 @@ dissect_rsvp_flowspec (proto_item *ti, proto_tree *rsvp_object_tree,
 	ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2+8, 4,
 				  "Transparency (T): 0x%0x", tvb_get_ntohl(tvb, offset2+8));
 	flowspec_tree = proto_item_add_subtree(ti2, TREE(TT_FLOWSPEC_SUBTREE));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_ntohl(tvb, offset2+8), 0x0001, 32,
 						    "Section/Regenerator Section layer transparency",
 						    "No Section/Regenerator Section layer transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0002, 32,
 						    "Line/Multiplex Section layer transparency",
 						    "No Line/Multiplex Section layer transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0004, 32,
 						    "J0 transparency",
 						    "No J0 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0008, 32,
 						    "SOH/RSOH DCC transparency",
 						    "No SOH/RSOH DCC transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0010, 32,
 						    "LOH/MSOH DCC transparency",
 						    "No LOH/MSOH DCC transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0020, 32,
 						    "LOH/MSOH Extended DCC transparency",
 						    "No LOH/MSOH Extended DCC transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0040, 32,
 						    "K1/K2 transparency",
 						    "No K1/K2 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0080, 32,
 						    "E1 transparency",
 						    "No E1 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0100, 32,
 						    "F1 transparency",
 						    "No F1 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0200, 32,
 						    "E2 transparency",
 						    "No E2 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0400, 32,
 						    "B1 transparency",
 						    "No B1 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x0800, 32,
 						    "B2 transparency",
 						    "No B2 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x1000, 32,
 						    "M0 transparency",
 						    "No M0 transparency"));
-	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4,
+	proto_tree_add_text(flowspec_tree, tvb, offset2+8, 4, "%s",
 			    decode_boolean_bitfield(tvb_get_guint8(tvb, offset2+8), 0x2000, 32,
 						    "M1 transparency",
 						    "No M1 transparency"));
@@ -3237,7 +3237,7 @@ dissect_rsvp_adspec (proto_item *ti, proto_tree *rsvp_object_tree,
 	break_bit = tvb_get_guint8(tvb, offset2+1);
 	length = tvb_get_ntohs(tvb, offset2+2);
 	ti = proto_tree_add_text(rsvp_object_tree, tvb, offset2,
-				 (length+1)*4,
+				 (length+1)*4, "%s",
 				 str);
 	adspec_tree = proto_item_add_subtree(ti,
 					     TREE(TT_ADSPEC_SUBTREE));
@@ -3326,7 +3326,7 @@ dissect_rsvp_integrity (proto_item *ti _U_, proto_tree *rsvp_object_tree,
     ti2 = proto_tree_add_text(rsvp_object_tree, tvb, offset2, 1,
 			      "Flags: 0x%02x", flags);
     rsvp_integ_flags_tree = proto_item_add_subtree(ti2, TREE(TT_INTEGRITY_FLAGS));
-    proto_tree_add_text(rsvp_integ_flags_tree, tvb, offset2, 1,
+    proto_tree_add_text(rsvp_integ_flags_tree, tvb, offset2, 1, "%s",
 	decode_boolean_bitfield(flags, 0x01, 8, "Handshake capable", "Handshake not capable"));
     proto_tree_add_text(rsvp_object_tree, tvb, offset2+2, 6,
 			"Key Identifier: %s", tvb_bytes_to_str(tvb, offset2+2, 6));
@@ -3644,23 +3644,23 @@ dissect_rsvp_session_attribute (proto_item *ti, proto_tree *rsvp_object_tree,
 				  "Flags: 0x%02x", flags);
 	rsvp_sa_flags_tree = proto_item_add_subtree(ti2,
 						    TREE(TT_SESSION_ATTRIBUTE_FLAGS));
-	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1,
+	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x01, 8,
 						    "Local protection desired",
 						    "Local protection not desired"));
-	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1,
+	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x02, 8,
 						    "Label recording desired",
 						    "Label recording not desired"));
-	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1,
+	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x04, 8,
 						    "SE style desired",
 						    "SE style not desired"));
-	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1,
+	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x08, 8,
 						    "Bandwidth protection desired",
 						    "Bandwidth protection not desired"));
-	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1,
+	proto_tree_add_text(rsvp_sa_flags_tree, tvb, offset2+2, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x10, 8,
 						    "Node protection desired",
 						    "Node protection not desired"));
@@ -3763,23 +3763,23 @@ dissect_rsvp_ero_rro_subobjects (proto_tree *ti, proto_tree *rsvp_object_tree,
 					  "Flags: 0x%02x", flags);
 		rsvp_rro_flags_subtree =
 		    proto_item_add_subtree(ti2, TREE(TT_RECORD_ROUTE_SUBOBJ_FLAGS));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x01, 8,
 							    "Local Protection Available",
 							    "Local Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x02, 8,
 							    "Local Protection In Use",
 							    "Local Protection Not In Use"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x04, 8,
 							    "Bandwidth Protection Available",
 							    "Bandwidth Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x08, 8,
 							    "Node Protection Available",
 							    "Node Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+7, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x10, 8,
 							    "Address Specifies a Node-id Address",
 							    "Address Doesn't Specify a Node-id Address"));
@@ -3825,23 +3825,23 @@ dissect_rsvp_ero_rro_subobjects (proto_tree *ti, proto_tree *rsvp_object_tree,
 					  "Flags: 0x%02x", flags);
 		rsvp_rro_flags_subtree =
 		    proto_item_add_subtree(ti2, TREE(TT_RECORD_ROUTE_SUBOBJ_FLAGS));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x01, 8,
 							    "Local Protection Available",
 							    "Local Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x02, 8,
 							    "Local Protection In Use",
 							    "Local Protection Not In Use"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x04, 8,
 							    "Backup Tunnel Has Bandwidth",
 							    "Backup Tunnel Does Not Have Bandwidth"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x08, 8,
 							    "Backup Tunnel Goes To Next-Next-Hop",
 							    "Backup Tunnel Goes To Next-Hop"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+19, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x10, 8,
 							    "Address Specifies a Node-id Address",
 							    "Address Doesn't Specify a Node-id Address"));
@@ -3877,19 +3877,19 @@ dissect_rsvp_ero_rro_subobjects (proto_tree *ti, proto_tree *rsvp_object_tree,
 					  "Flags: 0x%02x", flags);
 		rsvp_rro_flags_subtree =
 		    proto_item_add_subtree(ti2, TREE(TT_RECORD_ROUTE_SUBOBJ_FLAGS));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x01, 8,
 							    "Local Protection Available",
 							    "Local Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x02, 8,
 							    "Local Protection In Use",
 							    "Local Protection Not In Use"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x04, 8,
 							    "Backup Tunnel Has Bandwidth",
 							    "Backup Tunnel Does Not Have Bandwidth"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x08, 8,
 							    "Backup Tunnel Goes To Next-Next-Hop",
 							    "Backup Tunnel Goes To Next-Hop"));
@@ -3936,19 +3936,19 @@ dissect_rsvp_ero_rro_subobjects (proto_tree *ti, proto_tree *rsvp_object_tree,
 					  "Flags: 0x%02x", flags);
 		rsvp_rro_flags_subtree =
 		    proto_item_add_subtree(ti2, TREE(TT_RECORD_ROUTE_SUBOBJ_FLAGS));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x01, 8,
 							    "Local Protection Available",
 							    "Local Protection Not Available"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x02, 8,
 							    "Local Protection In Use",
 							    "Local Protection Not In Use"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x04, 8,
 							    "Backup Tunnel Has Bandwidth",
 							    "Backup Tunnel Does Not Have Bandwidth"));
-		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1,
+		proto_tree_add_text(rsvp_rro_flags_subtree, tvb, offset+l+2, 1, "%s",
 				    decode_boolean_bitfield(flags, 0x08, 8,
 							    "Backup Tunnel Goes To Next-Next-Hop",
 							    "Backup Tunnel Goes To Next-Hop"));
@@ -4310,19 +4310,19 @@ dissect_rsvp_admin_status (proto_tree *ti, proto_tree *rsvp_object_tree,
 				  "Admin Status: 0x%08x", status);
 	rsvp_admin_subtree =
 	    proto_item_add_subtree(ti2, TREE(TT_ADMIN_STATUS_FLAGS));
-	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4,
+	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4, "%s",
 			    decode_boolean_bitfield(status, 0x80000000, 32,
 						    "R: Reflect",
 						    "R: Do not reflect"));
-	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4,
+	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4, "%s",
 			    decode_boolean_bitfield(status, 0x04, 32,
 						    "T: Testing",
 						    "T: "));
-	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4,
+	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4, "%s",
 			    decode_boolean_bitfield(status, 0x02, 32,
 						    "A: Administratively Down",
 						    "A: "));
-	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4,
+	proto_tree_add_text(rsvp_admin_subtree, tvb, offset2, 4, "%s",
 			    decode_boolean_bitfield(status, 0x01, 32,
 						    "D: Delete In Progress",
 						    "D: "));
@@ -5172,27 +5172,27 @@ dissect_rsvp_protection_info (proto_tree *ti, proto_tree *rsvp_object_tree,
 				  "Link Flags: 0x%02x", flags);
 	rsvp_pi_flags_tree = proto_item_add_subtree(ti2,
 						    TREE(TT_PROTECTION_INFO));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x01, 8,
 						    "Extra Traffic desired",
 						    "Extra Traffic not desired"));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x02, 8,
 						    "Unprotected desired",
 						    "Unprotected not desired"));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x04, 8,
 						    "Shared desired",
 						    "Shared not desired"));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x08, 8,
 						    "Dedicated 1:1 desired",
 						    "Dedicated 1:1 not desired"));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x10, 8,
 						    "Dedicated 1+1 desired",
 						    "Dedicated 1+1 not desired"));
-	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1,
+	proto_tree_add_text(rsvp_pi_flags_tree, tvb, offset2+3, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x20, 8,
 						    "Enhanced desired",
 						    "Enhanced not desired"));
@@ -5252,11 +5252,11 @@ dissect_rsvp_fast_reroute (proto_tree *ti, proto_tree *rsvp_object_tree,
                                   "Flags: 0x%02x", flags);
         rsvp_frr_flags_tree = proto_item_add_subtree(ti2,
                                                      TREE(TT_FAST_REROUTE_FLAGS));
-	proto_tree_add_text(rsvp_frr_flags_tree, tvb, offset+7, 1,
+	proto_tree_add_text(rsvp_frr_flags_tree, tvb, offset+7, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x01, 8,
 						    "One-to-One Backup desired",
 						    "One-to-One Backup not desired"));
-	proto_tree_add_text(rsvp_frr_flags_tree, tvb, offset+7, 1,
+	proto_tree_add_text(rsvp_frr_flags_tree, tvb, offset+7, 1, "%s",
 			    decode_boolean_bitfield(flags, 0x02, 8,
 						    "Facility Backup desired",
 						    "Facility Backup not desired"));
@@ -5464,13 +5464,13 @@ dissect_rsvp_msg_tree(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
     if (pinfo->ipproto == IP_PROTO_RSVPE2EI)
 	proto_item_append_text(rsvp_tree, " (E2E-IGNORE)");
     proto_item_append_text(rsvp_tree, ": ");
-    proto_item_append_text(rsvp_tree, val_to_str(message_type, message_type_vals,
+    proto_item_append_text(rsvp_tree, "%s", val_to_str(message_type, message_type_vals,
 						 "Unknown (%u). "));
     find_rsvp_session_tempfilt(tvb, 0, &session_off, &tempfilt_off);
     if (session_off)
-	proto_item_append_text(rsvp_tree, summary_session(tvb, session_off));
+	proto_item_append_text(rsvp_tree, "%s", summary_session(tvb, session_off));
     if (tempfilt_off)
-	proto_item_append_text(rsvp_tree, summary_template(tvb, tempfilt_off));
+	proto_item_append_text(rsvp_tree, "%s", summary_template(tvb, tempfilt_off));
 
     ti = proto_tree_add_text(rsvp_tree, tvb, offset, 8, "RSVP Header. %s",
 			     val_to_str(message_type, message_type_vals,
diff --git a/epan/dissectors/packet-vines.c b/epan/dissectors/packet-vines.c
index 7666d21522..d5c49f385b 100644
--- a/epan/dissectors/packet-vines.c
+++ b/epan/dissectors/packet-vines.c
@@ -354,7 +354,7 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		 * XXX - bit 0x80 is "Normal" if 0; what is it if 1?
 		 */
 		if (is_broadcast) {
-			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1,
+			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1, "%s",
 			    decode_boolean_bitfield(viph.vip_tctl, 0x40, 1*8,
 			      "Router nodes",
 			      "All nodes"));
@@ -362,20 +362,20 @@ dissect_vines_ip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			    decode_enumerated_bitfield(viph.vip_tctl, 0x30, 1*8,
 				      class_vals, "%s"));
 		} else {
-			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1,
+			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1, "%s",
 			    decode_boolean_bitfield(viph.vip_tctl, 0x40, 1*8,
 			      "Forwarding router can handle redirect packets",
 			      "Forwarding router cannot handle redirect packets"));
-			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1,
+			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1, "%s",
 			    decode_boolean_bitfield(viph.vip_tctl, 0x20, 1*8,
 			      "Return metric notification packet",
 			      "Do not return metric notification packet"));
-			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1,
+			proto_tree_add_text(tctl_tree, tvb, offset + 4, 1, "%s",
 			    decode_boolean_bitfield(viph.vip_tctl, 0x10, 1*8,
 			      "Return exception notification packet",
 			      "Do not return exception notification packet"));
 		}
-		proto_tree_add_text(tctl_tree, tvb, offset + 4, 1,
+		proto_tree_add_text(tctl_tree, tvb, offset + 4, 1, "%s",
 		    decode_numeric_bitfield(viph.vip_tctl, 0x0F, 1*8,
 			"Hop count remaining = %u"));
 		proto_tree_add_uint(vip_tree, hf_vines_ip_protocol, tvb,
@@ -609,22 +609,22 @@ dissect_vines_ipc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			/*
 			 * XXX - do reassembly based on BOM/EOM bits.
 			 */
-			proto_tree_add_text(control_tree, tvb, offset, 1,
+			proto_tree_add_text(control_tree, tvb, offset, 1, "%s",
 			    decode_boolean_bitfield(viph.vipc_control, 0x80,
 			      1*8,
 			      "Send immediate acknowledgment",
 			      "Do not send immediate acknowledgement"));
-			proto_tree_add_text(control_tree, tvb, offset, 1,
+			proto_tree_add_text(control_tree, tvb, offset, 1, "%s",
 			    decode_boolean_bitfield(viph.vipc_control, 0x40,
 			      1*8,
 			      "End of message",
 			      "Not end of message"));
-			proto_tree_add_text(control_tree, tvb, offset, 1,
+			proto_tree_add_text(control_tree, tvb, offset, 1, "%s",
 			    decode_boolean_bitfield(viph.vipc_control, 0x20,
 			      1*8,
 			      "Beginning of message",
 			      "Not beginning of message"));
-			proto_tree_add_text(control_tree, tvb, offset, 1,
+			proto_tree_add_text(control_tree, tvb, offset, 1, "%s",
 			    decode_boolean_bitfield(viph.vipc_control, 0x10,
 			      1*8,
 			      "Abort current message",
@@ -771,19 +771,19 @@ dissect_vines_spp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 		/*
 		 * XXX - do reassembly based on BOM/EOM bits.
 		 */
-		proto_tree_add_text(control_tree, tvb, offset + 5, 1,
+		proto_tree_add_text(control_tree, tvb, offset + 5, 1, "%s",
 		    decode_boolean_bitfield(viph.vspp_control, 0x80, 1*8,
 		      "Send immediate acknowledgment",
 		      "Do not send immediate acknowledgement"));
-		proto_tree_add_text(control_tree, tvb, offset + 5, 1,
+		proto_tree_add_text(control_tree, tvb, offset + 5, 1, "%s",
 		    decode_boolean_bitfield(viph.vspp_control, 0x40, 1*8,
 		      "End of message",
 		      "Not end of message"));
-		proto_tree_add_text(control_tree, tvb, offset + 5, 1,
+		proto_tree_add_text(control_tree, tvb, offset + 5, 1, "%s",
 		    decode_boolean_bitfield(viph.vspp_control, 0x20, 1*8,
 		      "Beginning of message",
 		      "Not beginning of message"));
-		proto_tree_add_text(control_tree, tvb, offset + 5, 1,
+		proto_tree_add_text(control_tree, tvb, offset + 5, 1, "%s",
 		    decode_boolean_bitfield(viph.vspp_control, 0x10, 1*8,
 		      "Abort current message",
 		      "Do not abort current message"));
@@ -1192,19 +1192,19 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 			subtree = proto_item_add_subtree(ti,
 			    ett_vines_rtp_compatibility_flags);
 			proto_tree_add_text(subtree, tvb,
-			    offset, 1,
+			    offset, 1, "%s",
 			    decode_boolean_bitfield(compatibility_flags,
 			      0x04, 1*8,
 			      "Auto-configured non-Vines-reachable neighbor router",
 			      "Not an auto-configured non-Vines-reachable neighbor router"));
 			proto_tree_add_text(subtree, tvb,
-			    offset, 1,
+			    offset, 1, "%s",
 			    decode_boolean_bitfield(compatibility_flags,
 			      0x02, 1*8,
 			      "Not all neighbor routers support Sequenced RTP",
 			      "All neighbor routers support Sequenced RTP"));
 			proto_tree_add_text(subtree, tvb,
-			    offset, 1,
+			    offset, 1, "%s",
 			    decode_boolean_bitfield(compatibility_flags,
 			      0x01, 1*8,
 			      "Sequenced RTP version mismatch",
@@ -1239,32 +1239,32 @@ dissect_vines_rtp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 				subtree = proto_item_add_subtree(ti,
 				    ett_vines_rtp_control_flags);
 				proto_tree_add_text(subtree, tvb,
-				    offset, 1,
+				    offset, 1, "%s",
 				    decode_boolean_bitfield(control_flags,
 				      0x10, 1*8,
 				      "Part of routing table synchronization broadcast",
 				      "Not part of routing table synchronization broadcast"));
 				proto_tree_add_text(subtree, tvb,
-				    offset, 1,
+				    offset, 1, "%s",
 				    decode_boolean_bitfield(control_flags,
 				      0x08, 1*8,
 				      "Part of full topology update",
 				      "Not part of full topology update"));
 				proto_tree_add_text(subtree, tvb,
-				    offset, 1,
+				    offset, 1, "%s",
 				    decode_boolean_bitfield(control_flags,
 				      0x04, 1*8,
 				      "Contains info specifically requested or network changes",
 				      "Not a response to a specific request"));
 				/* XXX - need reassembly? */
 				proto_tree_add_text(subtree, tvb,
-				    offset, 1,
+				    offset, 1, "%s",
 				    decode_boolean_bitfield(control_flags,
 				      0x02, 1*8,
 				      "End of message",
 				      "Not end of message"));
 				proto_tree_add_text(subtree, tvb,
-				    offset, 1,
+				    offset, 1, "%s",
 				    decode_boolean_bitfield(control_flags,
 				      0x01, 1*8,
 				      "Beginning of message",
@@ -1417,15 +1417,15 @@ rtp_show_machine_type(proto_tree *tree, tvbuff_t *tvb, int offset, const char *t
 	    tag == NULL ? "" : " ",
 	    machine_type);
 	subtree = proto_item_add_subtree(ti, ett_vines_rtp_mtype);
-	proto_tree_add_text(subtree, tvb, offset, 1,
+	proto_tree_add_text(subtree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(machine_type, 0x04, 1*8,
 	      "Sequenced RTP supported",
 	      "Sequenced RTP not supported"));
-	proto_tree_add_text(subtree, tvb, offset, 1,
+	proto_tree_add_text(subtree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(machine_type, 0x02, 1*8,
 	      "TCP/IP supported",
 	      "TCP/IP not supported"));
-	proto_tree_add_text(subtree, tvb, offset, 1,
+	proto_tree_add_text(subtree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(machine_type, 0x01, 1*8,
 	      "Fast bus",
 	      "Slow bus"));
@@ -1442,19 +1442,19 @@ rtp_show_flags(proto_tree *tree, tvbuff_t *tvb, int offset, const char *tag)
 	ti = proto_tree_add_text(tree, tvb, offset, 1, "%s Flags: 0x%02x",
 	    tag, flags);
 	flags_tree = proto_item_add_subtree(ti, ett_vines_rtp_flags);
-	proto_tree_add_text(flags_tree, tvb, offset, 1,
+	proto_tree_add_text(flags_tree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(flags, 0x08, 1*8,
 	      "Network doesn't support Sequenced RTP",
 	      "Network supports Sequenced RTP"));
-	proto_tree_add_text(flags_tree, tvb, offset, 1,
+	proto_tree_add_text(flags_tree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(flags, 0x04, 1*8,
 	      "Network accessed point-to-point on non-Vines network",
 	      "Network not accessed point-to-point on non-Vines network"));
-	proto_tree_add_text(flags_tree, tvb, offset, 1,
+	proto_tree_add_text(flags_tree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(flags, 0x02, 1*8,
 	      "Data link to network uses point-to-point connection",
 	      "Data link to network doesn't use point-to-point connection"));
-	proto_tree_add_text(flags_tree, tvb, offset, 1,
+	proto_tree_add_text(flags_tree, tvb, offset, 1, "%s",
 	    decode_boolean_bitfield(flags, 0x01, 1*8,
 	      "Network accessed across broadcast medium",
 	      "Network not accessed across broadcast medium"));
diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c
index 6eb705877e..4392e712fe 100644
--- a/epan/dissectors/packet-x25.c
+++ b/epan/dissectors/packet-x25.c
@@ -704,7 +704,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 		    else
 			proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
 				"00.. .... = Fast select not requested");
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_boolean_bitfield(byte1, 0x01, 1*8,
 				"Reverse charging requested",
 				"Reverse charging not requested"));
@@ -718,7 +718,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 		    byte1 = tvb_get_guint8(tvb, *offset + 1);
 		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
 			    "Parameter : %02X", byte1);
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_boolean_bitfield(byte1, 0x01, 1*8,
 				"Charging information requested",
 				"Charging information not requested"));
@@ -756,7 +756,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 		    default:
 			g_snprintf(tmpbuf, 80, "From the called DTE : %%u (Reserved)");
 		    }
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_numeric_bitfield(byte1, 0xF0, 1*8, tmpbuf));
 		    switch (byte1 & 0x0F)
 		    {
@@ -781,7 +781,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 		    default:
 			g_snprintf(tmpbuf, 80, "From the calling DTE : %%u (Reserved)");
 		    }
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_numeric_bitfield(byte1, 0x0F, 1*8, tmpbuf));
 		}
 		break;
@@ -904,7 +904,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 			g_snprintf(tmpbuf, 80, "From the called DTE : %%u (Unknown)");
 			break;
 		    }
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_numeric_bitfield(byte1, 0x0F, 1*8, tmpbuf));
 
 		    byte2 = tvb_get_guint8(tvb, *offset + 2);
@@ -941,7 +941,7 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 			g_snprintf(tmpbuf, 80, "From the calling DTE : %%u (Unknown)");
 			break;
 		    }
-		    proto_tree_add_text(fac_subtree, tvb, *offset+2, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+2, 1, "%s",
 			    decode_numeric_bitfield(byte2, 0x0F, 1*8, tmpbuf));
 		}
 		break;
@@ -950,10 +950,10 @@ dump_facilities(proto_tree *tree, int *offset, tvbuff_t *tvb)
 		    ti = proto_tree_add_text(fac_tree, tvb, *offset, 1, "Code : %02X "
 			    "(Window size)", fac);
 		    fac_subtree = proto_item_add_subtree(ti, ett_x25_fac_window_size);
-		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+1, 1, "%s",
 			    decode_numeric_bitfield(tvb_get_guint8(tvb, *offset+1),
 				0x7F, 1*8, "From the called DTE: %u"));
-		    proto_tree_add_text(fac_subtree, tvb, *offset+2, 1,
+		    proto_tree_add_text(fac_subtree, tvb, *offset+2, 1, "%s",
 			    decode_numeric_bitfield(tvb_get_guint8(tvb, *offset+2),
 				0x7F, 1*8, "From the calling DTE: %u"));
 		}
@@ -1393,12 +1393,12 @@ x25_ntoa(proto_tree *tree, int *offset, tvbuff_t *tvb,
     len2 = (byte >> 4) & 0x0F;
 
     if (tree) {
-	proto_tree_add_text(tree, tvb, *offset, 1,
+	proto_tree_add_text(tree, tvb, *offset, 1, "%s",
 		decode_numeric_bitfield(byte, 0xF0, 1*8,
 			is_registration ?
 		          "DTE address length : %u" :
 		          "Calling address length : %u"));
-	proto_tree_add_text(tree, tvb, *offset, 1,
+	proto_tree_add_text(tree, tvb, *offset, 1, "%s",
 		decode_numeric_bitfield(byte, 0x0F, 1*8,
 			is_registration ?
 		          "DCE address length : %u" :