diff options
-rw-r--r-- | epan/dissectors/packet-ncp2222.inc | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-osi-options.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-ospf.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-pcep.c | 32 | ||||
-rw-r--r-- | epan/dissectors/packet-per.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-ppi.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-quake.c | 12 | ||||
-rw-r--r-- | epan/dissectors/packet-rpl.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtcp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rtps.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-rtps2.c | 10 | ||||
-rw-r--r-- | epan/dissectors/packet-ses.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-skinny.c | 16 | ||||
-rw-r--r-- | epan/dissectors/packet-smb-pipe.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sna.c | 6 | ||||
-rw-r--r-- | epan/dissectors/packet-ssh.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-sua.c | 4 | ||||
-rw-r--r-- | epan/dissectors/packet-tpncp.c | 4 |
18 files changed, 63 insertions, 63 deletions
diff --git a/epan/dissectors/packet-ncp2222.inc b/epan/dissectors/packet-ncp2222.inc index 852a4f5f3c..fa0840c7f4 100644 --- a/epan/dissectors/packet-ncp2222.inc +++ b/epan/dissectors/packet-ncp2222.inc @@ -2216,7 +2216,7 @@ process_struct_sub_ptvc_record(ptvcursor_t *ptvc, const ptvc_record *rec, old_tree = ptvcursor_tree(ptvc); offset = ptvcursor_current_offset(ptvc); item = proto_tree_add_text(old_tree, ptvcursor_tvbuff(ptvc), - offset, PROTO_LENGTH_UNTIL_END, + offset, PROTO_LENGTH_UNTIL_END, "%s", rec->sub_ptvc_rec->descr); new_tree = proto_item_add_subtree(item, ett); ptvcursor_set_tree(ptvc, new_tree); diff --git a/epan/dissectors/packet-osi-options.c b/epan/dissectors/packet-osi-options.c index f4b4c1a040..43be18ed1d 100644 --- a/epan/dissectors/packet-osi-options.c +++ b/epan/dissectors/packet-osi-options.c @@ -180,33 +180,33 @@ dissect_option_qos( const guchar type, const guchar sub_type, int offset, tmp_type = sub_type & OSI_OPT_QOS_SUB_RSVD; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type & OSI_OPT_QOS_SUB_SEQ_VS_TRS; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type &OSI_OPT_QOS_SUB_CONG_EXPED; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type & OSI_OPT_QOS_SUB_TSD_VS_COST; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type & OSI_OPT_QOS_SUB_RESERR_TRS; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } tmp_type = sub_type & OSI_OPT_QOS_SUB_RESERR_COST; if ( tmp_type ) { - proto_tree_add_text( osi_qos_tree, tvb, offset, len, + proto_tree_add_text( osi_qos_tree, tvb, offset, len, "%s", val_to_str( tmp_type, osi_opt_qos_sub_vals, "Unknown (0x%x)") ); } } diff --git a/epan/dissectors/packet-ospf.c b/epan/dissectors/packet-ospf.c index 8c43dc9f2d..7187a33ee6 100644 --- a/epan/dissectors/packet-ospf.c +++ b/epan/dissectors/packet-ospf.c @@ -1526,7 +1526,7 @@ dissect_ospfv2_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree) type = tvb_get_ntohs(tvb, offset); length = tvb_get_ntohs(tvb, offset + 2); - ti = proto_tree_add_text(tree, tvb, offset, length + 4, + ti = proto_tree_add_text(tree, tvb, offset, length + 4, "%s", val_to_str(type, lls_tlv_type_vals, "Unknown TLV")); ospf_lls_tlv_tree = proto_item_add_subtree(ti, ett_ospf_lls_tlv); @@ -1595,7 +1595,7 @@ dissect_ospfv3_lls_tlv(tvbuff_t *tvb, int offset, proto_tree *tree) offset, length + 4, FALSE); break; default: - ti = proto_tree_add_text(tree, tvb, offset, length + 4, + ti = proto_tree_add_text(tree, tvb, offset, length + 4, "%s", val_to_str(type, lls_v3_tlv_type_vals, "Unknown TLV")); } diff --git a/epan/dissectors/packet-pcep.c b/epan/dissectors/packet-pcep.c index 39f41930e0..c907f9fa1b 100644 --- a/epan/dissectors/packet-pcep.c +++ b/epan/dissectors/packet-pcep.c @@ -734,7 +734,7 @@ dissect_subobj_ipv4(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int case PCEP_EXPLICIT_ROUTE_OBJ: l = (l_and_or_type& Mask_L)>>7; - proto_tree_add_text(pcep_subobj_ipv4, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_ipv4, tvb, offset, 1, "%s",val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_uint(pcep_subobj_ipv4, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+2, 4, "IPv4 Address: (%s)", ip_to_str(tvb_get_ptr(tvb, offset+2, 4))); @@ -769,7 +769,7 @@ dissect_subobj_ipv4(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+2, 4, "IPv4 Address: (%s)", ip_to_str(tvb_get_ptr(tvb, offset+2, 4))); proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+6, 1, "Prefix Length: %u", prefix_length); - proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+7, 1, val_to_str(resvd, pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); + proto_tree_add_text(pcep_subobj_ipv4, tvb, offset+7, 1, "%s",val_to_str(resvd, pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); break; default: @@ -802,7 +802,7 @@ dissect_subobj_ipv6(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int switch(obj_class){ case PCEP_EXPLICIT_ROUTE_OBJ: l = (l_and_or_type& Mask_L)>>7; - proto_tree_add_text(pcep_subobj_ipv6, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_ipv6, tvb, offset, 1, "%s",val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_uint(pcep_subobj_ipv6, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+2, 16, "IPv6 Address: %s", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset+2, 16))); @@ -836,7 +836,7 @@ dissect_subobj_ipv6(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+2, 16, "IPv6 Address: %s", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(tvb, offset+2, 16))); proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+18, 1, "Prefix Length: %u", prefix_length); - proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+19, 1, val_to_str(resv, pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); + proto_tree_add_text(pcep_subobj_ipv6, tvb, offset+19, 1, "%s", val_to_str(resv, pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); break; default: @@ -873,11 +873,11 @@ dissect_subobj_label_control(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int case PCEP_EXPLICIT_ROUTE_OBJ: l = (l_and_or_type& Mask_L)>>7; - proto_tree_add_text(pcep_subobj_label_control, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_label_control, tvb, offset, 1, "%s", val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_uint(pcep_subobj_label_control, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_label_control, tvb, offset+1, 1, "Length: %u", length); u = (u_reserved & 0x80)>>7; - proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, val_to_str(u, pcep_route_u_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, "%s", val_to_str(u, pcep_route_u_obj_vals, "Unknown Object (%u). ")); proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, "Reserved: %u", (u_reserved & 0x7f)); proto_tree_add_text(pcep_subobj_label_control, tvb, offset+3, 1, "C-Type: %u", c_type); proto_tree_add_text(pcep_subobj_label_control, tvb, offset+4, length-4, "Label: %s", @@ -888,7 +888,7 @@ dissect_subobj_label_control(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int proto_tree_add_uint(pcep_subobj_label_control, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, l_and_or_type); proto_tree_add_text(pcep_subobj_label_control, tvb, offset+1, 1, "Length: %u", length); u = (u_reserved & 0x80)>>7; - proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, val_to_str(u, pcep_route_u_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, "%s", val_to_str(u, pcep_route_u_obj_vals, "Unknown Object (%u). ")); ti = proto_tree_add_text(pcep_subobj_label_control, tvb, offset+2, 1, "Flags: 0x%02x ", (u_reserved & 0x7f)); pcep_subobj_label_flags = proto_item_add_subtree(ti, ett_pcep_obj); @@ -932,7 +932,7 @@ dissect_subobj_unnumb_interfaceID(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i case PCEP_EXPLICIT_ROUTE_OBJ: l = (l_and_or_type& Mask_L)>>7; - proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset, 1, "%s", val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_uint(pcep_subobj_unnumb_interfaceID, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset+2, 2, "Reserved: 0x%04x", reserved_flags); @@ -961,7 +961,7 @@ dissect_subobj_unnumb_interfaceID(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset, 1, "X: %x", (l_and_or_type & 0x01)>>7); proto_tree_add_uint(pcep_subobj_unnumb_interfaceID, pcep_filter[PCEPF_SUBOBJ_XRO], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset+2, 1, "Reserved: 0x%02x", (reserved_flags & 0xff00)>>4); - proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset+3, 1, val_to_str((reserved_flags & 0x00ff), pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); + proto_tree_add_text(pcep_subobj_unnumb_interfaceID, tvb, offset+3, 1, "%s", val_to_str((reserved_flags & 0x00ff), pcep_xro_atribute_obj_vals, "Unknown Atribute (%u). ")); break; default: @@ -1005,7 +1005,7 @@ dissect_subobj_autonomous_sys_num(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+2, 1, "Reserved: 0x%02x", reserved); - proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+3, 1, val_to_str(attribute, pcep_xro_atribute_obj_vals, "Unknown Object (%u).")); + proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+3, 1, "%s", val_to_str(attribute, pcep_xro_atribute_obj_vals, "Unknown Object (%u).")); proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+4, 2, "Optional AS Number High Octets: 0x%04x", AS_number); proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+6, 2, "AS Number: 0x%04x", AS_number); } else { @@ -1023,7 +1023,7 @@ dissect_subobj_autonomous_sys_num(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, i if(obj_class == PCEP_IRO_OBJ) proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset, 1, "l: %x", (l_and_or_type & 0x80)>>7); else - proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset, 1, "%s", val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_uint(pcep_subobj_autonomous_sys_num, pcep_filter[PCEPF_SUBOBJ], tvb, offset, 1, (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+1, 1, "Length: %u", length); proto_tree_add_text(pcep_subobj_autonomous_sys_num, tvb, offset+2, 2, "AS Number: 0x%04x", AS_number); @@ -1058,7 +1058,7 @@ dissect_subobj_srlg(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, gui proto_tree_add_text(pcep_subobj_srlg, tvb, offset+2, 4, "SRLG ID: 0x%08x", srlg_id); proto_tree_add_text(pcep_subobj_srlg, tvb, offset+6, 1, "Reserved: 0x%02x", reserved); - proto_tree_add_text(pcep_subobj_srlg, tvb, offset+7, 1, val_to_str(attribute, pcep_xro_atribute_obj_vals, "Unknown Object (%u).")); + proto_tree_add_text(pcep_subobj_srlg, tvb, offset+7, 1, "%s", val_to_str(attribute, pcep_xro_atribute_obj_vals, "Unknown Object (%u).")); } static void @@ -1083,7 +1083,7 @@ dissect_subobj_exrs(proto_tree *pcep_subobj_tree, tvbuff_t *tvb, int offset, int } l = (l_and_or_type& Mask_L)>>7; - proto_tree_add_text(pcep_subobj_exrs, tvb, offset, 1, val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_subobj_exrs, tvb, offset, 1, "%s", val_to_str(l, pcep_route_l_obj_vals, "Unknown Object (%u). ")); proto_tree_add_text(pcep_subobj_exrs, tvb, offset, 1, "Type: %u", (l_and_or_type & 0x7f)); proto_tree_add_text(pcep_subobj_exrs, tvb, offset+1, 1, "Length: %u", length); @@ -1247,7 +1247,7 @@ dissect_pcep_no_path_obj(proto_tree *pcep_object_tree, } ni = tvb_get_guint8(tvb, offset2); - proto_tree_add_text(pcep_object_tree, tvb, offset2, 1, val_to_str(ni, pcep_no_path_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_object_tree, tvb, offset2, 1, "%s", val_to_str(ni, pcep_no_path_obj_vals, "Unknown Object (%u). ")); flags = tvb_get_ntohs(tvb, offset2+1); ti = proto_tree_add_text(pcep_object_tree, tvb, offset2+1, 2, "Flags: 0x%04x", flags); @@ -1363,7 +1363,7 @@ dissect_pcep_metric_obj(proto_tree *pcep_object_tree, proto_tree_add_boolean(pcep_metric_obj_flags, pcep_metric_flags_b, tvb, offset2+2, 1, flags); metric_type = tvb_get_guint8(tvb, offset2+3); - proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, val_to_str(metric_type, pcep_metric_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, "%s", val_to_str(metric_type, pcep_metric_obj_vals, "Unknown Object (%u). ")); metric_value = tvb_get_ntohl(tvb, offset2+4); proto_tree_add_text(pcep_object_tree, tvb, offset2+4, 4, "Metric Value: 0x%x", metric_value); @@ -1914,7 +1914,7 @@ dissect_pcep_close_obj(proto_tree *pcep_object_tree, tvbuff_t *tvb, int offset2, proto_tree_add_text(pcep_object_tree, tvb, offset2+2, 1, "Flags: 0x%02x", flags); reason = tvb_get_guint8(tvb, offset2+3); - proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, val_to_str(reason, pcep_close_reason_obj_vals, "Unknown Object (%u). ")); + proto_tree_add_text(pcep_object_tree, tvb, offset2+3, 1, "%s", val_to_str(reason, pcep_close_reason_obj_vals, "Unknown Object (%u). ")); /*it's suppose that obj_length is a a valid date. The object can have optional TLV(s)*/ offset2 += CLOSE_OBJ_MIN_LEN; diff --git a/epan/dissectors/packet-per.c b/epan/dissectors/packet-per.c index 74b71d2b1a..81ae387686 100644 --- a/epan/dissectors/packet-per.c +++ b/epan/dissectors/packet-per.c @@ -953,7 +953,7 @@ DEBUG_ENTRY("dissect_per_boolean"); hfi->name, value?"True":"False" ); - actx->created_item = proto_tree_add_boolean_format(tree, hf_index, tvb, offset>>3, 1, value, str); + actx->created_item = proto_tree_add_boolean_format(tree, hf_index, tvb, offset>>3, 1, value, "%s", str); } else { actx->created_item = NULL; } diff --git a/epan/dissectors/packet-ppi.c b/epan/dissectors/packet-ppi.c index 68cd35f257..7279ac8cec 100644 --- a/epan/dissectors/packet-ppi.c +++ b/epan/dissectors/packet-ppi.c @@ -927,7 +927,7 @@ dissect_ppi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) add_new_data_source(pinfo, next_tvb, mpdu_str); if (agg_tree) { - ti = proto_tree_add_text(agg_tree, next_tvb, 0, -1, mpdu_str); + ti = proto_tree_add_text(agg_tree, next_tvb, 0, -1, "%s", mpdu_str); ampdu_tree = proto_item_add_subtree(ti, ett_ampdu_segment); } call_dissector(ieee80211_ht_handle, next_tvb, pinfo, ampdu_tree); diff --git a/epan/dissectors/packet-quake.c b/epan/dissectors/packet-quake.c index 86919c4dc3..e9481f32ab 100644 --- a/epan/dissectors/packet-quake.c +++ b/epan/dissectors/packet-quake.c @@ -468,22 +468,22 @@ dissect_quake(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (flags_tree) { - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_DATA, 32, "Data","-")); - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_ACK, 32, "Acknowledgment","-")); - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_NAK, 32, "No Acknowledgment","-")); - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_EOM, 32, "End Of Message","-")); - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_UNRELIABLE, 32, "Unreliable","-")); - proto_tree_add_text(flags_tree, tvb, 0, 2, + proto_tree_add_text(flags_tree, tvb, 0, 2, "%s", decode_boolean_bitfield(flags, NETFLAG_CTL, 32, "Control","-")); } diff --git a/epan/dissectors/packet-rpl.c b/epan/dissectors/packet-rpl.c index 315e7bf459..2953de59d7 100644 --- a/epan/dissectors/packet-rpl.c +++ b/epan/dissectors/packet-rpl.c @@ -138,7 +138,7 @@ dissect_rpl_container(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(subtyp == 0xc005) ett_type = ett_rpl_c005; if(subtyp == 0xc014) ett_type = ett_rpl_c014; ti = proto_tree_add_text(tree, tvb, - offset, sublen, val_to_str(subtyp, + offset, sublen, "%s", val_to_str(subtyp, rpl_type_vals, "Unknown Type")); rpl_container_tree = proto_item_add_subtree(ti, ett_type); diff --git a/epan/dissectors/packet-rtcp.c b/epan/dissectors/packet-rtcp.c index 179433c746..c0120d31e0 100644 --- a/epan/dissectors/packet-rtcp.c +++ b/epan/dissectors/packet-rtcp.c @@ -732,7 +732,7 @@ dissect_rtcp_rtpfb( tvbuff_t *tvb, int offset, proto_tree *rtcp_tree, proto_item if (rtcp_rtpfb_nack_blp) { for (i = 0; i < 16; i ++) { g_snprintf(strbuf, 64, "Frame %d also lost", rtcp_rtpfb_nack_pid + i + 1); - proto_tree_add_text(bitfield_tree, tvb, offset, 2, + proto_tree_add_text(bitfield_tree, tvb, offset, 2, "%s", decode_boolean_bitfield(rtcp_rtpfb_nack_blp, (1<<i), 16, strbuf, "")); if (rtcp_rtpfb_nack_blp & (1<<i)) { diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index d606c9fa63..9dcf34a7ad 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -1204,7 +1204,7 @@ static void rtps_util_add_guid_prefix(proto_tree *tree, /* Can be NULL */ ti = proto_tree_add_text(tree, tvb, offset, - 8, + 8, "%s", temp_buff); guid_tree = proto_item_add_subtree(ti, @@ -1444,7 +1444,7 @@ static void rtps_util_add_generic_guid(proto_tree *tree, /* Canno host_id, app_id, str_app_kind, instance_id, entity_id, str_entity_kind, entity_key); - proto_tree_add_text(tree, tvb, offset, 12, temp_buff); + proto_tree_add_text(tree, tvb, offset, 12, "%s", temp_buff); if (buffer != NULL) { g_strlcpy(buffer, temp_buff, buffer_size); } @@ -2708,7 +2708,7 @@ static void rtps_util_add_seq_octets(proto_tree *tree, proto_tree_add_text(tree, tvb, offset, - param_length, + param_length, "%s", buffer); return ; } @@ -5945,7 +5945,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, smcr_ptr = smcr_ptr->next; } } - col_add_fstr(pinfo->cinfo, COL_INFO, info_buf); + col_add_str(pinfo->cinfo, COL_INFO, info_buf); } sm_counter_free(smcr_head); diff --git a/epan/dissectors/packet-rtps2.c b/epan/dissectors/packet-rtps2.c index 89cffa2ee1..6d1312c3eb 100644 --- a/epan/dissectors/packet-rtps2.c +++ b/epan/dissectors/packet-rtps2.c @@ -1450,7 +1450,7 @@ static void rtps_util_add_guid_prefix(proto_tree *tree, ti = proto_tree_add_text(tree, tvb, offset, - 12, + 12, "%s", temp_buff); guid_tree = proto_item_add_subtree(ti, @@ -1668,7 +1668,7 @@ static void rtps_util_add_generic_guid(proto_tree *tree, counter, entity_id, str_entity_kind, entity_key); if (tree) { - proto_tree_add_text(tree, tvb, offset, 16, temp_buff); + proto_tree_add_text(tree, tvb, offset, 16, "%s", temp_buff); } if (buffer != NULL) { g_strlcpy(buffer, temp_buff, buffer_size); @@ -2989,7 +2989,7 @@ static void rtps_util_add_seq_octets(proto_tree *tree, proto_tree_add_text(tree, tvb, offset, - param_length, + param_length, "%s", buffer); } return ; @@ -3451,7 +3451,7 @@ static void dissect_serialized_data(proto_tree *tree, proto_tree_add_text(rtps_parameter_sequence_tree, tvb, offset, - size, + size, "%s", label); } } @@ -8642,7 +8642,7 @@ static gboolean dissect_rtps(tvbuff_t *tvb, /* Compose the content of the 'summary' column */ if ((pinfo != NULL) && (pinfo->cinfo != NULL) && (check_col(pinfo->cinfo, COL_INFO))) { - col_add_fstr(pinfo->cinfo, COL_INFO, info_summary_text); + col_add_str(pinfo->cinfo, COL_INFO, info_summary_text); } return TRUE; diff --git a/epan/dissectors/packet-ses.c b/epan/dissectors/packet-ses.c index d492aaa176..687bd9d546 100644 --- a/epan/dissectors/packet-ses.c +++ b/epan/dissectors/packet-ses.c @@ -811,7 +811,7 @@ dissect_parameter_group(tvbuff_t *tvb, int offset, proto_tree *tree, while(pg_len != 0) { param_type = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_text(pg_tree, tvb, offset, -1, + ti = proto_tree_add_text(pg_tree, tvb, offset, -1, "%s", val_to_str(param_type, param_vals, "Unknown parameter type (0x%02x)")); param_tree = proto_item_add_subtree(ti, ett_ses_param); @@ -890,7 +890,7 @@ dissect_parameters(tvbuff_t *tvb, int offset, guint16 len, proto_tree *tree, while(len != 0) { param_type = tvb_get_guint8(tvb, offset); - ti = proto_tree_add_text(ses_tree, tvb, offset, -1, + ti = proto_tree_add_text(ses_tree, tvb, offset, -1, "%s", val_to_str(param_type, param_vals, "Unknown parameter type (0x%02x)")); param_tree = proto_item_add_subtree(ti, ett_ses_param); diff --git a/epan/dissectors/packet-skinny.c b/epan/dissectors/packet-skinny.c index 213b86784d..0cabb8b76c 100644 --- a/epan/dissectors/packet-skinny.c +++ b/epan/dissectors/packet-skinny.c @@ -1836,21 +1836,21 @@ dissect_skinny_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) val = tvb_get_letohl( tvb, i); ti_sub = proto_tree_add_text(skinny_tree, tvb, offset, 8, "partyPIRestrictionBits"); skinny_sub_tree = proto_item_add_subtree(ti_sub, ett_skinny_tree); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x01, 4*8, "Does RestrictCallingPartyName", "Doesn't RestrictCallingPartyName")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x02, 4*8, "Does RestrictCallingPartyNumber", "Doesn't RestrictCallingPartyNumber")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x04, 4*8, "Does RestrictCalledPartyName", "Doesn't RestrictCalledPartyName")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x08, 4*8, "Does RestrictCalledPartyNumber", "Doesn't RestrictCalledPartyNumber")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x10, 4*8, "Does RestrictOriginalCalledPartyName", "Doesn't RestrictOriginalCalledPartyName")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x20, 4*8, "Does RestrictOriginalCalledPartyNumber", "Doesn't RestrictOriginalCalledPartyNumber")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x40, 4*8, "Does RestrictLastRedirectPartyName", "Doesn't RestrictLastRedirectPartyName")); - proto_tree_add_text(skinny_sub_tree, tvb, i, 4, + proto_tree_add_text(skinny_sub_tree, tvb, i, 4, "%s", decode_boolean_bitfield( val, 0x80, 4*8, "Does RestrictLastRedirectPartyNumber", "Doesn't RestrictLastRedirectPartyNumber")); break; diff --git a/epan/dissectors/packet-smb-pipe.c b/epan/dissectors/packet-smb-pipe.c index 78578b0a8e..fb7f97a9fe 100644 --- a/epan/dissectors/packet-smb-pipe.c +++ b/epan/dissectors/packet-smb-pipe.c @@ -2510,7 +2510,7 @@ dissect_response_data(tvbuff_t *tvb, packet_info *pinfo, int convert, ett = *lanman->ett_data_entry_list; else ett = ett_lanman_unknown_entries; - data_item = proto_tree_add_text(tree, tvb, offset, -1, + data_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", label); data_tree = proto_item_add_subtree(data_item, ett); } else { diff --git a/epan/dissectors/packet-sna.c b/epan/dissectors/packet-sna.c index 9ed35ed06f..003c7c7070 100644 --- a/epan/dissectors/packet-sna.c +++ b/epan/dissectors/packet-sna.c @@ -1150,7 +1150,7 @@ dissect_optional(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if(type == 0x22) ett = ett_sna_nlp_opti_22; if (tree) { sub_item = proto_tree_add_text(tree, tvb, - offset, len << 2, + offset, len << 2, "%s", val_to_str(type, sna_nlp_opti_vals, "Unknown Segment Type")); sub_tree = proto_item_add_subtree(sub_item, ett); @@ -2464,11 +2464,11 @@ dissect_control(tvbuff_t *parent_tvb, int offset, int control_len, if (key == 0x0e) ett = ett_sna_control_0e; if (((key == 0) || (key == 3) || (key == 5)) && hpr) - sub_item = proto_tree_add_text(tree, tvb, 0, -1, + sub_item = proto_tree_add_text(tree, tvb, 0, -1, "%s", val_to_str(key, sna_control_hpr_vals, "Unknown Control Vector")); else - sub_item = proto_tree_add_text(tree, tvb, 0, -1, + sub_item = proto_tree_add_text(tree, tvb, 0, -1, "%s", val_to_str(key, sna_control_vals, "Unknown Control Vector")); sub_tree = proto_item_add_subtree(sub_item, ett); diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index 898721751e..fc37106177 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -411,7 +411,7 @@ ssh_dissect_ssh2(tvbuff_t *tvb, packet_info *pinfo, g_string_append_printf(title,")"); } - ti=proto_tree_add_text(tree,tvb,offset,-1,title->str); + ti=proto_tree_add_text(tree,tvb,offset,-1, "%s", title->str); ssh2_tree = proto_item_add_subtree(ti ,ett_ssh2); if (title) g_string_free(title,TRUE); } diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 8663e0e624..7fc4c3afde 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -1383,7 +1383,7 @@ dissect_v8_parameter(tvbuff_t *parameter_tvb, proto_tree *tree, tvbuff_t **data_ if (tree) { /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v8_parameter_tag_values, "Unknown parameter")); + parameter_item = proto_tree_add_text(tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str(tag, v8_parameter_tag_values, "Unknown parameter")); parameter_tree = proto_item_add_subtree(parameter_item, ett_sua_parameter); /* add tag and length to the sua tree */ @@ -1659,7 +1659,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *tree, tvbuff_t **data_tvb if (tree) { /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, parameter_tag_values, "Unknown parameter")); + parameter_item = proto_tree_add_text(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_sua_parameter); /* add tag and length to the sua tree */ diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index 28676550b8..184dfaa995 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -410,7 +410,7 @@ static void dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 16; if (tpncp_events_info_db[id].tpncp_data_field_size) { g_snprintf(tpncp_header, MAX_TPNCP_HEADER_LEN, "TPNCP Event: %s (%d)", val_to_str(id, tpncp_events_id_vals, "Unknown"), id); - tpncp_item = proto_tree_add_text(tree, tvb, offset, -1, tpncp_header); + tpncp_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", tpncp_header); dissect_tpncp_event(id, tvb, tpncp_item, &offset); } } @@ -421,7 +421,7 @@ static void dissect_tpncp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { offset += 12; if (tpncp_commands_info_db[id].tpncp_data_field_size) { g_snprintf(tpncp_header, MAX_TPNCP_HEADER_LEN, "TPNCP Command: %s (%d)", val_to_str(id, tpncp_commands_id_vals, "Unknown"), id); - tpncp_item = proto_tree_add_text(tree, tvb, offset, -1, tpncp_header); + tpncp_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", tpncp_header); dissect_tpncp_command(id, tvb, tpncp_item, &offset); } } |