osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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

svn path=/trunk/; revision=26652
This commit is contained in:
Stig Bjørlykke 2008-10-31 17:27:51 +00:00
parent 41c04a5599
commit 94e9e2b1ec
21 changed files with 167 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asn1/ros/packet-ros-template.c
View File

@ -195,7 +195,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);

4
epan/dissectors/packet-ros.c
View File

@ -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);

2
epan/dissectors/packet-ros.h
View File

@ -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 */

154
epan/dissectors/packet-rsvp.c
View File

@ -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,

56
epan/dissectors/packet-vines.c
View File

@ -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"));

20
epan/dissectors/packet-x25.c
View File

@ -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" :

2
plugins/asn1/packet-asn1.c
View File

@ -4147,7 +4147,7 @@ showstack(statestack *pos, char *txt, int n)
p->node, stype, rep, chs, done, ref, pop, chr, rch, sch, con,
p->name, p->offset);
}
g_message(buf);
g_message("%s", buf);
}
#if 0

26
plugins/ethercat/packet-ecatmb.c
View File

@ -620,11 +620,11 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
CANopenNumberFormatter(&coe, szText, nMax);
anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_number, tvb, offset, ETHERCAT_COE_HEADER_LEN, coe.v.Number);
proto_item_set_text(anItem, szText);
proto_item_set_text(anItem, "%s", szText);
CANopenTypeFormatter(&coe, szText, nMax);
anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_type, tvb, offset, ETHERCAT_COE_HEADER_LEN, coe.v.Type);
proto_item_set_text(anItem, szText);
proto_item_set_text(anItem, "%s", szText);
}
offset += ETHERCAT_COE_HEADER_LEN;
@ -650,10 +650,10 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
proto_item_append_text(aparent, szText);
proto_item_append_text(aparent, "%s", szText);
anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_sdoreq, tvb, offset, 1, sdo.anSdoHeaderUnion.Idq.Ccs);
proto_item_set_text(anItem, szText);
proto_item_set_text(anItem, "%s", szText);
ecat_sdo_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_sdo);
switch ( sdo.anSdoHeaderUnion.Idq.Ccs )
@ -742,7 +742,7 @@ static void dissect_ecat_coe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
if( tree )
{
anItem = proto_tree_add_uint(ecat_coe_tree, hf_ecat_mailbox_coe_sdores, tvb, offset, 1, sdo.anSdoHeaderUnion.Ids.Scs);
proto_item_set_text(anItem, szText);
proto_item_set_text(anItem, "%s", szText);
ecat_sdo_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_sdo);
switch ( sdo.anSdoHeaderUnion.Ids.Scs )
@ -959,8 +959,8 @@ static void dissect_ecat_soe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
ETHERCAT_SOE_HEADER soe;
init_soe_header(&soe, tvb, offset);
proto_item_append_text(aparent, szText);
proto_item_set_text(anItem, szText);
proto_item_append_text(aparent, "%s", szText);
proto_item_set_text(anItem, "%s", szText);
ecat_soe_tree = proto_item_add_subtree(anItem, ett_ecat_mailbox_soe);
anItem = proto_tree_add_item(ecat_soe_tree, hf_ecat_mailbox_soe_header, tvb, offset , 2, TRUE);
@ -1065,26 +1065,26 @@ static void dissect_ecat_eoe(tvbuff_t *tvb, gint offset, packet_info *pinfo, pro
anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_type, tvb, offset, 4, eoe.anEoeHeaderInfoUnion.v.Type);
EoETypeFormatter(&eoe, szText, nMax);
proto_item_set_text(anItem,szText);
proto_item_set_text(anItem, "%s", szText);
switch ( eoe.anEoeHeaderInfoUnion.v.Type )
{
case EOE_TYPE_FRAME_FRAG:
anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_fragno, tvb, offset, 4, eoe.anEoeHeaderDataUnion.v.Fragment);
EoEFragNoFormatter(&eoe, szText, nMax);
proto_item_set_text(anItem,szText);
proto_item_set_text(anItem, "%s", szText);
anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_offset, tvb, offset, 4, 32*eoe.anEoeHeaderDataUnion.v.OffsetBuffer);
EoEOffsetFormatter(&eoe, szText, nMax);
proto_item_set_text(anItem,szText);
proto_item_set_text(anItem, "%s", szText);
anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_frame, tvb, offset, 4, eoe.anEoeHeaderDataUnion.v.FrameNo);
EoEFrameFormatter(&eoe, szText, nMax);
proto_item_set_text(anItem,szText);
proto_item_set_text(anItem, "%s", szText);
anItem = proto_tree_add_uint(ecat_fraghead_tree, hf_ecat_mailbox_eoe_last, tvb, offset, 4, eoe.anEoeHeaderInfoUnion.v.LastFragment);
EoELastFormatter(&eoe, szText, nMax);
proto_item_set_text(anItem,szText);
proto_item_set_text(anItem, "%s", szText);
if ( eoe.anEoeHeaderInfoUnion.v.TimeStampRequested )
{
@ -1350,7 +1350,7 @@ static void dissect_ecat_mailbox(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
/* Add type information to the mailbox header */
MailboxTypeFormatter(&hdr, szText, nMax);
proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, szText);
proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, "%s", szText);
/* Add counter information to the mailbox header */
proto_tree_add_text(ecat_mailbox_header_tree, tvb, offset, 1, "Counter : %d",hdr.aControlUnion.v.Counter);

2
plugins/ethercat/packet-ethercat-datagram.c
View File

@ -541,7 +541,7 @@ static void dissect_ecat_datagram(tvbuff_t *tvb, packet_info *pinfo, proto_tree
{
/* Create the sub tree for the current datagram */
EcSubFormatter(tvb, suboffset, szText, nMax);
aitem = proto_tree_add_text(ecat_datagrams_tree, tvb, suboffset, subsize, szText);
aitem = proto_tree_add_text(ecat_datagrams_tree, tvb, suboffset, subsize, "%s", szText);
ecat_datagram_tree = proto_item_add_subtree(aitem, ett_ecat_datagram_subtree);
/* Create a subtree placeholder for the Header */

4
plugins/ethercat/packet-nv.c
View File

@ -134,7 +134,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti= proto_tree_add_item(nv_header_tree, hf_nv_publisher, tvb, offset, sizeof(guint8)*6, TRUE);
NvPublisherFormater(tvb, offset, szText, nMax);
proto_item_set_text(ti, szText);
proto_item_set_text(ti, "%s", szText);
offset+=(sizeof(guint8)*6);
ti= proto_tree_add_item(nv_header_tree, hf_nv_count, tvb, offset, sizeof(guint16), TRUE);
@ -150,7 +150,7 @@ static void dissect_nv(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
ti = proto_tree_add_item(nv_tree, hf_nv_variable, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len+var_length, TRUE);
NvVarHeaderFormater(tvb, offset, szText, nMax);
proto_item_set_text(ti, szText);
proto_item_set_text(ti, "%s", szText);
nv_var_tree = proto_item_add_subtree(ti, ett_nv_var);
ti = proto_tree_add_item(nv_var_tree, hf_nv_varheader, tvb, offset, ETYPE_88A4_NV_DATA_HEADER_Len, TRUE);

4
plugins/irda/packet-ircomm.c
View File

@ -303,7 +303,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
g_strlcat(buf, ")", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -318,7 +318,7 @@ static gboolean dissect_ircomm_parameters(tvbuff_t* tvb, unsigned offset, packet
g_strlcat(buf, ")", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;

19
plugins/irda/packet-irda.c
View File

@ -828,8 +828,7 @@ static void dissect_iap_result(tvbuff_t* tvb, packet_info* pinfo, proto_tree* ro
}
ti = proto_tree_add_item(tree, hf_iap_list_entry, tvb, offset, 2 + 1 + attr_len, FALSE);
g_snprintf(buf, sizeof(buf) - 1, "%d", n + 1);
proto_item_append_text(ti, buf);
proto_item_append_text(ti, "%d", n + 1);
entry_tree = proto_item_add_subtree(ti, ett_iap_entry[n]);
proto_tree_add_item(entry_tree, hf_iap_obj_id, tvb, offset, 2, FALSE);
@ -1325,7 +1324,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " bps)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1343,7 +1342,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " ms)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1365,7 +1364,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " bytes)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1389,7 +1388,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " frame window)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1415,7 +1414,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " additional BOFs at 115200)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1441,7 +1440,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " ms)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1467,7 +1466,7 @@ static unsigned dissect_negotiation(tvbuff_t* tvb, proto_tree* tree, unsigned of
g_strlcat(buf, " s)", 256);
proto_item_append_text(ti, buf+2);
proto_item_append_text(ti, "%s", buf+2);
break;
@ -1620,7 +1619,7 @@ static void dissect_xid(tvbuff_t* tvb, packet_info* pinfo, proto_tree* root, pro
service_hints[0] = ' ';
service_hints[1] = '(';
proto_item_append_text(ti, service_hints);
proto_item_append_text(ti, "%s", service_hints);
}
}
offset += hints_len;

2
plugins/m2m/packet-m2m.c
View File

@ -463,7 +463,7 @@ static void dissect_m2m(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* get the TLV value offset */
tlv_offset = get_tlv_value_offset(&m2m_tlv_info);
/* display TLV type */
ti = proto_tree_add_protocol_format(m2m_tree, proto_m2m, tvb, offset, (tlv_len + tlv_offset), val_to_str(tlv_type, tlv_name, "Unknown TLV"));
ti = proto_tree_add_protocol_format(m2m_tree, proto_m2m, tvb, offset, (tlv_len + tlv_offset), "%s", val_to_str(tlv_type, tlv_name, "Unknown TLV"));
/* add TLV subtree */
tlv_tree = proto_item_add_subtree(ti, ett_m2m_tlv);
/* update the offset */

2
plugins/mate/mate_util.c
View File

@ -63,7 +63,7 @@ void dbg_print(const gint* which, gint how, FILE* where, const gchar* fmt, ... )
va_end( list );
if (! where) {
g_message(debug_buffer);
g_message("%s", debug_buffer);
} else {
fputs(debug_buffer,where);
fputs("\n",where);

4
plugins/opcua/opcua_simpletypes.c
View File

@ -615,7 +615,7 @@ void parseVariant(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, char *szFieldN
void parseArraySimple(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfIndex, fctSimpleTypeParser pParserFunction)
{
char szFieldName[] = "Array of Simple Type";
proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, szFieldName);
proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, "%s", szFieldName);
proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_array);
int i;
gint32 iLen;
@ -641,7 +641,7 @@ void parseArraySimple(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, int hfInde
void parseArrayEnum(proto_tree *tree, tvbuff_t *tvb, gint *pOffset, fctEnumParser pParserFunction)
{
char szFieldName[] = "Array of Enum Type";
proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, szFieldName);
proto_item *ti = proto_tree_add_text(tree, tvb, 0, -1, "%s", szFieldName);
proto_tree *subtree = proto_item_add_subtree(ti, ett_opcua_array);
int i;
gint32 iLen;

2
plugins/profinet/packet-pn-rt.c
View File

@ -352,7 +352,7 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* update column info now */
if (check_col(pinfo->cinfo, COL_INFO))
col_add_fstr(pinfo->cinfo, COL_INFO, szFieldSummary);
col_add_str(pinfo->cinfo, COL_INFO, szFieldSummary);
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_add_str(pinfo->cinfo, COL_PROTOCOL, pszProtShort);

2
plugins/profinet/packet-pn.c
View File

@ -274,7 +274,7 @@ void
pn_append_info(packet_info *pinfo, proto_item *dcp_item, const char *text)
{
if (check_col(pinfo->cinfo, COL_INFO))
col_append_fstr(pinfo->cinfo, COL_INFO, text);
col_append_str(pinfo->cinfo, COL_INFO, text);
proto_item_append_text(dcp_item, "%s", text);
}

6
plugins/sercosiii/packet-sercosiii_1v1_at.c
View File

@ -51,12 +51,12 @@ void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
char devices[]="Recognized Devices"; /* fixme: it would be nice to have this as subtree */
static char outbuf[200];
proto_tree_add_text(tree, tvb, 0, 1024, devices);
proto_tree_add_text(tree, tvb, 0, 1024, "%s", devices);
/* check sequence count field */
seqcnt = tvb_get_letohs(tvb, 0);
g_snprintf(outbuf, sizeof(outbuf), "Number of Devices: %u", (0x1FF & seqcnt)-1);
proto_tree_add_text(tree, tvb, 0, 2, outbuf);
proto_tree_add_text(tree, tvb, 0, 2, "%s", outbuf);
/* check SERCOS address of each topology field */
for(i=1;i < MAX_SERCOS_DEVICES; ++i)
@ -75,7 +75,7 @@ void dissect_siii_at_cp0(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree
{
g_snprintf(outbuf, sizeof(outbuf), "Device Address %u: %u", i, tfield);
}
proto_tree_add_text(tree, tvb, i*2, 2, outbuf);
proto_tree_add_text(tree, tvb, i*2, 2, "%s", outbuf);
}
}

8
plugins/unistim/packet-unistim.c
View File

@ -2575,7 +2575,7 @@ set_ascii_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len){
#define MAX_BUFFER 1024
buffer=ep_alloc(MAX_BUFFER);
g_snprintf(buffer,MAX_BUFFER,label);
g_snprintf(buffer,MAX_BUFFER,"%s",label);
buffer_index=strlen(label);
while((buffer_index<MAX_BUFFER-2)&&(msg_index<msg_len)){
@ -2597,7 +2597,7 @@ set_ascii_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint msg_len){
}
buffer[buffer_index]='\0';
proto_tree_add_text(msg_tree,tvb,offset,msg_len,buffer);
proto_tree_add_text(msg_tree,tvb,offset,msg_len,"%s",buffer);
}
static void
@ -2609,7 +2609,7 @@ set_ascii_null_term_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint m
#define MAX_BUFFER 1024
buffer=ep_alloc(MAX_BUFFER);
g_snprintf(buffer,MAX_BUFFER,label);
g_snprintf(buffer,MAX_BUFFER,"%s",label);
buffer_index=strlen(label);
while((buffer_index<MAX_BUFFER-2)&&(msg_index<msg_len)){
@ -2633,6 +2633,6 @@ set_ascii_null_term_item(proto_tree *msg_tree,tvbuff_t *tvb, gint offset,guint m
}
buffer[buffer_index]='\0';
proto_tree_add_text(msg_tree,tvb,offset,msg_len,buffer);
proto_tree_add_text(msg_tree,tvb,offset,msg_len,"%s",buffer);
}

4
plugins/v5ua/packet-v5ua.c
View File

@ -1517,7 +1517,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_
switch(iua_version){
case RFC:
parameter_item = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
parameter_item = proto_tree_add_text(v5ua_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_v5ua_parameter);
@ -1527,7 +1527,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *v5ua_
case DRAFT:
default:
parameter_item = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
parameter_item = proto_tree_add_text(v5ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s",
val_to_str(tag, parameter_tag_draft_values, "Unknown parameter"));
parameter_tree = proto_item_add_subtree(parameter_item, ett_v5ua_parameter);

10
plugins/wimaxasncp/packet-wimaxasncp.c
View File

@ -1468,18 +1468,18 @@ static void wimaxasncp_dissect_tlv_value(
/* Add code and type to info column */
if (check_col(pinfo->cinfo, COL_INFO))
{
col_append_fstr(pinfo->cinfo, COL_INFO, " [");
col_append_fstr(pinfo->cinfo, COL_INFO,
col_append_str(pinfo->cinfo, COL_INFO, " [");
col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)"));
if (eap_code == EAP_REQUEST || eap_code == EAP_RESPONSE)
{
col_append_fstr(pinfo->cinfo, COL_INFO, ", ");
col_append_fstr(pinfo->cinfo, COL_INFO,
col_append_str(pinfo->cinfo, COL_INFO, ", ");
col_append_str(pinfo->cinfo, COL_INFO,
val_to_str(eap_type, eap_type_vals, "Unknown type (0x%02X)"));
}
col_append_fstr(pinfo->cinfo, COL_INFO, "]");
col_append_str(pinfo->cinfo, COL_INFO, "]");
}