Wireshark-commits: [Wireshark-commits] master 9e6487f: Move utility routines for capturing into a l
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: Fri, 4 Jul 2014 07:25:29 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=9e6487f24751d1c1a047ee82e158077ac67c9c68
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

9e6487f by Guy Harris (guy@xxxxxxxxxxxx):

    Move utility routines for capturing into a libcaputils static library.
    
    Some of those routines are used only in dumpcap; others are used in
    TShark and Wireshark as well.
    
    Change-Id: I9d92483f2fcff57a7d8b6bf6bdf2870505d19fb7
    Reviewed-on: https://code.wireshark.org/review/2841
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  c5643a3   Remove accidental trailing \
    adds  9e6487f   Move utility routines for capturing into a libcaputils static library.


Summary of changes:
 CMakeLists.txt                                     |   25 +++-----
 Makefile.am                                        |   17 +++---
 Makefile.common                                    |   15 +----
 Makefile.nmake                                     |   32 +++++++----
 capchild/Makefile.common                           |    1 -
 capchild/capture_ifinfo.c                          |    2 +-
 capchild/capture_sync.c                            |    4 +-
 capture_opts.c                                     |    5 +-
 capture_opts.h                                     |    2 +-
 {capchild => caputils}/CMakeLists.txt              |   31 +++++++---
 {capchild => caputils}/Makefile.am                 |   37 +++++++-----
 {capchild => caputils}/Makefile.common             |   14 +++--
 {capchild => caputils}/Makefile.nmake              |   19 ++++---
 .../capture-pcap-util-int.h                        |    0
 .../capture-pcap-util-unix.c                       |   60 ++++++++++++++++----
 .../capture-pcap-util.c                            |    8 +--
 .../capture-pcap-util.h                            |   16 +++---
 capture-wpcap.c => caputils/capture-wpcap.c        |    8 +--
 capture-wpcap.h => caputils/capture-wpcap.h        |    0
 {capchild => caputils}/capture_ifinfo.h            |    0
 .../capture_win_ifnames.c                          |    2 +-
 .../capture_win_ifnames.h                          |    0
 .../capture_wpcap_packet.c                         |    2 +-
 .../capture_wpcap_packet.h                         |    0
 {capchild => caputils}/doxygen.cfg.in              |    8 +--
 ws80211_utils.c => caputils/ws80211_utils.c        |    0
 ws80211_utils.h => caputils/ws80211_utils.h        |    0
 configure.ac                                       |    2 +
 dumpcap.c                                          |   48 ++++------------
 echld/Makefile.am                                  |    2 +
 echld/Makefile.common                              |    5 +-
 echld/echld-int.h                                  |    2 +-
 rawshark.c                                         |    4 +-
 tshark.c                                           |   49 +++-------------
 ui/capture.c                                       |    6 +-
 ui/capture_ui_utils.c                              |    2 +-
 ui/gtk/capture_dlg.c                               |    4 +-
 ui/gtk/capture_if_details_dlg_win32.c              |    4 +-
 ui/gtk/capture_if_dlg.c                            |    6 +-
 ui/gtk/capture_if_dlg.h                            |    2 +-
 ui/gtk/capture_info_dlg.c                          |    2 +
 ui/gtk/main.c                                      |   55 +++---------------
 ui/gtk/main_80211_toolbar.c                        |    2 +-
 ui/gtk/main_welcome.c                              |    2 +
 ui/gtk/prefs_capture.c                             |    2 +-
 ui/gtk/prefs_dlg.c                                 |    2 +-
 ui/gtk/summary_dlg.c                               |    2 +
 ui/qt/QtShark.pro                                  |   13 ++---
 ui/qt/interface_tree.h                             |    2 +-
 ui/qt/main.cpp                                     |   55 +++---------------
 ui/qt/main_window.cpp                              |    2 +
 ui/qt/main_window_slots.cpp                        |    2 +
 ui/qt/preferences_dialog.cpp                       |    2 +-
 ui/qt/summary_dialog.h                             |    2 +
 version_info.c                                     |    1 -
 55 files changed, 261 insertions(+), 329 deletions(-)
 copy {capchild => caputils}/CMakeLists.txt (68%)
 copy {capchild => caputils}/Makefile.am (75%)
 copy {capchild => caputils}/Makefile.common (83%)
 copy {capchild => caputils}/Makefile.nmake (83%)
 rename capture-pcap-util-int.h => caputils/capture-pcap-util-int.h (100%)
 rename capture-pcap-util-unix.c => caputils/capture-pcap-util-unix.c (86%)
 rename capture-pcap-util.c => caputils/capture-pcap-util.c (98%)
 rename capture-pcap-util.h => caputils/capture-pcap-util.h (80%)
 rename capture-wpcap.c => caputils/capture-wpcap.c (99%)
 rename capture-wpcap.h => caputils/capture-wpcap.h (100%)
 rename {capchild => caputils}/capture_ifinfo.h (100%)
 rename capture_win_ifnames.c => caputils/capture_win_ifnames.c (99%)
 rename capture_win_ifnames.h => caputils/capture_win_ifnames.h (100%)
 rename capture_wpcap_packet.c => caputils/capture_wpcap_packet.c (99%)
 rename capture_wpcap_packet.h => caputils/capture_wpcap_packet.h (100%)
 copy {capchild => caputils}/doxygen.cfg.in (94%)
 rename ws80211_utils.c => caputils/ws80211_utils.c (100%)
 rename ws80211_utils.h => caputils/ws80211_utils.h (100%)