Wireshark-commits: [Wireshark-commits] master 3066d6b: Don't call the Bluetooth code's UUID type "u
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: Sat, 7 Feb 2015 22:52:11 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3066d6b29fa872bc48176b8e4306e803a03dda8a
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

3066d6b by Guy Harris (guy@xxxxxxxxxxxx):

    Don't call the Bluetooth code's UUID type "uuid_t".
    
    uuid_t is a data type provided by a number of environments, thanks to
    the Open Software Fuundation; calling the Bluetooth code's data type,
    which includes an actual OSF-style UUID as a member, "uuid_t" can lead
    to confusion and *does* lead to compile errors on platforms where, for
    better or worse, system headers such as <unistd.h> define uuid_t (and
    are included by, for example, Qt headers).
    
    Just rename it "bluetooth_uuid_t".
    
    Change-Id: Ic742723913ba4105cd3269dd24fc821147285176
    Reviewed-on: https://code.wireshark.org/review/7017
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  96527e2   riemann: Fix bug found by MSVC203 Code Analysis
    adds  3066d6b   Don't call the Bluetooth code's UUID type "uuid_t".


Summary of changes:
 epan/dissectors/packet-bluetooth.c               |    8 +--
 epan/dissectors/packet-bluetooth.h               |    8 +--
 epan/dissectors/packet-btatt.c                   |   29 +++++-----
 epan/dissectors/packet-btatt.h                   |    2 +-
 epan/dissectors/packet-btsdp.c                   |   66 +++++++++++-----------
 epan/dissectors/packet-btsdp.h                   |    2 +-
 ui/qt/bluetooth_att_server_attributes_dialog.cpp |    4 +-
 7 files changed, 60 insertions(+), 59 deletions(-)