From 126aa8539380e6b0b465b48d30f349b76afdc489 Mon Sep 17 00:00:00 2001 From: Bill Meier Date: Sat, 15 Oct 2011 18:46:26 +0000 Subject: Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows: 1. If there's no character encoding (ENC_ASCII, ...) specified then use ENC_ASCII. 2. For all but FT_UINT_STRING, always use ENC_NA (replacing any existing True/1/FALSE/0 /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN). svn path=/trunk/; revision=39426 --- epan/dissectors/packet-ff.c | 130 ++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 65 deletions(-) (limited to 'epan/dissectors/packet-ff.c') diff --git a/epan/dissectors/packet-ff.c b/epan/dissectors/packet-ff.c index 7a439888c1..cd21fad357 100644 --- a/epan/dissectors/packet-ff.c +++ b/epan/dissectors/packet-ff.c @@ -1853,7 +1853,7 @@ dissect_ff_msg_fda_open_sess_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_fda_open_sess_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -1927,7 +1927,7 @@ dissect_ff_msg_fda_open_sess_rsp(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, FALSE); + hf_ff_fda_open_sess_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -1988,7 +1988,7 @@ dissect_ff_msg_fda_open_sess_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_fda_open_sess_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -2118,7 +2118,7 @@ dissect_ff_msg_fda_idle_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_fda_idle_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -2172,12 +2172,12 @@ dissect_ff_msg_sm_find_tag_query_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, FALSE); + hf_ff_sm_find_tag_query_req_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_find_tag_query_req_vfd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -2339,12 +2339,12 @@ dissect_ff_msg_sm_find_tag_reply_req(tvbuff_t *tvb, gint offset, length -= 4; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_find_tag_reply_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_find_tag_reply_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -2853,12 +2853,12 @@ dissect_ff_msg_sm_id_rsp(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_id_rsp_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_id_rsp_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -2964,7 +2964,7 @@ dissect_ff_msg_sm_id_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_id_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_sm_id_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -3004,12 +3004,12 @@ dissect_ff_msg_sm_clear_addr_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_clear_addr_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_clear_addr_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -3113,7 +3113,7 @@ dissect_ff_msg_sm_clear_addr_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_sm_clear_addr_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -3262,12 +3262,12 @@ dissect_ff_msg_sm_set_assign_info_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_set_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_set_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -3426,7 +3426,7 @@ dissect_ff_msg_sm_set_assign_info_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_sm_set_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -3467,12 +3467,12 @@ dissect_ff_msg_sm_clear_assign_info_req(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_clear_assign_info_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_clear_assign_info_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -3570,7 +3570,7 @@ dissect_ff_msg_sm_clear_assign_info_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_sm_clear_assign_info_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -4023,12 +4023,12 @@ dissect_ff_msg_sm_dev_annunc_req(tvbuff_t *tvb, gint offset, length -= 16; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, FALSE); + hf_ff_sm_dev_annunc_req_dev_id, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_sm_dev_annunc_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -4140,7 +4140,7 @@ dissect_ff_msg_fms_init_req(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_fms_init_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -4244,7 +4244,7 @@ dissect_ff_msg_fms_init_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_init_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_fms_init_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -4446,7 +4446,7 @@ dissect_ff_msg_fms_status_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, - hf_ff_fms_status_err_additional_desc, tvb, offset, 16, FALSE); + hf_ff_fms_status_err_additional_desc, tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -4576,17 +4576,17 @@ dissect_ff_msg_fms_id_rsp(tvbuff_t *tvb, gint offset, } proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, FALSE); + hf_ff_fms_id_rsp_vendor_name, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_model_name, tvb, offset, 32, FALSE); + hf_ff_fms_id_rsp_model_name, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; proto_tree_add_item(sub_tree, - hf_ff_fms_id_rsp_revision, tvb, offset, 32, FALSE); + hf_ff_fms_id_rsp_revision, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; @@ -4646,7 +4646,7 @@ dissect_ff_msg_fms_id_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_id_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -4808,7 +4808,7 @@ dissect_ff_msg_fms_get_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_get_od_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -4948,7 +4948,7 @@ dissect_ff_msg_fms_init_put_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_init_put_od_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5084,7 +5084,7 @@ dissect_ff_msg_fms_put_od_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_put_od_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5221,7 +5221,7 @@ dissect_ff_msg_fms_terminate_put_od_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_terminate_put_od_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5364,7 +5364,7 @@ dissect_ff_msg_fms_generic_init_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_init_download_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5514,7 +5514,7 @@ dissect_ff_msg_fms_generic_download_segment_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_download_seg_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5670,7 +5670,7 @@ dissect_ff_msg_fms_generic_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_gen_terminate_download_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5812,7 +5812,7 @@ dissect_ff_msg_fms_init_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_init_download_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -5957,7 +5957,7 @@ dissect_ff_msg_fms_download_segment_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_download_seg_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6111,7 +6111,7 @@ dissect_ff_msg_fms_terminate_download_sequence_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_download_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6249,7 +6249,7 @@ dissect_ff_msg_fms_init_upload_seq_err( length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_init_upload_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6394,7 +6394,7 @@ dissect_ff_msg_fms_upload_segment_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_upload_seg_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6536,7 +6536,7 @@ dissect_ff_msg_fms_terminate_upload_seq_err( proto_tree_add_item(sub_tree, hf_ff_fms_terminate_upload_seq_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6584,7 +6584,7 @@ dissect_ff_msg_fms_req_dom_download_req( if(length) { proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_download_req_additional_info, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_ASCII|ENC_NA); } return; @@ -6678,7 +6678,7 @@ dissect_ff_msg_fms_req_dom_download_err( proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_download_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -6726,7 +6726,7 @@ dissect_ff_msg_fms_req_dom_upload_req( if(length) { proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_upload_req_additional_info, - tvb, offset, length, FALSE); + tvb, offset, length, ENC_ASCII|ENC_NA); } return; @@ -6819,7 +6819,7 @@ dissect_ff_msg_fms_req_dom_upload_err( proto_tree_add_item(sub_tree, hf_ff_fms_req_dom_upload_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7016,7 +7016,7 @@ dissect_ff_msg_fms_create_pi_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_create_pi_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7155,7 +7155,7 @@ dissect_ff_msg_fms_del_pi_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_del_pi_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7297,7 +7297,7 @@ dissect_ff_msg_fms_start_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_start_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7439,7 +7439,7 @@ dissect_ff_msg_fms_stop_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_stop_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7581,7 +7581,7 @@ dissect_ff_msg_fms_resume_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_resume_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7723,7 +7723,7 @@ dissect_ff_msg_fms_reset_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_reset_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7856,7 +7856,7 @@ dissect_ff_msg_fms_kill_pi_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_kill_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -7986,7 +7986,7 @@ dissect_ff_msg_fms_read_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_read_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -8126,7 +8126,7 @@ dissect_ff_msg_fms_read_subindex_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_read_with_subidx_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -8259,7 +8259,7 @@ dissect_ff_msg_fms_write_err(tvbuff_t *tvb, gint offset, length -= 2; proto_tree_add_item(sub_tree, hf_ff_fms_write_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -8401,7 +8401,7 @@ dissect_ff_msg_fms_write_subindex_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_write_with_subidx_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -8584,7 +8584,7 @@ dissect_ff_msg_fms_def_variable_list_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_def_variable_list_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -8721,7 +8721,7 @@ dissect_ff_msg_fms_del_variable_list_err(tvbuff_t *tvb, gint offset, proto_tree_add_item(sub_tree, hf_ff_fms_del_variable_list_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -9099,7 +9099,7 @@ dissect_ff_msg_fms_alter_alter_ev_condition_monitoring_err( proto_tree_add_item(sub_tree, hf_ff_fms_alter_ev_condition_monitoring_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -9246,7 +9246,7 @@ dissect_ff_msg_fms_ack_ev_notification_err( proto_tree_add_item(sub_tree, hf_ff_fms_ack_ev_notification_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -9537,7 +9537,7 @@ dissect_ff_msg_lr_get_info_err( proto_tree_add_item(sub_tree, hf_ff_lr_get_info_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -9983,7 +9983,7 @@ dissect_ff_msg_lr_put_info_err( proto_tree_add_item(sub_tree, hf_ff_lr_put_info_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -10202,7 +10202,7 @@ dissect_ff_msg_lr_get_statistics_err( proto_tree_add_item(sub_tree, hf_ff_lr_get_statistics_err_additional_desc, - tvb, offset, 16, FALSE); + tvb, offset, 16, ENC_ASCII|ENC_NA); offset += 16; length -= 16; @@ -10463,7 +10463,7 @@ dissect_ff_msg_diagnostic_msg_req( length -= 4; proto_tree_add_item(sub_tree, - hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, FALSE); + hf_ff_lr_diagnostic_msg_req_pd_tag, tvb, offset, 32, ENC_ASCII|ENC_NA); offset += 32; length -= 32; -- cgit v1.2.1