From 3f765b3ef94fd6044279d47d0b30b46c344e5943 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Sun, 15 Feb 2015 17:58:12 -0800 Subject: 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 --- epan/dissectors/packet-stanag4607.c | 120 ++++++++++++++++++------------------ 1 file changed, 60 insertions(+), 60 deletions(-) (limited to 'epan/dissectors/packet-stanag4607.c') diff --git a/epan/dissectors/packet-stanag4607.c b/epan/dissectors/packet-stanag4607.c index 0898558201..7c58abe9d6 100644 --- a/epan/dissectors/packet-stanag4607.c +++ b/epan/dissectors/packet-stanag4607.c @@ -1045,38 +1045,38 @@ proto_register_stanag4607(void) { &hf_4607_dwell_time, { "Dwell Time", "s4607.dwell.time", FT_UINT32, BASE_CUSTOM, - prt_millisec, 0x0, + CF_FUNC(prt_millisec), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_lat, { "Sensor Position Latitude", "s4607.dwell.sensor.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_lon, { "Sensor Position Longitude", "s4607.dwell.sensor.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_alt, { "Sensor Position Altitude", "s4607.dwell.sensor.alt", FT_INT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, /* D10 */ { &hf_4607_dwell_scale_lat, { "Scale Factor, Latitude", "s4607.dwell.scale.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_scale_lon, { "Scale Factor, Longitude", "s4607.dwell.scale.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1084,19 +1084,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_unc_along, { "Sensor Position Uncertainty Along Track", "s4607.dwell.unc.along", FT_UINT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_unc_cross, { "Sensor Position Uncertainty Cross Track", "s4607.dwell.unc.cross", FT_UINT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_unc_alt, { "Sensor Position Uncertainty Altitude", "s4607.dwell.unc.alt", FT_UINT16, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, @@ -1104,19 +1104,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_track, { "Sensor Track", "s4607.dwell.track", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_speed, { "Sensor Speed", "s4607.dwell.speed", FT_UINT32, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_dwell_vert_velocity, { "Sensor Vertical Velocity", "s4607.dwell.vvel", FT_INT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, { &hf_4607_dwell_track_unc, @@ -1128,13 +1128,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_speed_unc, { "Sensor Speed Uncertainty", "s4607.dwell.speed.unc", FT_UINT16, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_dwell_vv_unc, { "Sensor Vertical Velocity Uncertainty", "s4607.dwell.vvel.unc", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, @@ -1142,19 +1142,19 @@ proto_register_stanag4607(void) { &hf_4607_dwell_plat_heading, { "Platform Orientation Heading", "s4607.dwell.plat.heading", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_plat_pitch, { "Platform Orientation Pitch", "s4607.dwell.plat.pitch", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_plat_roll, { "Platform Orientation Roll (Bank Angle)", "s4607.dwell.plat.roll", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, @@ -1162,25 +1162,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_da_lat, { "Dwell Area Center Latitude", "s4607.dwell.da.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_lon, { "Dwell Area Center Longitude", "s4607.dwell.da.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_range, { "Dwell Area Range Half Extent", "s4607.dwell.da.range", FT_UINT16, BASE_CUSTOM, - prt_kilo, 0x0, + CF_FUNC(prt_kilo), 0x0, NULL, HFILL } }, { &hf_4607_dwell_da_angle, { "Dwell Area Dwell Angle Half Extent", "s4607.dwell.da.angle", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, @@ -1188,25 +1188,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_sensor_heading, { "Sensor Orientation Heading", "s4607.dwell.sensor.heading", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_pitch, { "Sensor Orientation Pitch", "s4607.dwell.sensor.pitch", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_sensor_roll, { "Sensor Orientation Roll (Bank Angle)", "s4607.dwell.sensor.roll", FT_INT16, BASE_CUSTOM, - prt_sa16, 0x0, + CF_FUNC(prt_sa16), 0x0, NULL, HFILL } }, { &hf_4607_dwell_mdv, { "Minimum Detectable Velocity (MDV)", "s4607.dwell.mdv", FT_UINT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, @@ -1223,13 +1223,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_lat, { "Target Location Hi-Res Latitude", "s4607.dwell.rpt.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_lon, { "Target Location Hi-Res Longitude", "s4607.dwell.rpt.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1251,7 +1251,7 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_height, { "Target Location Geodetic Height", "s4607.dwell.rpt.height", FT_INT16, BASE_CUSTOM, - prt_meters, 0x0, + CF_FUNC(prt_meters), 0x0, NULL, HFILL } }, @@ -1259,13 +1259,13 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_radial, { "Target Velocity Line of Sight Component", "s4607.dwell.rpt.radial", FT_INT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_wrap, { "Target Wrap Velocity", "s4607.dwell.rpt.wrap", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_snr, @@ -1291,25 +1291,25 @@ proto_register_stanag4607(void) { &hf_4607_dwell_report_unc_slant, { "Target Measurement Uncertainty Slant Range", "s4607.dwell.rpt.unc.slant", FT_UINT16, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_cross, { "Target Measurement Uncertainty Cross Range", "s4607.dwell.rpt.unc.cross", FT_UINT16, BASE_CUSTOM, - prt_decimeters, 0x0, + CF_FUNC(prt_decimeters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_height, { "Target Measurement Uncertainty Height", "s4607.dwell.rpt.unc.height", FT_UINT8, BASE_CUSTOM, - prt_meters, 0x0, + CF_FUNC(prt_meters), 0x0, NULL, HFILL } }, { &hf_4607_dwell_report_unc_radial, { "Target Measurement Uncertainty Radial Velocity", "s4607.dwell.rpt.unc.radial", FT_UINT16, BASE_CUSTOM, - prt_speed_centi, 0x0, + CF_FUNC(prt_speed_centi), 0x0, NULL, HFILL } }, @@ -1370,50 +1370,50 @@ proto_register_stanag4607(void) { &hf_4607_jobdef_ba_lat_a, { "Bounding Area Point A Latitude", "s4607.job.ba.lat.a", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_a, { "Bounding Area Point A Longitude", "s4607.job.ba.lon.a", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_b, { "Bounding Area Point B Latitude", "s4607.job.ba.lat.b", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_b, { "Bounding Area Point B Longitude", "s4607.job.ba.lon.b", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_c, { "Bounding Area Point C Latitude", "s4607.job.ba.lat.c", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_c, { "Bounding Area Point C Longitude", "s4607.job.ba.lon.c", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lat_d, { "Bounding Area Point D Latitude", "s4607.job.ba.lat.d", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_ba_lon_d, { "Bounding Area Point D Longitude", "s4607.job.ba.lon.d", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, @@ -1433,68 +1433,68 @@ proto_register_stanag4607(void) { &hf_4607_jobdef_unc_along, { "Nominal Sensor Position Uncertainty Along Track", "s4607.job.unc.track", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_cross, { "Nominal Sensor Position Uncertainty Cross Track", "s4607.job.unc.cross", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_alt, { "Nominal Sensor Position Uncertainty Altitude", "s4607.job.unc.alt", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_heading, { "Nominal Sensor Position Uncertainty Track Heading", "s4607.job.unc.heading", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_unc_speed, { "Nominal Sensor Position Uncertainty Speed", "s4607.job.unc.speed", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_slant, { "Nominal Sensor Slant Range Standard Deviation", "s4607.job.sense.slant", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_cross, { "Nominal Sensor Cross Range Standard Deviation", "s4607.job.sense.cross", FT_UINT16, BASE_CUSTOM, - prt_ba16_none, 0x0, + CF_FUNC(prt_ba16_none), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_vlos, { "Nominal Sensor Velocity Line-Of-Sight Std. Dev", "s4607.job.sense.vlos", FT_UINT16, BASE_CUSTOM, - prt_none16, 0x0, + CF_FUNC(prt_none16), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_mdv, { "Nominal Sensor Minimum Dectectable Velocity (MDV)", "s4607.job.sense.mdv", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_prob, { "Nominal Sensor Detection Probability", "s4607.job.sense.prob", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_sense_alarm, { "Nominal Sensor False Alarm Density", "s4607.job.sense.alarm", FT_UINT8, BASE_CUSTOM, - prt_none8, 0x0, + CF_FUNC(prt_none8), 0x0, NULL, HFILL } }, { &hf_4607_jobdef_terrain_model, @@ -1559,43 +1559,43 @@ proto_register_stanag4607(void) { &hf_4607_platloc_time, { "Platform Location Time", "s4607.ploc.time", FT_UINT32, BASE_CUSTOM, - prt_millisec, 0x0, + CF_FUNC(prt_millisec), 0x0, NULL, HFILL } }, { &hf_4607_platloc_latitude, { "Platform Position Latitude", "s4607.ploc.lat", FT_INT32, BASE_CUSTOM, - prt_sa32, 0x0, + CF_FUNC(prt_sa32), 0x0, NULL, HFILL } }, { &hf_4607_platloc_longitude, { "Platform Position Longitude", "s4607.ploc.lon", FT_UINT32, BASE_CUSTOM, - prt_ba32, 0x0, + CF_FUNC(prt_ba32), 0x0, NULL, HFILL } }, { &hf_4607_platloc_altitude, { "Platform Position Altitude", "s4607.ploc.alt", FT_INT32, BASE_CUSTOM, - prt_centimeters, 0x0, + CF_FUNC(prt_centimeters), 0x0, NULL, HFILL } }, { &hf_4607_platloc_track, { "Platform Track", "s4607.ploc.track", FT_UINT16, BASE_CUSTOM, - prt_ba16, 0x0, + CF_FUNC(prt_ba16), 0x0, NULL, HFILL } }, { &hf_4607_platloc_speed, { "Platform Speed", "s4607.ploc.speed", FT_UINT32, BASE_CUSTOM, - prt_speed, 0x0, + CF_FUNC(prt_speed), 0x0, NULL, HFILL } }, { &hf_4607_platloc_vertical_velocity, { "Platform Vertical Velocity", "s4607.ploc.velocity", FT_INT8, BASE_CUSTOM, - prt_speed_deci, 0x0, + CF_FUNC(prt_speed_deci), 0x0, NULL, HFILL } }, -- cgit v1.2.3