Merge the caputils/ and capchild/ directories

The distinction between the different kinds of capture utility
may not warrant a special subfolfer for each, and sometimes the
distinction is not be clear or some functions could stradle
multiple "categories" (like capture_ifinfo.[ch]).

Simplify by having only a generic 'capture' subfolder. The
separate CMake libraries are kept as a way to reuse object code
efficiently.

1 files changed, 7 insertions, 7 deletions

diff --git a/dumpcap.c b/dumpcap.c
index e7e976b77d..84c2889788 100644
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -55,11 +55,11 @@
 
 #include "ringbuffer.h"
 
-#include "caputils/capture_ifinfo.h"
-#include "caputils/capture-pcap-util.h"
-#include "caputils/capture-pcap-util-int.h"
+#include "capture/capture_ifinfo.h"
+#include "capture/capture-pcap-util.h"
+#include "capture/capture-pcap-util-int.h"
 #ifdef _WIN32
-#include "caputils/capture-wpcap.h"
+#include "capture/capture-wpcap.h"
 #endif /* _WIN32 */
 
 #include "writecap/pcapio.h"
@@ -74,8 +74,8 @@
 #include "sync_pipe.h"
 
 #include "capture_opts.h"
-#include <capchild/capture_session.h>
-#include <capchild/capture_sync.h>
+#include <capture/capture_session.h>
+#include <capture/capture_sync.h>
 
 #include "wsutil/tempfile.h"
 #include "log.h"
@@ -88,7 +88,7 @@
 #include "wsutil/please_report_bug.h"
 #include "wsutil/glib-compat.h"
 
-#include "caputils/ws80211_utils.h"
+#include "capture/ws80211_utils.h"
 
 #include "extcap.h"