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-elasticsearch.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-elasticsearch.c')
| -rw-r--r-- | epan/dissectors/packet-elasticsearch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-elasticsearch.c b/epan/dissectors/packet-elasticsearch.c index 89c0cf2852..256334ecd5 100644 --- a/epan/dissectors/packet-elasticsearch.c +++ b/epan/dissectors/packet-elasticsearch.c @@ -428,7 +428,7 @@ static int elasticsearch_dissect_valid_binary_packet(tvbuff_t *tvb, packet_info * * Token/Magic number that is at the start of all ES packets */ - proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_BIG_ENDIAN); + proto_tree_add_item(tree, hf_elasticsearch_header_token, tvb, offset, 2, ENC_ASCII|ENC_NA); offset += 2; /* Message length */ @@ -531,7 +531,7 @@ void proto_register_elasticsearch(void) { { &hf_elasticsearch_version, { "Version", "elasticsearch.version", FT_UINT32, BASE_CUSTOM, - elasticsearch_format_version, 0x0, + CF_FUNC(elasticsearch_format_version), 0x0, NULL, HFILL } }, |