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-ipp.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-ipp.c')
| -rw-r--r-- | epan/dissectors/packet-ipp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ipp.c b/epan/dissectors/packet-ipp.c index 0236b60fcc..4ca6415b6d 100644 --- a/epan/dissectors/packet-ipp.c +++ b/epan/dissectors/packet-ipp.c @@ -684,7 +684,7 @@ proto_register_ipp(void) NULL, 0, NULL, HFILL }}, /* Generated from convert_proto_tree_add_text.pl */ - { &hf_ipp_version, { "Version", "ipp.version", FT_UINT16, BASE_CUSTOM, ipp_fmt_version, 0x0, NULL, HFILL }}, + { &hf_ipp_version, { "Version", "ipp.version", FT_UINT16, BASE_CUSTOM, CF_FUNC(ipp_fmt_version), 0x0, NULL, HFILL }}, { &hf_ipp_operation_id, { "Operation-id", "ipp.operation_id", FT_UINT16, BASE_HEX, VALS(operation_vals), 0x0, NULL, HFILL }}, { &hf_ipp_status_code, { "Status-code", "ipp.status_code", FT_UINT16, BASE_HEX, VALS(status_vals), 0x0, NULL, HFILL }}, { &hf_ipp_request_id, { "Request ID", "ipp.request_id", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, |