diff options
| author | Michael Mann <mmann78@netscape.net> | 2012-09-27 04:36:40 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2012-09-27 04:36:40 +0000 |
| commit | 65ef9e9d6b691cd54540b94fb8393c02443fd9d4 (patch) | |
| tree | cfeec151dcb3ccb5ee66094cd6ac3b1cadb82580 /epan/dissectors/packet-dvbci.c | |
| parent | 0063cc00c803c80e80ff809da781987846478354 (diff) | |
replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything.
svn path=/trunk/; revision=45166
Diffstat (limited to 'epan/dissectors/packet-dvbci.c')
| -rw-r--r-- | epan/dissectors/packet-dvbci.c | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c index b91ec34ecc..b7f4123ae1 100644 --- a/epan/dissectors/packet-dvbci.c +++ b/epan/dissectors/packet-dvbci.c @@ -2249,24 +2249,14 @@ dissect_res_id(tvbuff_t *tvb, gint offset, packet_info *pinfo, /* parameter "value" == complete resource id, RES_..._MASK will be applied by the hf definition */ - proto_tree_add_uint_format(res_tree, hf_dvbci_res_id_type, - tvb, offset, tvb_data_len, res_id, "%s", - decode_numeric_bitfield(res_id, RES_ID_TYPE_MASK, 32, - "Resource ID Type: 0x%x")); - proto_tree_add_uint_format(res_tree, hf_dvbci_res_class, - tvb, offset, tvb_data_len, res_id, "%s (%s)", - decode_numeric_bitfield(res_id, RES_CLASS_MASK, 32, - "Resource Class: 0x%x"), - val_to_str_const(RES_CLASS(res_id), dvbci_res_class, - "Invalid Resource class")); - proto_tree_add_uint_format(res_tree, hf_dvbci_res_type, - tvb, offset, tvb_data_len, res_id, "%s", - decode_numeric_bitfield(res_id, RES_TYPE_MASK, 32, - "Resource Type: 0x%x")); - proto_tree_add_uint_format(res_tree, hf_dvbci_res_ver, - tvb, offset, tvb_data_len, res_id, "%s", - decode_numeric_bitfield(res_id, RES_VER_MASK, 32, - "Resource Version: 0x%x")); + proto_tree_add_uint(res_tree, hf_dvbci_res_id_type, + tvb, offset, tvb_data_len, res_id); + proto_tree_add_uint(res_tree, hf_dvbci_res_class, + tvb, offset, tvb_data_len, res_id); + proto_tree_add_uint(res_tree, hf_dvbci_res_type, + tvb, offset, tvb_data_len, res_id); + proto_tree_add_uint(res_tree, hf_dvbci_res_ver, + tvb, offset, tvb_data_len, res_id); } return ti; @@ -4655,7 +4645,7 @@ proto_register_dvbci(void) }, { &hf_dvbci_res_class, { "Resource Class", "dvb-ci.res.class", - FT_UINT32, BASE_HEX, NULL, RES_CLASS_MASK, NULL, HFILL } + FT_UINT32, BASE_HEX, VALS(dvbci_res_class), RES_CLASS_MASK, NULL, HFILL } }, { &hf_dvbci_res_type, { "Resource Type", "dvb-ci.res.type", |