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-acr122.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-acr122.c')
| -rw-r--r-- | epan/dissectors/packet-acr122.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c index 04a621f995..b134c2ccc8 100644 --- a/epan/dissectors/packet-acr122.c +++ b/epan/dissectors/packet-acr122.c @@ -755,12 +755,12 @@ proto_register_acr122(void) }, { &hf_led_t1_duration, { "T1 Duration", "acr122.led.t1_duration", - FT_UINT8, BASE_CUSTOM, duration_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(duration_base), 0x00, "Initial Blinking State", HFILL } }, { &hf_led_t2_duration, { "T2 Duration", "acr122.led.t2_duration", - FT_UINT8, BASE_CUSTOM, duration_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(duration_base), 0x00, "Toggle Blinking State", HFILL } }, { &hf_led_number_of_repetition, @@ -780,7 +780,7 @@ proto_register_acr122(void) }, { &hf_timeout, { "Timeout", "acr122.timeout", - FT_UINT8, BASE_CUSTOM, timeout_base, 0x00, + FT_UINT8, BASE_CUSTOM, CF_FUNC(timeout_base), 0x00, NULL, HFILL } }, { &hf_status_word_led_reserved, |