diff options
| author | Gerald Combs <gerald@zing.org> | 2015-02-15 17:58:12 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-18 00:05:38 +0000 |
| commit | 3f765b3ef94fd6044279d47d0b30b46c344e5943 (patch) | |
| tree | 1218985b912e24bc88d72617d61a7491911ee092 /epan/dissectors/packet-gmr1_rach.c | |
| parent | be5e595da7beb355d385c6a9d96fdd1dad569e61 (diff) | |
Add a CF_FUNC macro for casting BASE_CUSTOM functions.
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:
warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]
We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.
Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.
Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.
Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-gmr1_rach.c')
| -rw-r--r-- | epan/dissectors/packet-gmr1_rach.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/epan/dissectors/packet-gmr1_rach.c b/epan/dissectors/packet-gmr1_rach.c index 1f765547bb..7b49b6d158 100644 --- a/epan/dissectors/packet-gmr1_rach.c +++ b/epan/dissectors/packet-gmr1_rach.c @@ -991,12 +991,12 @@ proto_register_gmr1_rach(void) }, { &hf_rach_gps_pos_lat, { "Latitude", "gmr1.rach.gps_pos.latitude", - FT_INT24, BASE_CUSTOM, rach_gps_pos_lat_fmt, 0x7ffff0, + FT_INT24, BASE_CUSTOM, CF_FUNC(rach_gps_pos_lat_fmt), 0x7ffff0, NULL, HFILL } }, { &hf_rach_gps_pos_long, { "Longitude", "gmr1.rach.gps_pos.longitude", - FT_INT24, BASE_CUSTOM, rach_gps_pos_long_fmt, 0x0fffff, + FT_INT24, BASE_CUSTOM, CF_FUNC(rach_gps_pos_long_fmt), 0x0fffff, NULL, HFILL } }, { &hf_rach_mes_pwr_class, @@ -1006,7 +1006,7 @@ proto_register_gmr1_rach(void) }, { &hf_rach_sp_hplmn_id, { "SP/HPLMN ID", "gmr1.rach.sp_hplmn_id", - FT_UINT24, BASE_CUSTOM, rach_sp_hplmn_id_fmt, 0x0fffff, + FT_UINT24, BASE_CUSTOM, CF_FUNC(rach_sp_hplmn_id_fmt), 0x0fffff, NULL, HFILL } }, { &hf_rach_pd, @@ -1021,27 +1021,27 @@ proto_register_gmr1_rach(void) }, { &hf_rach_number_grp1, { "Group 1", "gmr1.rach.number.grp1", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x3ff0, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x3ff0, NULL, HFILL } }, { &hf_rach_number_grp2, { "Group 2", "gmr1.rach.number.grp2", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x0ffc, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x0ffc, NULL, HFILL } }, { &hf_rach_number_grp3, { "Group 3", "gmr1.rach.number.grp3", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0x03ff, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0x03ff, NULL, HFILL } }, { &hf_rach_number_grp4, { "Group 4", "gmr1.rach.number.grp4", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp1234_fmt, 0xffc0, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp1234_fmt), 0xffc0, NULL, HFILL } }, { &hf_rach_number_grp5, { "Group 5", "gmr1.rach.number.grp5", - FT_UINT16, BASE_CUSTOM, rach_dialed_num_grp5_fmt, 0x3ff8, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_dialed_num_grp5_fmt), 0x3ff8, NULL, HFILL } }, { &hf_rach_msc_id, @@ -1051,7 +1051,7 @@ proto_register_gmr1_rach(void) }, { &hf_rach_gps_timestamp, { "GPS Timestamp", "gmr1.rach.gps_timestamp", - FT_UINT16, BASE_CUSTOM, rach_gps_timestamp_fmt, 0xffff, + FT_UINT16, BASE_CUSTOM, CF_FUNC(rach_gps_timestamp_fmt), 0xffff, NULL, HFILL } }, { &hf_rach_software_version, |