/* 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) {
/* 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) */
/* 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);
/* 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) {
/* 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) */
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) {
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)
if (str == NULL)
{
proto_tree_add_text(tree, tvb, offset, 1,
- str2);
+ "%s", str2);
}
else
{
}
proto_tree_add_text(tree, tvb, offset, 1,
- str);
+ "%s", str);
}
static void
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);
}
}
proto_tree_add_text(tree, tvb, offset, 1,
- str);
+ "%s", str);
}
static void
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);
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);
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);
}
proto_tree_add_text(tree, tvb, curr_offset, len,
- str);
+ "%s", str);
}
else
{
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);
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 */
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;
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);
}
/* 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) {
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"));
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"));
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;
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 *
};
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
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);
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
{
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
{
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;
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"));
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 ) );
}
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) {
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); \
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);
}
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,
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);
}
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);
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);
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);
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;
}
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);
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)
{
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]);
if (comma_needed) {
proto_item_append_text(item, ", ");
}
- proto_item_append_text(item, text);
+ proto_item_append_text(item, "%s", text);
return TRUE;
}
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);
}
/*****************************************************************/
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 */
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:
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) {
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) {
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);