Wireshark-commits: [Wireshark-commits] master 083f6b6: Have a #define for whether the capture buffe
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 25 Mar 2015 03:22:38 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=083f6b6e6dcd97aaf0553d0cfdd0b8a5fd2e6339
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

083f6b6 by Guy Harris (guy@xxxxxxxxxxxx):

    Have a #define for whether the capture buffer size can be set.
    
    It can be set if either 1) this is Windows (where we're assumed to be
    using WinPcap, which includes calls to set the buffer size) or 2) we
    have pcap_create() (in which case we also have pcap_set_buffer_size(),
    at least in a normal libpcap release).
    
    Use that rather than testing "defined(_WIN32) ||
    defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's
    being tested.
    
    Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12
    Reviewed-on: https://code.wireshark.org/review/7816
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  493ddd5   OK, this appears to be what's intended.
    adds  083f6b6   Have a #define for whether the capture buffer size can be set.


Summary of changes:
 acinclude.m4                        |    9 +++++-
 capchild/capture_sync.c             |    4 +--
 capture_opts.c                      |   12 ++++----
 capture_opts.h                      |    6 ++--
 cmake/modules/FindPCAP.cmake        |   13 +++++++-
 cmakeconfig.h.in                    |    3 ++
 config.h.win32                      |    9 ++++--
 dumpcap.c                           |    6 ++--
 epan/prefs.c                        |    4 +--
 epan/prefs.h                        |    2 +-
 tshark.c                            |    6 ++--
 ui/capture_ui_utils.c               |    2 +-
 ui/capture_ui_utils.h               |    2 +-
 ui/gtk/capture_dlg.c                |   58 +++++++++++++++--------------------
 ui/gtk/main.c                       |    6 ++--
 ui/gtk/prefs_capture.c              |   42 ++++++++++++-------------
 ui/iface_lists.c                    |    4 +--
 ui/qt/capture_interfaces_dialog.cpp |    2 +-
 ui/qt/manage_interfaces_dialog.cpp  |    4 +--
 wireshark-qt.cpp                    |    6 ++--
 20 files changed, 109 insertions(+), 91 deletions(-)