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 /doc/README.dissector | |
| 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 'doc/README.dissector')
| -rw-r--r-- | doc/README.dissector | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/README.dissector b/doc/README.dissector index 3f908efa0b..720b734861 100644 --- a/doc/README.dissector +++ b/doc/README.dissector @@ -140,7 +140,7 @@ FIELDDISPLAY --For FT_UINT{8,16,24,32,64} and FT_INT{8,16,24,32,64): --For all other types: BASE_NONE -FIELDCONVERT VALS(x), VALS64(x), RVALS(x), TFS(x), NULL +FIELDCONVERT VALS(x), VALS64(x), RVALS(x), TFS(x), CF_FUNC(x), NULL BITMASK Used to mask a field not 8-bit aligned or with a size other than a multiple of 8 bits FIELDDESCR A brief description of the field, or NULL. [Please do not use ""]. @@ -957,6 +957,10 @@ If the Boolean field is to be displayed as "False" or "True", the Wireshark predefines a whole range of ready made "true_false_string"s in tfs.h, included via packet.h. +-- Custom +Custom fields (BASE_CUSTOM) should use CF_FUNC(&custom_format_func) for the +'strings' field. + bitmask ------- If the field is a bitfield, then the bitmask is the mask which will |