Wireshark · Wireshark-commits: [Wireshark-commits] master 9e82cff: ftypes: move set_value_uinteger into the union

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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e82cffeea10fce62cdfc49cec3b9e3794ac04bf
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9e82cff by Martin Kaiser (wireshark@xxxxxxxxx):

    ftypes: move set_value_uinteger into the union
    
    Delete set_value_uinteger from struct _ftype_t, make it part of the
    set_value union.
    
    Change-Id: I26de15be8ea0ede76236a8f8a4958bfd97ad9d52
    Reviewed-on: https://code.wireshark.org/review/20521
    Reviewed-by: Martin Kaiser <wireshark@xxxxxxxxx>
    Petri-Dish: Martin Kaiser <wireshark@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  c70927c   erf: fix this condition has identical branches [-Werror=duplicated-branches] found by gcc7
    adds  9e82cff   ftypes: move set_value_uinteger into the union


Summary of changes:
 epan/ftypes/ftype-bytes.c            |    9 ---------
 epan/ftypes/ftype-double.c           |    2 --
 epan/ftypes/ftype-guid.c             |    1 -
 epan/ftypes/ftype-ieee-11073-float.c |    6 ++----
 epan/ftypes/ftype-integer.c          |   35 +++++++---------------------------
 epan/ftypes/ftype-ipv4.c             |    3 +--
 epan/ftypes/ftype-ipv6.c             |    1 -
 epan/ftypes/ftype-none.c             |    1 -
 epan/ftypes/ftype-pcre.c             |    1 -
 epan/ftypes/ftype-protocol.c         |    1 -
 epan/ftypes/ftype-string.c           |    4 ----
 epan/ftypes/ftype-time.c             |    2 --
 epan/ftypes/ftypes-int.h             |    2 +-
 epan/ftypes/ftypes.c                 |   14 ++++++++++++--
 14 files changed, 23 insertions(+), 59 deletions(-)