From 00a29cec868ed438c860b79d88e0f9d0d08173de Mon Sep 17 00:00:00 2001 From: stig Date: Fri, 31 Oct 2008 15:11:57 +0000 Subject: Fix some "format not a string literal and no format arguments" warnings. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@26647 f5534014-38df-0310-8fa8-9805f1628bb7 --- epan/dissectors/packet-edonkey.c | 6 +- epan/dissectors/packet-enrp.c | 4 +- epan/dissectors/packet-epl.c | 4 +- epan/dissectors/packet-fcsb3.c | 4 +- epan/dissectors/packet-fip.c | 8 +-- epan/dissectors/packet-giop.c | 2 +- epan/dissectors/packet-gsm_a_common.c | 6 +- epan/dissectors/packet-gsm_a_dtap.c | 18 ++--- epan/dissectors/packet-gsm_a_rr.c | 126 +++++++++++++++++----------------- epan/dissectors/packet-gsm_sms.c | 4 +- epan/dissectors/packet-gtp.c | 22 +++--- epan/dissectors/packet-icmpv6.c | 4 +- epan/dissectors/packet-ipars.c | 2 +- epan/dissectors/packet-ipv6.c | 6 +- epan/dissectors/packet-ipx.c | 2 +- epan/dissectors/packet-lmp.c | 8 +-- epan/dissectors/packet-lpd.c | 2 +- epan/dissectors/packet-m2ua.c | 2 +- epan/dissectors/packet-m3ua.c | 8 +-- epan/dissectors/packet-mq.c | 2 +- epan/dissectors/packet-nbns.c | 2 +- epan/dissectors/packet-ndmp.c | 2 +- epan/dissectors/packet-ndps.c | 20 +++--- epan/dissectors/packet-netflow.c | 2 +- epan/dissectors/packet-nlsp.c | 6 +- 25 files changed, 136 insertions(+), 136 deletions(-) (limited to 'epan') diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 1f7018a9ba..ccdee822ba 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -1631,7 +1631,7 @@ static int dissect_kademlia_peer(tvbuff_t *tvb, packet_info *pinfo _U_, /* offset = dissect_kademlia_peertype(tvb, pinfo, offset, peer_tree); */ kad_version = tvb_get_guint8(tvb, offset); ti = proto_tree_add_item(peer_tree, hf_kademlia_version, tvb, offset, 1, FALSE); - proto_item_append_text(ti, val_to_str(kad_version, kademlia_versions, " Unknown")); + proto_item_append_text(ti, "%s", val_to_str(kad_version, kademlia_versions, " Unknown")); return offset + 1; } @@ -2654,7 +2654,7 @@ static int dissect_kademlia2_prolog( tvbuff_t *tvb, packet_info *pinfo _U_, kad_version = tvb_get_guint8(tvb, offset); /* ti = proto_tree_add_text(tree, tvb, offset, 1, "Kad Version: %d", kad_version ); */ ti = proto_tree_add_item(tree, hf_kademlia_version, tvb, offset, 1, FALSE); - proto_item_append_text(ti, val_to_str(kad_version, kademlia_versions, " Unknown")); + proto_item_append_text(ti, "%s", val_to_str(kad_version, kademlia_versions, " Unknown")); offset++; return offset; @@ -2764,7 +2764,7 @@ static int dissect_kademlia_udp_message(guint8 msg_type, type = tvb_get_guint8(tvb, offset); ti = proto_tree_add_uint_format_value(tree, hf_kademlia_request_type, tvb, offset, 1, type, "0x%02x", type ); - proto_item_append_text(ti, val_to_str(type, kademlia_parameter, " Unknown")); + proto_item_append_text(ti, "%s", val_to_str(type, kademlia_parameter, " Unknown")); offset +=1; /* get target id */ diff --git a/epan/dissectors/packet-enrp.c b/epan/dissectors/packet-enrp.c index ed13c7511f..d05c790a8d 100644 --- a/epan/dissectors/packet-enrp.c +++ b/epan/dissectors/packet-enrp.c @@ -175,7 +175,7 @@ dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree) length = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET); padding_length = tvb_length(cause_tvb) - length; - cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), val_to_str(code, cause_code_values, "Unknown error cause")); + cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), "%s", val_to_str(code, cause_code_values, "Unknown error cause")); cause_tree = proto_item_add_subtree(cause_item, ett_enrp_cause); proto_tree_add_item(cause_tree, hf_cause_code, cause_tvb, CAUSE_CODE_OFFSET, CAUSE_CODE_LENGTH, NETWORK_BYTE_ORDER); @@ -604,7 +604,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *enrp_tree) padding_length = tvb_length(parameter_tvb) - length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(enrp_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(enrp_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_enrp_parameter); /* add tag and length to the enrp tree */ diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index 958ec07214..83d7e430e8 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -343,11 +343,11 @@ dissect_epl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tree && !udpencap) { epl_dest_item = proto_tree_add_item(epl_tree, hf_epl_dest, tvb, offset, 1, TRUE); - proto_item_append_text (epl_dest_item, dest_str); + proto_item_append_text (epl_dest_item, "%s", dest_str); offset += 1; epl_src_item = proto_tree_add_item(epl_tree, hf_epl_src, tvb, offset, 1, TRUE); - proto_item_append_text (epl_src_item, src_str); + proto_item_append_text (epl_src_item, "%s", src_str); offset += 1; } else diff --git a/epan/dissectors/packet-fcsb3.c b/epan/dissectors/packet-fcsb3.c index 60f7168f80..2ae1e84f51 100644 --- a/epan/dissectors/packet-fcsb3.c +++ b/epan/dissectors/packet-fcsb3.c @@ -300,7 +300,7 @@ dissect_iui_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint16 f flags&=(~( 0x08 )); proto_tree_add_item (tree, hf_sbccs_iui_val, tvb, offset, 1, 0); - proto_item_append_text(item, val_to_str (flags & 0x7, fc_sbccs_iu_val, "0x%x")); + proto_item_append_text(item, "%s", val_to_str (flags & 0x7, fc_sbccs_iu_val, "0x%x")); flags&=(~( 0x07 )); } @@ -549,7 +549,7 @@ dissect_status_flags (proto_tree *parent_tree, tvbuff_t *tvb, int offset, guint8 proto_tree_add_item (tree, hf_sbccs_dib_statusflags_ffc, tvb, offset, 1, 0); - proto_item_append_text(item, val_to_str ((flags>>5)&0x07, status_ffc_val, "Reserved:0x%x")); + proto_item_append_text(item, "%s", val_to_str ((flags>>5)&0x07, status_ffc_val, "Reserved:0x%x")); flags&=(~( 0xE0 )); proto_tree_add_boolean(tree, hf_sbccs_dib_statusflags_ci, tvb, offset, 1, flags); diff --git a/epan/dissectors/packet-fip.c b/epan/dissectors/packet-fip.c index 149e7ee4f8..870e446462 100644 --- a/epan/dissectors/packet-fip.c +++ b/epan/dissectors/packet-fip.c @@ -366,7 +366,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) fip_desc_type_len(subtree, desc_tvb); proto_tree_add_item(subtree, hf_fip_desc_mac, desc_tvb, 2, 6, FALSE); - proto_item_append_text(item, + proto_item_append_text(item, "%s", tvb_bytes_to_str_punct(desc_tvb, 2, 6, ':')); break; case FIP_DT_MAP_OUI: @@ -375,7 +375,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) text = fc_to_str(tvb_get_ptr(desc_tvb, 5, 3)); proto_tree_add_string(subtree, hf_fip_desc_map, desc_tvb, 5, 3, text); - proto_item_append_text(item, text); + proto_item_append_text(item, "%s", text); break; case FIP_DT_NAME: subtree = proto_item_add_subtree(item, ett_fip_dt_name); @@ -383,7 +383,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) text = fcwwn_to_str(tvb_get_ptr(desc_tvb, 4, 8)); proto_tree_add_string(subtree, hf_fip_desc_name, desc_tvb, 4, 8, text); - proto_item_append_text(item, text); + proto_item_append_text(item, "%s", text); break; case FIP_DT_FAB: subtree = proto_item_add_subtree(item, ett_fip_dt_fab); @@ -396,7 +396,7 @@ dissect_fip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) text = fcwwn_to_str(tvb_get_ptr(desc_tvb, 8, 8)); proto_tree_add_string(subtree, hf_fip_desc_fab_name, desc_tvb, 8, 8, text); - proto_item_append_text(item, text); + proto_item_append_text(item, "%s", text); break; case FIP_DT_FCOE_SIZE: subtree = proto_item_add_subtree(item, ett_fip_dt_mdl); diff --git a/epan/dissectors/packet-giop.c b/epan/dissectors/packet-giop.c index 8adb23ec79..0f0d814827 100644 --- a/epan/dissectors/packet-giop.c +++ b/epan/dissectors/packet-giop.c @@ -5195,7 +5195,7 @@ void decode_ServiceContextList(tvbuff_t *tvb, proto_tree *ptree, int *offset, &encapsulation_is_be , &encapsulation_boundary); if (tree) { - tf_st1 = proto_tree_add_text (tree, tvb, temp_offset, sizeof(context_data_len) + context_data_len , service_context_name); + tf_st1 = proto_tree_add_text (tree, tvb, temp_offset, sizeof(context_data_len) + context_data_len , "%s", service_context_name); sub_tree1 = proto_item_add_subtree (tf_st1, ett_giop_scl_st1); } diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 639f5c2916..74733412c4 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -1217,7 +1217,7 @@ de_lai(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar *ad item = proto_tree_add_text(tree, - tvb, curr_offset, 5, + tvb, curr_offset, 5, "%s", gsm_common_elem_strings[DE_LAI].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_LAI]); @@ -1480,7 +1480,7 @@ de_ms_cm_1(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_MS_CM_1].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_MS_CM_1]); @@ -1868,7 +1868,7 @@ de_pd_sapi(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gchar item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_PD_SAPI].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_PD_SAPI]); diff --git a/epan/dissectors/packet-gsm_a_dtap.c b/epan/dissectors/packet-gsm_a_dtap.c index 42e09abd90..5de946a847 100644 --- a/epan/dissectors/packet-gsm_a_dtap.c +++ b/epan/dissectors/packet-gsm_a_dtap.c @@ -2168,7 +2168,7 @@ de_call_state(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_CALL_STATE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_CALL_STATE]); @@ -3503,7 +3503,7 @@ dtap_mm_auth_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_CIPH_KEY_SEQ_NUM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_CIPH_KEY_SEQ_NUM]); @@ -3621,7 +3621,7 @@ dtap_mm_cm_reestab_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint le item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_CIPH_KEY_SEQ_NUM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_CIPH_KEY_SEQ_NUM]); @@ -3752,7 +3752,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_CIPH_KEY_SEQ_NUM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_CIPH_KEY_SEQ_NUM]); @@ -3785,7 +3785,7 @@ dtap_mm_cm_srvc_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_CM_SRVC_TYPE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_CM_SRVC_TYPE]); @@ -3857,7 +3857,7 @@ dtap_mm_id_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_ID_TYPE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_ID_TYPE]); @@ -4008,7 +4008,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_CIPH_KEY_SEQ_NUM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_CIPH_KEY_SEQ_NUM]); @@ -4041,7 +4041,7 @@ dtap_mm_loc_upd_req(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_LOC_UPD_TYPE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_LOC_UPD_TYPE]); @@ -4291,7 +4291,7 @@ dtap_cc_congestion_control(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_dtap_elem_strings[DE_CONGESTION].strptr); subtree = proto_item_add_subtree(item, ett_gsm_dtap_elem[DE_CONGESTION]); diff --git a/epan/dissectors/packet-gsm_a_rr.c b/epan/dissectors/packet-gsm_a_rr.c index 46fb5c8dac..a94d561c3a 100644 --- a/epan/dissectors/packet-gsm_a_rr.c +++ b/epan/dissectors/packet-gsm_a_rr.c @@ -923,7 +923,7 @@ de_rr_cell_dsc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g oct = tvb_get_guint8(tvb, curr_offset); item = proto_tree_add_text(tree, - tvb, curr_offset, 2, + tvb, curr_offset, 2, "%s", gsm_rr_elem_strings[DE_RR_CELL_DSC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_DSC]); @@ -977,7 +977,7 @@ de_rr_cell_opt_bcch(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _ curr_offset = offset; - item = proto_tree_add_text(tree, tvb, curr_offset, 1, + item = proto_tree_add_text(tree, tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_CELL_OPT_BCCH].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_OPT_BCCH]); @@ -1018,7 +1018,7 @@ de_rr_cell_opt_sacch(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len oct = tvb_get_guint8(tvb, curr_offset); dtx = ((oct&0x80)>>5)|((oct&0x30)>>4); /* DTX is a split filed in bits 8, 6 and 5 */ - item = proto_tree_add_text(tree, tvb, curr_offset, 1, + item = proto_tree_add_text(tree, tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_CELL_OPT_SACCH].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_OPT_SACCH]); @@ -1046,7 +1046,7 @@ de_rr_cell_sel_param(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len curr_offset = offset; oct = tvb_get_guint8(tvb, curr_offset); - item = proto_tree_add_text(tree, tvb, curr_offset, 2, + item = proto_tree_add_text(tree, tvb, curr_offset, 2, "%s", gsm_rr_elem_strings[DE_RR_CELL_SEL_PARAM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CELL_SEL_PARAM]); @@ -1081,7 +1081,7 @@ de_rr_ch_dsc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gch curr_offset = offset; - item = proto_tree_add_text(tree,tvb, curr_offset, 3,gsm_rr_elem_strings[DE_RR_CH_DSC].strptr); + item = proto_tree_add_text(tree,tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_CH_DSC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CH_DSC]); @@ -1175,7 +1175,7 @@ de_rr_ch_dsc2(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc curr_offset = offset; - item = proto_tree_add_text(tree,tvb, curr_offset, 3,gsm_rr_elem_strings[DE_RR_CH_DSC2].strptr); + item = proto_tree_add_text(tree,tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_CH_DSC2].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CH_DSC2]); @@ -1539,7 +1539,7 @@ de_rr_ctrl_ch_desc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U curr_offset = offset; - item = proto_tree_add_text(tree, tvb, curr_offset, 3, + item = proto_tree_add_text(tree, tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_CTRL_CH_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_CTRL_CH_DESC]); @@ -1711,7 +1711,7 @@ de_rr_ho_ref(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gch item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_HO_REF].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_HO_REF]); @@ -1742,7 +1742,7 @@ de_rr_ia_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, gc item = proto_tree_add_text(tree, - tvb, curr_offset, len, + tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_IA_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_IA_REST_OCT]); @@ -1770,7 +1770,7 @@ de_rr_iar_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g item = proto_tree_add_text(tree, - tvb, curr_offset, 3, + tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_IAR_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_IAR_REST_OCT]); @@ -1800,7 +1800,7 @@ de_rr_iax_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g item = proto_tree_add_text(tree, - tvb, curr_offset, len, + tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_IAX_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_IAX_REST_OCT]); @@ -1824,7 +1824,7 @@ de_rr_l2_pseudo_len(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _ curr_offset = offset; - item = proto_tree_add_text(tree,tvb, curr_offset, 1, gsm_rr_elem_strings[DE_RR_L2_PSEUDO_LEN].strptr); + item = proto_tree_add_text(tree,tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_L2_PSEUDO_LEN].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_L2_PSEUDO_LEN]); @@ -1950,7 +1950,7 @@ de_rr_meas_res(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g item = proto_tree_add_text(tree, - tvb, curr_offset, 16, + tvb, curr_offset, 16, "%s", gsm_rr_elem_strings[DE_RR_MEAS_RES].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_MEAS_RES]); @@ -2205,7 +2205,7 @@ de_rr_packet_ch_desc(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len curr_offset = offset; - item = proto_tree_add_text(tree,tvb,curr_offset,3,gsm_rr_elem_strings[DE_RR_PACKET_CH_DESC].strptr); + item = proto_tree_add_text(tree,tvb,curr_offset,3, "%s", gsm_rr_elem_strings[DE_RR_PACKET_CH_DESC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_PACKET_CH_DESC]); /* Octet 2 */ @@ -2279,7 +2279,7 @@ de_rr_ded_mod_or_tbf(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_DED_MOD_OR_TBF].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_DED_MOD_OR_TBF]); @@ -2314,7 +2314,7 @@ de_rr_page_mode(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_PAGE_MODE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_PAGE_MODE]); @@ -2341,7 +2341,7 @@ de_rr_ncc_perm(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, g curr_offset = offset; - item = proto_tree_add_text(tree, tvb, curr_offset, 1, + item = proto_tree_add_text(tree, tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_NCC_PERM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_NCC_PERM]); @@ -2414,7 +2414,7 @@ de_rr_pow_cmd(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_POW_CMD].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_POW_CMD]); @@ -2446,7 +2446,7 @@ de_rr_pow_cmd_and_acc_type(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guin item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_rr_elem_strings[DE_RR_POW_CMD_AND_ACC_TYPE].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_POW_CMD_AND_ACC_TYPE]); @@ -2515,7 +2515,7 @@ de_rr_rach_ctrl_param(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len curr_offset = offset; - item = proto_tree_add_text(tree, tvb, curr_offset, 3, + item = proto_tree_add_text(tree, tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_RACH_CTRL_PARAM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_RACH_CTRL_PARAM]); @@ -2567,7 +2567,7 @@ de_rr_req_ref(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len _U_, gc item = proto_tree_add_text(tree, - tvb, curr_offset, 3, + tvb, curr_offset, 3, "%s", gsm_rr_elem_strings[DE_RR_REQ_REF].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_REQ_REF]); @@ -2653,7 +2653,7 @@ de_rr_si1_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g curr_offset = offset; bit_offset = curr_offset << 3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI1_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI1_REST_OCT]); @@ -2784,7 +2784,7 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len curr_offset = offset; bit_offset = curr_offset<<3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI2TER_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI2TER_REST_OCT]); @@ -2805,7 +2805,7 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len if (value) { /* UTRAN FDD Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_FDD_DESC]); bit_offset += 2; /* skip '01' bits */ proto_tree_add_text(subtree2,tvb, bit_offset>>3, 2, "FDD UARFCN: %d", tvb_get_bits16(tvb,bit_offset,14,FALSE)); @@ -2824,7 +2824,7 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len if (value) { /* UTRAN TDD Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_TDD_DESC]); bit_offset += 2; /* skip '01' bits */ proto_tree_add_text(subtree2,tvb, bit_offset>>3, 2, "TDD UARFCN: %d", tvb_get_bits16(tvb,bit_offset,14,FALSE)); @@ -2843,7 +2843,7 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len if (value) { /* 3G Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, FALSE); bit_offset += 4; @@ -2876,7 +2876,7 @@ de_rr_si2ter_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len if (value) { /* 3G Additional Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, FALSE); bit_offset += 3; @@ -3038,7 +3038,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint curr_offset = offset; bit_offset = curr_offset<<3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI2QUATER_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI2QUATER_REST_OCT]); @@ -3058,7 +3058,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_gsm_report_type, tvb, bit_offset, 1, FALSE); bit_offset += 1; @@ -3071,7 +3071,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* GPRS Real Time Difference Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_RTD_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_RTD_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_RTD_DESC]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3158,7 +3158,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* GPRS BSIC Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_BSIC_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_BSIC_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_BSIC_DESC]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3187,7 +3187,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* GPRS Report Priority Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_REPORT_PRIO_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_REPORT_PRIO_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_REPORT_PRIO_DESC]); idx = tvb_get_bits8(tvb,bit_offset,7); proto_tree_add_text(subtree2,tvb, bit_offset>>3, 1, "Number Cells: %d", idx); @@ -3205,7 +3205,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* GPRS Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_report_type, tvb, bit_offset, 1, FALSE); bit_offset += 1; @@ -3281,7 +3281,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* NC Measurement Parameters */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_NC_MEAS_PARAM].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_NC_MEAS_PARAM].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_NC_MEAS_PARAM]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_network_control_order, tvb, bit_offset, 2, FALSE); bit_offset += 2; @@ -3303,7 +3303,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* SI 2quater Extension Information */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI2Q_EXT_INFO].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI2Q_EXT_INFO].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_SI2Q_EXT_INFO]); idx = tvb_get_bits8(tvb,bit_offset,8); proto_tree_add_text(subtree2,tvb, bit_offset>>3, 1, "Extension Length: %d", idx); @@ -3314,7 +3314,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* CCN Support Description */ bit_offset_sav = bit_offset; - item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_CCN_SUPPORT_DESC].strptr); + item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_CCN_SUPPORT_DESC].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_CCN_SUPPORT_DESC]); value = tvb_get_bits8(tvb,bit_offset,7); proto_tree_add_text(subtree3,tvb, bit_offset>>3, 1, "Number Cells: %d", value); @@ -3337,7 +3337,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* 3G Neighbour Cell Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_NEIGH_CELL_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_NEIGH_CELL_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_NEIGH_CELL_DESC]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3358,7 +3358,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* UTRAN FDD Description */ bit_offset_sav2 = bit_offset; - item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); + item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_FDD_DESC]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3381,7 +3381,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint proto_tree_add_text(subtree3,tvb, bit_offset>>3, 1, "Nr of FDD Cells : %d", idx); bit_offset += 5; idx = convert_n_to_p[idx]; - item4 = proto_tree_add_text(subtree3,tvb, bit_offset>>3, (idx>>3)+1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); + item4 = proto_tree_add_text(subtree3,tvb, bit_offset>>3, (idx>>3)+1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_FDD_DESC].strptr); subtree4 = proto_item_add_subtree(item4, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_FDD_CELL_INFORMATION_FIELD]); proto_tree_add_text(subtree4,tvb, bit_offset>>3, (idx>>3)+1, "Field is %d bits long", idx); if (xdd_indic0) @@ -3437,7 +3437,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* UTRAN TDD Description */ bit_offset_sav2 = bit_offset; - item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); + item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_UTRAN_TDD_DESC]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3459,7 +3459,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint proto_tree_add_text(subtree3,tvb, bit_offset>>3, 1, "Nr of TDD Cells : %d", idx); bit_offset += 5; idx = convert_n_to_q[idx]; - item4 = proto_tree_add_text(subtree3,tvb, bit_offset>>3, (idx>>3)+1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); + item4 = proto_tree_add_text(subtree3,tvb, bit_offset>>3, (idx>>3)+1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_UTRAN_TDD_DESC].strptr); subtree4 = proto_item_add_subtree(item4, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_TDD_CELL_INFORMATION_FIELD]); proto_tree_add_text(subtree4,tvb, bit_offset>>3, (idx>>3)+1, "Field is %d bits long", idx); if (xdd_indic0) @@ -3519,7 +3519,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* 3G Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_i, tvb, bit_offset, 4, FALSE); bit_offset += 4; @@ -3554,7 +3554,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* GPRS 3G Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_3G_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_3G_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_3G_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_qsearch_p, tvb, bit_offset, 4, FALSE); bit_offset += 4; @@ -3607,7 +3607,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* 3G Additional Measurement Parameters Description */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_fdd_qmin_offset, tvb, bit_offset, 3, FALSE); bit_offset += 3; @@ -3620,7 +3620,7 @@ de_rr_si2quater_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint if (value) { /* 3G Additional Measurement Parameters Description 2 */ bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC2].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC2].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_3G_ADD_MEAS_PARAM_DESC2]); value = tvb_get_bits8(tvb,bit_offset,1); bit_offset += 1; @@ -3811,7 +3811,7 @@ de_rr_rest_oct_opt_sel_param(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) if (gsm_a_rr_is_bit_high(tvb,curr_bit_offset) == TRUE) { /* Selection Parameters */ curr_bit_offset += 1; - item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_OPTIONAL_SEL_PARAM].strptr); + item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_OPTIONAL_SEL_PARAM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_OPTIONAL_SEL_PARAM]); proto_tree_add_bits_item(subtree, hf_gsm_a_rr_cbq, tvb, curr_bit_offset, 1, FALSE); curr_bit_offset += 1; @@ -3844,7 +3844,7 @@ de_rr_rest_oct_gprs_indicator(tvbuff_t *tvb, proto_tree *tree, gint bit_offset) curr_bit_offset = bit_offset; - item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, 1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_INDICATOR].strptr); + item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, 1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_INDICATOR].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_INDICATOR]); proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, 1, "RA Colour: %d",tvb_get_bits8(tvb,curr_bit_offset,3)); curr_bit_offset += 3; @@ -3885,7 +3885,7 @@ de_rr_si3_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g curr_offset = offset; bit_offset = curr_offset << 3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI3_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI3_REST_OCT]); @@ -3993,12 +3993,12 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g curr_offset = offset; bit_offset = curr_offset << 3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI4_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI4_REST_OCT]); - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI4_REST_OCTETS_O].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI4_REST_OCTETS_O].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_SI4_REST_OCTETS_O]); @@ -4024,13 +4024,13 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g { /* SI4 Rest Octets_S */ bit_offset += 1; bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI4_REST_OCTETS_S].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_SI4_REST_OCTETS_S].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_SI4_REST_OCTETS_S]); if (gsm_a_rr_is_bit_high(tvb,bit_offset) == TRUE) { /* LSA Parameters */ bit_offset += 1; bit_offset_sav2 = bit_offset; - item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_LSA_PARAMETERS].strptr); + item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_LSA_PARAMETERS].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_LSA_PARAMETERS]); proto_tree_add_bits_item(subtree3, hf_gsm_a_rr_prio_thr, tvb, bit_offset, 3, FALSE); bit_offset += 3; @@ -4062,7 +4062,7 @@ de_rr_si4_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g { /* LSA ID information */ bit_offset += 1; bit_offset_sav2 = bit_offset; - item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, len, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_LSA_ID_INFO].strptr); + item3 = proto_tree_add_text(subtree2, tvb, bit_offset>>3, len, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_LSA_ID_INFO].strptr); subtree3 = proto_item_add_subtree(item3, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_LSA_ID_INFO]); do { @@ -4169,7 +4169,7 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g curr_offset = offset; bit_offset = curr_offset << 3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI6_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI6_REST_OCT]); @@ -4178,7 +4178,7 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g { /* PCH and NCH Info */ bit_offset += 1; bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PCH_AND_NCH_INFO].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PCH_AND_NCH_INFO].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_PCH_AND_NCH_INFO]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_paging_channel_restructuring, tvb, bit_offset, 1, FALSE); bit_offset += 1; @@ -4201,7 +4201,7 @@ de_rr_si6_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, g { /* VBS/VGCS options */ bit_offset += 1; bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb,bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_VBS_VGCS_OPTIONS].strptr); + item2 = proto_tree_add_text(subtree, tvb,bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_VBS_VGCS_OPTIONS].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_VBS_VGCS_OPTIONS]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_vbs_vgcs_inband_notifications, tvb, bit_offset, 1, FALSE); bit_offset += 1; @@ -4364,7 +4364,7 @@ de_rr_rest_oct_gprs_mobile_allocation(tvbuff_t *tvb, proto_tree *tree, gint bit_ curr_bit_offset = bit_offset; - item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_MOBILE_ALLOC].strptr); + item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_MOBILE_ALLOC].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_MOBILE_ALLOC]); proto_tree_add_bits_item(subtree, hf_gsm_a_rr_hsn, tvb, curr_bit_offset, 6, FALSE); curr_bit_offset += 6; @@ -4551,7 +4551,7 @@ de_rr_rest_oct_gprs_cell_options(tvbuff_t *tvb, proto_tree *tree, gint bit_offse curr_bit_offset = bit_offset; - item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS].strptr); + item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS]); proto_tree_add_bits_item(subtree, hf_gsm_a_rr_nmo, tvb, curr_bit_offset, 2, FALSE); curr_bit_offset += 2; @@ -4583,7 +4583,7 @@ de_rr_rest_oct_gprs_cell_options(tvbuff_t *tvb, proto_tree *tree, gint bit_offse { /* Optional extension information */ curr_bit_offset += 1; curr_bit_offset_sav = curr_bit_offset; - item2 = proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS_EXT_INFO].strptr); + item2 = proto_tree_add_text(subtree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS_EXT_INFO].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_CELL_OPTIONS_EXT_INFO]); value = tvb_get_bits8(tvb,curr_bit_offset,6); proto_tree_add_text(subtree2,tvb, curr_bit_offset>>3, 1, "Extension Length: %d", value); @@ -4743,7 +4743,7 @@ de_rr_rest_oct_gprs_power_control_parameters(tvbuff_t *tvb, proto_tree *tree, gi curr_bit_offset = bit_offset; - item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_POWER_CONTROL_PARAMS].strptr); + item = proto_tree_add_text(tree, tvb, curr_bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_GPRS_POWER_CONTROL_PARAMS].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_GPRS_POWER_CONTROL_PARAMS]); proto_tree_add_bits_item(subtree, hf_gsm_a_rr_alpha, tvb, curr_bit_offset, 4, FALSE); curr_bit_offset += 4; @@ -4827,7 +4827,7 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, curr_offset = offset; bit_offset = curr_offset << 3; - item = proto_tree_add_text(tree, tvb, curr_offset, len, + item = proto_tree_add_text(tree, tvb, curr_offset, len, "%s", gsm_rr_elem_strings[DE_RR_SI13_REST_OCT].strptr); subtree = proto_item_add_subtree(item, ett_gsm_rr_elem[DE_RR_SI13_REST_OCT]); @@ -4854,7 +4854,7 @@ de_rr_si13_rest_oct(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len, proto_tree_add_bits_item(subtree, hf_gsm_a_rr_psi1_repeat_period, tvb, bit_offset, 4, FALSE); bit_offset += 4; bit_offset_sav = bit_offset; - item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PBCCH_DESC].strptr); + item2 = proto_tree_add_text(subtree, tvb, bit_offset>>3, -1, "%s", gsm_rr_rest_octets_elem_strings[DE_RR_REST_OCTETS_PBCCH_DESC].strptr); subtree2 = proto_item_add_subtree(item2, ett_gsm_rr_rest_octets_elem[DE_RR_REST_OCTETS_PBCCH_DESC]); proto_tree_add_bits_item(subtree2, hf_gsm_a_rr_pbcch_pb, tvb, bit_offset, 4, FALSE); bit_offset += 4; @@ -6086,7 +6086,7 @@ dtap_rr_paging_resp(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint len) item = proto_tree_add_text(tree, - tvb, curr_offset, 1, + tvb, curr_offset, 1, "%s", gsm_common_elem_strings[DE_CIPH_KEY_SEQ_NUM].strptr); subtree = proto_item_add_subtree(item, ett_gsm_common_elem[DE_CIPH_KEY_SEQ_NUM]); diff --git a/epan/dissectors/packet-gsm_sms.c b/epan/dissectors/packet-gsm_sms.c index de0146a5fc..8109d45a03 100644 --- a/epan/dissectors/packet-gsm_sms.c +++ b/epan/dissectors/packet-gsm_sms.c @@ -344,7 +344,7 @@ dis_field_addr(tvbuff_t *tvb, proto_tree *tree, guint32 *offset_p, const gchar * } item = proto_tree_add_text(tree, tvb, - offset, numdigocts + 2, + offset, numdigocts + 2, "%s", title); subtree = proto_item_add_subtree(item, ett_addr); @@ -1486,7 +1486,7 @@ dis_field_fcs(tvbuff_t *tvb, proto_tree *tree, guint32 offset, guint8 oct) } proto_tree_add_text(subtree, tvb, - offset, 1, + offset, 1, "%s", str); } diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c index 1b1d70ad7e..90bbf669f0 100644 --- a/epan/dissectors/packet-gtp.c +++ b/epan/dissectors/packet-gtp.c @@ -2832,7 +2832,7 @@ static int decode_gtp_rai(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p guint8 byte[3]; guint16 mnc, mcc; - te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_RAI, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_RAI, gtp_val, "Unknown message")); ext_tree_rai = proto_item_add_subtree(te, ett_gtp_rai); byte[0] = tvb_get_guint8(tvb, offset + 1); @@ -2954,7 +2954,7 @@ static int decode_gtp_auth_tri(tvbuff_t * tvb, int offset, packet_info * pinfo _ proto_tree *ext_tree_auth_tri; proto_item *te; - te = proto_tree_add_text(tree, tvb, offset, 29, val_to_str(GTP_EXT_AUTH_TRI, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 29, "%s", val_to_str(GTP_EXT_AUTH_TRI, gtp_val, "Unknown message")); ext_tree_auth_tri = proto_item_add_subtree(tree, ett_gtp_auth_tri); proto_tree_add_text(ext_tree_auth_tri, tvb, offset + 1, 16, "RAND: %s", tvb_bytes_to_str(tvb, offset + 1, 16)); @@ -3109,7 +3109,7 @@ static int decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr switch (gtp_version) { case 0: - te = proto_tree_add_text(tree, tvb, offset, 4, val_to_str(GTP_EXT_FLOW_II, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 4, "%s", val_to_str(GTP_EXT_FLOW_II, gtp_val, "Unknown message")); ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii); proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F); @@ -3119,7 +3119,7 @@ static int decode_gtp_18(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, pr return 4; case 1: - te = proto_tree_add_text(tree, tvb, offset, 6, val_to_str(GTP_EXT_TEID_II, gtpv1_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 6, "%s", val_to_str(GTP_EXT_TEID_II, gtpv1_val, "Unknown message")); ext_tree_flow_ii = proto_item_add_subtree(te, ett_gtp_flow_ii); proto_tree_add_uint(ext_tree_flow_ii, hf_gtp_nsapi, tvb, offset + 1, 1, tvb_get_guint8(tvb, offset + 1) & 0x0F); @@ -3235,7 +3235,7 @@ static int decode_gtp_rab_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo proto_tree *ext_tree_rab_cntxt; proto_item *te; - te = proto_tree_add_text(tree, tvb, offset, 10, val_to_str(GTP_EXT_RAB_CNTXT, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 10, "%s", val_to_str(GTP_EXT_RAB_CNTXT, gtp_val, "Unknown message")); ext_tree_rab_cntxt = proto_item_add_subtree(te, ett_gtp_rab_cntxt); nsapi = tvb_get_guint8(tvb, offset + 1) & 0x0F; @@ -3566,7 +3566,7 @@ static int decode_gtp_mm_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo _ tvbuff_t *l3_tvb; - te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_MM_CNTXT, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_MM_CNTXT, gtp_val, "Unknown message")); ext_tree_mm = proto_item_add_subtree(te, ett_gtp_mm); /* Octet 2 - 3 */ @@ -4109,7 +4109,7 @@ static int decode_gtp_pdp_cntxt(tvbuff_t * tvb, int offset, packet_info * pinfo length = tvb_get_ntohs(tvb, offset + 1); - te = proto_tree_add_text(tree, tvb, offset, length + 3, val_to_str(GTP_EXT_PDP_CNTXT, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_PDP_CNTXT, gtp_val, "Unknown message")); ext_tree_pdp = proto_item_add_subtree(te, ett_gtp_pdp); vaa = (tvb_get_guint8(tvb, offset + 3) >> 6) & 0x01; @@ -4261,7 +4261,7 @@ static int decode_gtp_apn(tvbuff_t * tvb, int offset, packet_info * pinfo _U_, p length = tvb_get_ntohs(tvb, offset + 1); - te = proto_tree_add_text(tree, tvb, offset, length + 3, val_to_str(GTP_EXT_APN, gtp_val, "Unknown field")); + te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_APN, gtp_val, "Unknown field")); ext_tree_apn = proto_item_add_subtree(te, ett_gtp_apn); proto_tree_add_text(ext_tree_apn, tvb, offset + 1, 2, "APN length : %u", length); @@ -4288,7 +4288,7 @@ int decode_gtp_proto_conf(tvbuff_t * tvb, int offset, packet_info * pinfo, proto length = tvb_get_ntohs(tvb, offset + 1); - te = proto_tree_add_text(tree, tvb, offset, length + 3, val_to_str(GTP_EXT_PROTO_CONF, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, length + 3, "%s", val_to_str(GTP_EXT_PROTO_CONF, gtp_val, "Unknown message")); ext_tree_proto = proto_item_add_subtree(te, ett_gtp_proto); proto_tree_add_text(ext_tree_proto, tvb, offset + 1, 2, "Length: %u", length); @@ -5986,7 +5986,7 @@ static int decode_gtp_data_req(tvbuff_t * tvb, int offset, packet_info * pinfo _ proto_item *te; tvbuff_t *next_tvb; - te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_DATA_REQ, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_DATA_REQ, gtp_val, "Unknown message")); ext_tree = proto_item_add_subtree(te, ett_gtp_ext); length = tvb_get_ntohs(tvb, offset + 1); @@ -6088,7 +6088,7 @@ static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo _ proto_tree *ext_tree_priv_ext; proto_item *te; - te = proto_tree_add_text(tree, tvb, offset, 1, val_to_str(GTP_EXT_PRIV_EXT, gtp_val, "Unknown message")); + te = proto_tree_add_text(tree, tvb, offset, 1, "%s", val_to_str(GTP_EXT_PRIV_EXT, gtp_val, "Unknown message")); ext_tree_priv_ext = proto_item_add_subtree(te, ett_gtp_ext); offset++; diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c index 52ff21915c..1b2dc04c1c 100644 --- a/epan/dissectors/packet-icmpv6.c +++ b/epan/dissectors/packet-icmpv6.c @@ -2039,13 +2039,13 @@ dissect_icmpv6(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tvb_get_ntohs(tvb, offset + 4), tvb_get_ntohs(tvb, offset + 4)); proto_tree_add_text(icmp6_tree, tvb, - offset + 6, 1, + offset + 6, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb, offset + 6), 0x80, 8, "Managed Address Configuration", "No Managed Address Configuration")); proto_tree_add_text(icmp6_tree, tvb, - offset + 6, 1, + offset + 6, 1, "%s", decode_boolean_bitfield(tvb_get_guint8(tvb, offset + 6), 0x40, 8, "Other Stateful Configuration", diff --git a/epan/dissectors/packet-ipars.c b/epan/dissectors/packet-ipars.c index caebbb3f55..1486e36230 100644 --- a/epan/dissectors/packet-ipars.c +++ b/epan/dissectors/packet-ipars.c @@ -157,7 +157,7 @@ dissect_ipars(tvbuff_t *tvb, packet_info *pinfo _U_ , proto_tree *tree) case EOMpb: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "EOMpb"); break; default: g_snprintf(eom_msg, MAX_EOM_MSG_SIZE, "Unknown EOM type (0x%2.2X)", ia); break; } - proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 4, 1, eom_msg); + proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 4, 1, "%s", eom_msg); ia = tvb_get_guint8(tvb, 5) & 0x3f; proto_tree_add_protocol_format(ipars_tree, proto_ipars, tvb, 5, 1, "Good BCC"); } else { diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 0fef50c13c..29de73a939 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -686,7 +686,7 @@ dissect_shim_hex(tvbuff_t *tvb, int offset, int len, const char *itemname, guint p = offset; - ti = proto_tree_add_text(tree, tvb, offset, len, itemname); + ti = proto_tree_add_text(tree, tvb, offset, len, "%s", itemname); proto_item_append_text(ti, " 0x%02x", tvb_get_guint8(tvb, p) & bitmask); for (count=1; count= 1 && query.query_type <= 4) { - proto_tree_add_text(sap_tree, tvb, 0, 2, sap_type[query.query_type - 1]); + proto_tree_add_text(sap_tree, tvb, 0, 2, "%s", sap_type[query.query_type - 1]); if ((query.query_type - 1) % 2) { hidden_item = proto_tree_add_boolean(sap_tree, hf_sap_response, diff --git a/epan/dissectors/packet-lmp.c b/epan/dissectors/packet-lmp.c index 92452cf70f..a310108e7a 100644 --- a/epan/dissectors/packet-lmp.c +++ b/epan/dissectors/packet-lmp.c @@ -2025,7 +2025,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) "Channel Status: %s", val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, channel_status_str, "Unknown (%u). ")); - proto_item_append_text(ti2, val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, + proto_item_append_text(ti2, "%s", val_to_str(tvb_get_ntohl(tvb, offset2+l) & 0x7fffffff, channel_status_str, "Unknown (%u). ")); j++; l += 4; @@ -2296,7 +2296,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) service_attribute_link_type_str, "UNK (%u). ")); - proto_item_append_text(lmp_object_tree, + proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2), service_attribute_link_type_str, "Unknown (%u). ")); @@ -2311,7 +2311,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) service_attribute_signal_types_sdh_str, "Unknown (%u). ")); - proto_item_append_text(lmp_object_tree, + proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2+1), service_attribute_signal_types_sdh_str, "Unknown (%u). ")); @@ -2325,7 +2325,7 @@ dissect_lmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) service_attribute_signal_types_sonet_str, "Unknown (%u). ")); - proto_item_append_text(lmp_object_tree, + proto_item_append_text(lmp_object_tree, "%s", val_to_str(tvb_get_guint8(tvb, offset2+1), service_attribute_signal_types_sonet_str, "Unknown (%u). ")); diff --git a/epan/dissectors/packet-lpd.c b/epan/dissectors/packet-lpd.c index 820fc47e0e..593bd24096 100644 --- a/epan/dissectors/packet-lpd.c +++ b/epan/dissectors/packet-lpd.c @@ -123,7 +123,7 @@ dissect_lpd(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) printer_len = find_printer_string(tvb, 1); if (code <= 9 && printer_len != -1) { - proto_tree_add_text(lpd_tree, tvb, 0, 1, + proto_tree_add_text(lpd_tree, tvb, 0, 1, "%s", val_to_str(code, lpd_client_code, "Unknown client code: %u")); proto_tree_add_text(lpd_tree, tvb, 1, printer_len, "Printer/options: %s", diff --git a/epan/dissectors/packet-m2ua.c b/epan/dissectors/packet-m2ua.c index 8544e3080a..60c2ebad10 100644 --- a/epan/dissectors/packet-m2ua.c +++ b/epan/dissectors/packet-m2ua.c @@ -893,7 +893,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, padding_length = tvb_length(parameter_tvb) - length; /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m2ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), + parameter_item = proto_tree_add_text(m2ua_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_m2ua_parameter); diff --git a/epan/dissectors/packet-m3ua.c b/epan/dissectors/packet-m3ua.c index 868fe951de..182a28fbc5 100644 --- a/epan/dissectors/packet-m3ua.c +++ b/epan/dissectors/packet-m3ua.c @@ -1310,7 +1310,7 @@ dissect_v5_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr return; /* Nothing to do here */ /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v5_parameter_tag_values, "Unknown parameter")); + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str(tag, v5_parameter_tag_values, "Unknown parameter")); parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); /* add tag and length to the parameter tree */ @@ -1437,7 +1437,7 @@ dissect_v6_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr return; /* Nothing to do here */ /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v6_parameter_tag_values, "Unknown parameter")); + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str(tag, v6_parameter_tag_values, "Unknown parameter")); parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); /* add tag and length to the parameter tree */ @@ -1604,7 +1604,7 @@ dissect_v7_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tr return; /* Nothing to do here */ /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(tag, v7_parameter_tag_values, "Unknown parameter")); + parameter_item = proto_tree_add_text(m3ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), "%s", val_to_str(tag, v7_parameter_tag_values, "Unknown parameter")); parameter_tree = proto_item_add_subtree(parameter_item, ett_parameter); /* add tag and length to the parameter tree */ @@ -1771,7 +1771,7 @@ dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, return; /* Nothing to do here */ /* create proto_tree stuff */ - parameter_item = proto_tree_add_text(m3ua_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(m3ua_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_parameter); /* add tag and length to the parameter tree */ diff --git a/epan/dissectors/packet-mq.c b/epan/dissectors/packet-mq.c index 0f1fc9a704..a1e52ca638 100644 --- a/epan/dissectors/packet-mq.c +++ b/epan/dissectors/packet-mq.c @@ -2216,7 +2216,7 @@ dissect_mq_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) tMsgProps.iOffsetFormat = offset + 20; if (tree) { - ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeHeader, val_to_str(structId, mq_structid_vals, "Unknown (0x%08x)")); + ti = proto_tree_add_text(mqroot_tree, tvb, offset, iSizeHeader, "%s", val_to_str(structId, mq_structid_vals, "Unknown (0x%08x)")); mq_tree = proto_item_add_subtree(ti, ett_mq_head); proto_tree_add_item(mq_tree, hf_mq_head_structid, tvb, offset, 4, FALSE); diff --git a/epan/dissectors/packet-nbns.c b/epan/dissectors/packet-nbns.c index d5cf3ed5de..1c35d9550e 100644 --- a/epan/dissectors/packet-nbns.c +++ b/epan/dissectors/packet-nbns.c @@ -1015,7 +1015,7 @@ dissect_answer_records(tvbuff_t *tvb, int cur_off, int nbns_data_offset, start_off = cur_off; if (nbns_tree != NULL) { - ti = proto_tree_add_text(nbns_tree, tvb, start_off, -1, name); + ti = proto_tree_add_text(nbns_tree, tvb, start_off, -1, "%s", name); qatree = proto_item_add_subtree(ti, ett_nbns_ans); } while (count-- > 0) { diff --git a/epan/dissectors/packet-ndmp.c b/epan/dissectors/packet-ndmp.c index fcbf8f3822..aec552c791 100644 --- a/epan/dissectors/packet-ndmp.c +++ b/epan/dissectors/packet-ndmp.c @@ -2840,7 +2840,7 @@ dissect_ndmp_cmd(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree if (tvb_reported_length_remaining(tvb, offset) > 0) { if(tree){ - cmd_item = proto_tree_add_text(tree, tvb, offset, -1, + cmd_item = proto_tree_add_text(tree, tvb, offset, -1, "%s", msg_vals[i].strptr); cmd_tree = proto_item_add_subtree(cmd_item, ett_ndmp); } diff --git a/epan/dissectors/packet-ndps.c b/epan/dissectors/packet-ndps.c index 32f43650ce..02773f0570 100644 --- a/epan/dissectors/packet-ndps.c +++ b/epan/dissectors/packet-ndps.c @@ -2077,7 +2077,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_7, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_7, tvb, foffset, length, "%s", label); break; case 10: label_value = tvb_get_ntohl(tvb, foffset+6); @@ -2088,7 +2088,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_8, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_8, tvb, foffset, length, "%s", label); break; case 11: label_value = tvb_get_ntohl(tvb, foffset+7); @@ -2099,7 +2099,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_9, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_9, tvb, foffset, length, "%s", label); break; case 12: label_value = tvb_get_ntohl(tvb, foffset+8); @@ -2110,7 +2110,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_10, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_10, tvb, foffset, length, "%s", label); break; case 13: label_value = tvb_get_ntohl(tvb, foffset+9); @@ -2121,7 +2121,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_11, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_11, tvb, foffset, length, "%s", label); break; case 14: label_value = tvb_get_ntohl(tvb, foffset+10); @@ -2132,7 +2132,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_12, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_12, tvb, foffset, length, "%s", label); break; case 15: label_value = tvb_get_ntohl(tvb, foffset+11); @@ -2143,7 +2143,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_13, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_13, tvb, foffset, length, "%s", label); break; case 16: label_value = tvb_get_ntohl(tvb, foffset+12); @@ -2154,7 +2154,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_14, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_14, tvb, foffset, length, "%s", label); break; case 17: label_value = tvb_get_ntohl(tvb, foffset+13); @@ -2165,7 +2165,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_15, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_15, tvb, foffset, length, "%s", label); break; case 18: label_value = tvb_get_ntohl(tvb, foffset+14); @@ -2176,7 +2176,7 @@ objectidentifier(tvbuff_t* tvb, proto_tree *ndps_tree, int foffset) found=FALSE; break; } - aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_16, tvb, foffset, length, label); + aitem = proto_tree_add_none_format(ndps_tree, hf_ndps_object_ids_16, tvb, foffset, length, "%s", label); break; default: aitem = proto_tree_add_text(ndps_tree, tvb, foffset, length, "Unknown ID"); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index f6f1bdc404..9f366148ef 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -884,7 +884,7 @@ static int flow_process_textfield(proto_tree * pdutree, tvbuff_t * tvb, int offset, int bytes, const char *text) { - proto_tree_add_text(pdutree, tvb, offset, bytes, text); + proto_tree_add_text(pdutree, tvb, offset, bytes, "%s", text); offset += bytes; return offset; diff --git a/epan/dissectors/packet-nlsp.c b/epan/dissectors/packet-nlsp.c index 5935046dd1..26d0729c5b 100644 --- a/epan/dissectors/packet-nlsp.c +++ b/epan/dissectors/packet-nlsp.c @@ -668,18 +668,18 @@ dissect_lsp_link_info_clv(tvbuff_t *tvb, proto_tree *tree, int offset, } if (tree) { flags_cost = tvb_get_guint8(tvb, offset); - proto_tree_add_text(tree, tvb, offset, 1, + proto_tree_add_text(tree, tvb, offset, 1, "%s", decode_boolean_bitfield(flags_cost, 0x80, 1*8, "Cost not present", "Cost present")); if (!(flags_cost & 0x80)) { /* * 0x80 clear => cost present. */ - proto_tree_add_text(tree, tvb, offset, 1, + proto_tree_add_text(tree, tvb, offset, 1, "%s", decode_boolean_bitfield(flags_cost, 0x40, 1*8, "Cost is internal metric", "Cost is external metric")); - proto_tree_add_text(tree, tvb, offset, 1, + proto_tree_add_text(tree, tvb, offset, 1, "%s", decode_numeric_bitfield(flags_cost, 0x3F, 1*8, "Cost = %u")); } -- cgit v1.2.3