[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3f765b3ef94fd6044279d47d0b30b46c344e5943
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

3f765b3 by Gerald Combs (gerald@xxxxxxxx):

    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@xxxxxxxxxxxxx>
    

Actions performed:

    from  be5e595   Make it a bit more like the way it was before all these changes.
    adds  3f765b3   Add a CF_FUNC macro for casting BASE_CUSTOM functions.


Summary of changes:
 asn1/lpp/lpp.cnf                               |  534 ++++++++++++------------
 asn1/lte-rrc/lte-rrc.cnf                       |    6 +-
 doc/README.dissector                           |    6 +-
 epan/dissectors/packet-acr122.c                |    6 +-
 epan/dissectors/packet-aim-generic.c           |    2 +-
 epan/dissectors/packet-alljoyn.c               |    3 +-
 epan/dissectors/packet-cisco-erspan.c          |    2 +-
 epan/dissectors/packet-dcerpc-epm.c            |    2 +-
 epan/dissectors/packet-dhcpv6.c                |    2 +-
 epan/dissectors/packet-elasticsearch.c         |    4 +-
 epan/dissectors/packet-enip.c                  |    2 +-
 epan/dissectors/packet-epl.c                   |    6 +-
 epan/dissectors/packet-gmr1_bcch.c             |   20 +-
 epan/dissectors/packet-gmr1_rach.c             |   18 +-
 epan/dissectors/packet-gmr1_rr.c               |   20 +-
 epan/dissectors/packet-gsm_a_gm.c              |    2 +-
 epan/dissectors/packet-gsm_abis_oml.c          |    4 +-
 epan/dissectors/packet-hdmi.c                  |    2 +-
 epan/dissectors/packet-homeplug.c              |    2 +-
 epan/dissectors/packet-ieee80211-prism.c       |    2 +-
 epan/dissectors/packet-ieee80211.c             |   68 +--
 epan/dissectors/packet-ipmi-app.c              |   18 +-
 epan/dissectors/packet-ipmi-chassis.c          |    6 +-
 epan/dissectors/packet-ipmi-picmg.c            |   22 +-
 epan/dissectors/packet-ipmi-se.c               |   16 +-
 epan/dissectors/packet-ipmi-storage.c          |    4 +-
 epan/dissectors/packet-ipmi-transport.c        |   74 ++--
 epan/dissectors/packet-ipmi-vita.c             |    2 +-
 epan/dissectors/packet-ipp.c                   |    2 +-
 epan/dissectors/packet-j1939.c                 |    4 +-
 epan/dissectors/packet-kink.c                  |    4 +-
 epan/dissectors/packet-llc.c                   |    4 +-
 epan/dissectors/packet-lldp.c                  |   10 +-
 epan/dissectors/packet-lpp.c                   |  512 +++++++++++------------
 epan/dissectors/packet-lte-rrc.c               |  192 ++++-----
 epan/dissectors/packet-mbim.c                  |    4 +-
 epan/dissectors/packet-mip6.c                  |    4 +-
 epan/dissectors/packet-msnlb.c                 |    2 +-
 epan/dissectors/packet-netflow.c               |    2 +-
 epan/dissectors/packet-netlink-route.c         |    6 +-
 epan/dissectors/packet-ouch.c                  |   38 +-
 epan/dissectors/packet-rfid-pn532.c            |    4 +-
 epan/dissectors/packet-s5066dts.c              |    4 +-
 epan/dissectors/packet-soupbintcp.c            |    4 +-
 epan/dissectors/packet-stanag4607.c            |  120 +++---
 epan/dissectors/packet-ua3g.c                  |   14 +-
 epan/dissectors/packet-wccp.c                  |   41 +-
 epan/dissectors/packet-zbee-zcl-general.c      |   36 +-
 epan/dissectors/packet-zbee-zcl-ha.c           |    2 +-
 epan/dissectors/packet-zbee-zcl-meas-sensing.c |   32 +-
 epan/dissectors/packet-zbee-zcl-se.c           |    4 +-
 epan/proto.h                                   |    8 +
 tools/asn2wrs.py                               |    6 +-
 tools/checkAPIs.pl                             |    4 +-
 54 files changed, 964 insertions(+), 954 deletions(-)