From d9a5e3a1d294e8a16c0b0c14041c11d5eff25abf Mon Sep 17 00:00:00 2001 From: Chris Maynard Date: Sat, 9 Jun 2012 17:47:58 +0000 Subject: Do not use BASE_NONE for FT_*INT* types. svn path=/trunk/; revision=43177 --- asn1/t124/packet-t124-template.c | 2 +- epan/dissectors/packet-bzr.c | 2 +- epan/dissectors/packet-h248_annex_e.c | 2 +- epan/dissectors/packet-homeplug-av.c | 2 +- epan/dissectors/packet-nflog.c | 2 +- epan/dissectors/packet-opensafety.c | 2 +- epan/dissectors/packet-t124.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/asn1/t124/packet-t124-template.c b/asn1/t124/packet-t124-template.c index 0b1238db0d..d4fb8442b4 100644 --- a/asn1/t124/packet-t124-template.c +++ b/asn1/t124/packet-t124-template.c @@ -201,7 +201,7 @@ void proto_register_t124(void) { proto_register_subtree_array(ett, array_length(ett)); t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE); - t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_NONE); + t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_HEX); new_register_dissector("t124", dissect_t124_new, proto_t124); diff --git a/epan/dissectors/packet-bzr.c b/epan/dissectors/packet-bzr.c index 0d8890cff6..98f9053f7f 100644 --- a/epan/dissectors/packet-bzr.c +++ b/epan/dissectors/packet-bzr.c @@ -261,7 +261,7 @@ proto_register_bzr(void) { static hf_register_info hf[] = { { &hf_bzr_packet_kind, - { "Packet kind", "bzr.kind", FT_UINT8, BASE_NONE, + { "Packet kind", "bzr.kind", FT_UINT8, BASE_DEC, VALS(message_part_kind), 0x0, NULL, HFILL }, }, { &hf_bzr_packet_protocol_version, diff --git a/epan/dissectors/packet-h248_annex_e.c b/epan/dissectors/packet-h248_annex_e.c index 2f75286ab6..af2865ea64 100644 --- a/epan/dissectors/packet-h248_annex_e.c +++ b/epan/dissectors/packet-h248_annex_e.c @@ -966,7 +966,7 @@ void proto_register_h248_annex_e(void) { { &hf_h248_pkg_tonegen_sig_pt, { "Play Tone (pt)", "h248.pkg.tonegen.pg", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, { &hf_h248_pkg_tonegen_sig_pt_tl, { "Tone List ID (tl)", "h248.pkg.tonegen.pt.tl", FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }}, { &hf_h248_pkg_tonegen_sig_pt_ind, { "Inter-signal Duration (ind)", "h248.pkg.tonegem.pt.ind", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, - { &hf_h248_pkg_tonegen_sig_pg_btd, { "Tone Direction (btd)", "h248.pkg.tonegen.pt.btd", FT_UINT32, BASE_NONE, VALS(h248_pkg_tonegen_pt_btd_param_vals), 0, NULL, HFILL }}, + { &hf_h248_pkg_tonegen_sig_pg_btd, { "Tone Direction (btd)", "h248.pkg.tonegen.pt.btd", FT_UINT32, BASE_HEX, VALS(h248_pkg_tonegen_pt_btd_param_vals), 0, NULL, HFILL }}, /* H.248.1 E.4 Tone Detection (tonedet) */ { &hf_h248_pkg_tonedet, { "Tone Detection Package", "h248.pkg.tonedet", FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL }}, diff --git a/epan/dissectors/packet-homeplug-av.c b/epan/dissectors/packet-homeplug-av.c index 23dccb4ecb..b65d02464d 100644 --- a/epan/dissectors/packet-homeplug-av.c +++ b/epan/dissectors/packet-homeplug-av.c @@ -3368,7 +3368,7 @@ proto_register_homeplug_av(void) }, { &hf_homeplug_av_rs_dev_cnf_status, { "Status", "homeplug_av.rs_dev_cnf.status", - FT_UINT8, BASE_NONE, VALS(homeplug_av_rs_dev_status_vals), 0x00, "Unknown", HFILL } + FT_UINT8, BASE_HEX, VALS(homeplug_av_rs_dev_status_vals), 0x00, "Unknown", HFILL } }, /* Shared memory related fields */ { &hf_homeplug_av_mem_len_16bits, diff --git a/epan/dissectors/packet-nflog.c b/epan/dissectors/packet-nflog.c index c4130b78bf..cfc9104aad 100644 --- a/epan/dissectors/packet-nflog.c +++ b/epan/dissectors/packet-nflog.c @@ -340,7 +340,7 @@ proto_register_nflog(void) }, { &hf_nflog_encoding, - { "Encoding", "nflog.encoding", FT_UINT32, BASE_NONE, VALS(_encoding_vals), 0x00, NULL, HFILL } + { "Encoding", "nflog.encoding", FT_UINT32, BASE_HEX, VALS(_encoding_vals), 0x00, NULL, HFILL } }, /* TLV */ diff --git a/epan/dissectors/packet-opensafety.c b/epan/dissectors/packet-opensafety.c index 0e47a99948..2eee959363 100644 --- a/epan/dissectors/packet-opensafety.c +++ b/epan/dissectors/packet-opensafety.c @@ -1701,7 +1701,7 @@ proto_register_opensafety(void) FT_UINT8, BASE_HEX, VALS(message_type_values), 0x0, NULL, HFILL } }, { &hf_oss_msg_category, { "Type", "opensafety.msg.type", - FT_UINT16, BASE_NONE, VALS(message_id_values), 0x0, NULL, HFILL } }, + FT_UINT16, BASE_HEX, VALS(message_id_values), 0x0, NULL, HFILL } }, { &hf_oss_msg_direction, { "Direction", "opensafety.msg.direction", FT_BOOLEAN, BASE_NONE, TFS(&opensafety_message_direction), 0x0, NULL, HFILL } }, diff --git a/epan/dissectors/packet-t124.c b/epan/dissectors/packet-t124.c index e698ec5cb8..4617af2f73 100644 --- a/epan/dissectors/packet-t124.c +++ b/epan/dissectors/packet-t124.c @@ -4010,7 +4010,7 @@ void proto_register_t124(void) { proto_register_subtree_array(ett, array_length(ett)); t124_ns_dissector_table = register_dissector_table("t124.ns", "T.124 H.221 Non Standard Dissectors", FT_STRING, BASE_NONE); - t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_NONE); + t124_sd_dissector_table = register_dissector_table("t124.sd", "T.124 H.221 Send Data Dissectors", FT_UINT32, BASE_HEX); new_register_dissector("t124", dissect_t124_new, proto_t124); -- cgit v1.2.1