Wireshark-commits: [Wireshark-commits] master 1ac725f: packet-cigi.c: Fix conflicting datatypes for
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Mon, 22 Feb 2016 16:51:09 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1ac725f643d2b8a75dee215485d5f85f6303b8d1
Submitter: Michael Mann (mmann78@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

1ac725f by Michael Mann (mmann78@xxxxxxxxxxxx):

    packet-cigi.c: Fix conflicting datatypes for hf_ fields.
    
    'cigi.entity_control' exists multiple times with NOT compatible types: FT_FLOAT and FT_STRINGZ
    'cigi.entity_control' exists multiple times with NOT compatible types: FT_STRINGZ and FT_FLOAT
    'cigi.art_part_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.rate_control.part_id' exists multiple times with NOT compatible types: FT_UINT8 and FT_INT8
    'cigi.view_control.yoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.view_control.zoff_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.view_control.roll_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.view_control.pitch_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.view_control.yaw_enable' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_UINT8
    'cigi.short_symbol_control.value1' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32
    'cigi.short_symbol_control.value2' exists multiple times with NOT compatible types: FT_FLOAT and FT_UINT32
    
    Also replace some homemade true_false_string with some from tfs.h
    
    Change-Id: Ied8dfb320abb6f3218304fd06c5481167f1169ec
    Reviewed-on: https://code.wireshark.org/review/14069
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    

Actions performed:

    from  5aa3a88   Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.
    adds  1ac725f   packet-cigi.c: Fix conflicting datatypes for hf_ fields.


Summary of changes:
 epan/dissectors/packet-cigi.c |  225 ++++++++++++++++++++---------------------
 1 file changed, 107 insertions(+), 118 deletions(-)