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-mbim.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'epan/dissectors/packet-mbim.c') diff --git a/epan/dissectors/packet-mbim.c b/epan/dissectors/packet-mbim.c index ebc693eb18..4afd165cdf 100644 --- a/epan/dissectors/packet-mbim.c +++ b/epan/dissectors/packet-mbim.c @@ -5684,7 +5684,7 @@ proto_register_mbim(void) }, { &hf_mbim_provider_rssi, { "RSSI", "mbim.control.provider.rssi", - FT_UINT32, BASE_CUSTOM, mbim_rssi_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(mbim_rssi_fmt), 0, NULL, HFILL } }, { &hf_mbim_provider_error_rate, @@ -5879,7 +5879,7 @@ proto_register_mbim(void) }, { &hf_mbim_signal_state_info_rssi, { "RSSI", "mbim.control.signal_state_info.rssi", - FT_UINT32, BASE_CUSTOM, mbim_rssi_fmt, 0, + FT_UINT32, BASE_CUSTOM, CF_FUNC(mbim_rssi_fmt), 0, NULL, HFILL } }, { &hf_mbim_signal_state_info_error_rate, -- cgit v1.2.1