rename pcap-....c/.h files to capture-pcap-....c/.h

this way, the capture prefix will "logically" group the files together and file browsers will also group them

we may want to move the files into a subdir capture later

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16691 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 13013ba281b47f5d19aab903d67828485bc68e67..d92a62215d506881815054755cfe1489ea7ef137 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -171,7 +171,7 @@ radius_DATA = \
        radius/dictionary.wispr  \
        radius/dictionary.xedia
 
-PLATFORM_SRC = pcap-util-unix.c
+PLATFORM_SRC = capture-pcap-util-unix.c
 
 include Makefile.common
 

diff --git a/Makefile.common b/Makefile.common
index 00b99de8fd62ce3092b0a6949d3fbcd4af816159..4e4b3abce7e49c46f76e7a9ed9f0633decb4e122 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -48,6 +48,7 @@ GENERATED_FILES = $(GENERATED_C_FILES) $(GENERATED_HEADER_FILES)
 ETHEREAL_COMMON_SRC =  \
        $(PLATFORM_SRC) \
        capture_errs.c  \
+       capture-pcap-util.c     \
        capture_stop_conditions.c       \
        capture_ui_utils.c      \
        cfile.c \
@@ -55,7 +56,6 @@ ETHEREAL_COMMON_SRC = \
        conditions.c    \
        disabled_protos.c       \
        packet-range.c  \
-       pcap-util.c     \
        print.c \
        ps.c    \
        ringbuffer.c    \
@@ -67,6 +67,8 @@ ETHEREAL_COMMON_SRC = \
 ETHEREAL_COMMON_INCLUDES =     \
        svnversion.h            \
        capture_errs.h  \
+       capture-pcap-util.h     \
+       capture-pcap-util-int.h \
        capture_stop_conditions.h       \
        capture_ui_utils.h      \
        cfile.h \
@@ -79,8 +81,6 @@ ETHEREAL_COMMON_INCLUDES =    \
        fileset.h       \
        isprint.h       \
        packet-range.h  \
-       pcap-util.h     \
-       pcap-util-int.h \
        print.h \
        ps.h    \
        register.h      \
@@ -208,11 +208,11 @@ randpkt_SOURCES = \
 # dumpcap specifics
 dumpcap_SOURCES =      \
        $(PLATFORM_SRC) \
+       capture-pcap-util.c     \
        capture_stop_conditions.c       \
        getopt.c        \
        clopts_common.c \
        conditions.c    \
-       pcap-util.c     \
        ringbuffer.c    \
        util.c  \
        version_info.c \

diff --git a/pcap-util-int.h b/capture-pcap-util-int.h
similarity index 97%
rename from pcap-util-int.h
rename to capture-pcap-util-int.h
index 83988d901533b84210c2fd0ce4a7822116c7fae6..fb555683697e76cd3e3eb1543de0faa81b5176ce 100644 (file)
--- a/pcap-util-int.h
+++ b/capture-pcap-util-int.h
@@ -1,4 +1,4 @@
-/* pcap-util-int.h
+/* capture-pcap-util-int.h
  * Definitions of routines internal to the libpcap/WinPcap utilities
  *
  * $Id$

diff --git a/pcap-util-unix.c b/capture-pcap-util-unix.c
similarity index 98%
rename from pcap-util-unix.c
rename to capture-pcap-util-unix.c
index 9f4a6798d74cffda07c42f7d0e7edcfcdf6a8b90..ad563995ea08cd057d31b1956dc4ed8b6371cbc5 100644 (file)
--- a/pcap-util-unix.c
+++ b/capture-pcap-util-unix.c
@@ -1,4 +1,4 @@
-/* pcap-util-unix.c
+/* capture-pcap-util-unix.c
  * UN*X-specific utility routines for packet capture
  *
  * $Id$
@@ -60,8 +60,8 @@ struct rtentry;
 # include <sys/sockio.h>
 #endif
 
-#include "pcap-util.h"
-#include "pcap-util-int.h"
+#include "capture-pcap-util.h"
+#include "capture-pcap-util-int.h"
 
 #ifndef HAVE_PCAP_FINDALLDEVS
 struct search_user_data {

diff --git a/pcap-util.c b/capture-pcap-util.c
similarity index 99%
rename from pcap-util.c
rename to capture-pcap-util.c
index 38565f4e8767310946793d0d907636e447caa199..c6e205f077a1dea8e912afb9cd92e1ec51e140c8 100644 (file)
--- a/pcap-util.c
+++ b/capture-pcap-util.c
@@ -1,4 +1,4 @@
-/* pcap-util.c
+/* capture-pcap-util.c
  * Utility routines for packet capture
  *
  * $Id$
@@ -47,8 +47,8 @@
 #include <wtap.h>
 #include <wtap-capture.h>
 
-#include "pcap-util.h"
-#include "pcap-util-int.h"
+#include "capture-pcap-util.h"
+#include "capture-pcap-util-int.h"
 
 #ifndef _WIN32
 #include <netinet/in.h>

diff --git a/pcap-util.h b/capture-pcap-util.h
similarity index 99%
rename from pcap-util.h
rename to capture-pcap-util.h
index df1770ea7778aaf6d42b27c37ce1d0ba247ce612..d9cd527364e4fa514451c591f3051c6d44742ee2 100644 (file)
--- a/pcap-util.h
+++ b/capture-pcap-util.h
@@ -1,4 +1,4 @@
-/* pcap-util.h
+/* capture-pcap-util.h
  * Utility definitions for packet capture
  *
  * $Id$

diff --git a/capture-wpcap.c b/capture-wpcap.c
index d0a51ab3675b78636b0d0a166ca234c8d16dabcc..fe0ff5d60e53095012811b3d24028207409107db 100644 (file)
--- a/capture-wpcap.c
+++ b/capture-wpcap.c
@@ -35,8 +35,8 @@
 #include <glib.h>
 #include <gmodule.h>
 
-#include "pcap-util.h"
-#include "pcap-util-int.h"
+#include "capture-pcap-util.h"
+#include "capture-pcap-util-int.h"
 
 /* XXX - yes, I know, I should move cppmagic.h to a generic location. */
 #include "tools/lemon/cppmagic.h"

diff --git a/capture.c b/capture.c
index f1cb5501aa906e0b7da5d485dd524950ffd7001f..6bb18ca01f29a4d32f5715e2a6966d6b9783a08c 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -55,7 +55,7 @@
 #include "capture_info.h"
 #include "capture_ui_utils.h"
 #include "util.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
 #include <epan/prefs.h>

diff --git a/capture_loop.c b/capture_loop.c
index 8463a8f3df545a8dc83e9af329a1f0a235ee44f4..31c0283d73dae2f89a0dfd2c6cbb80ac2625c796 100644 (file)
--- a/capture_loop.c
+++ b/capture_loop.c
@@ -66,7 +66,7 @@
 #include <glib.h>
 
 #include <pcap.h>
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 
 #include "capture.h"
 #include "capture_loop.h"

diff --git a/capture_ui_utils.c b/capture_ui_utils.c
index dd93d2ce242c588ded0b104bf60128f3b5afbc7c..53740237b27d86a1b5824c5af976117ee5b662c3 100644 (file)
--- a/capture_ui_utils.c
+++ b/capture_ui_utils.c
@@ -33,7 +33,7 @@
 #include <glib.h>
 
 #include <epan/prefs.h>
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include "capture_ui_utils.h"
 
 /*

diff --git a/doc/README.capture b/doc/README.capture
index b0477d6238361b7bdfdb3bfdd80c0aa2cfa1e190..4a7786a908395fa5cdcbdae7deda16c163c8da27 100644 (file)
--- a/doc/README.capture
+++ b/doc/README.capture
@@ -11,10 +11,10 @@ two lists maybe won't be needed any longer!
 
 libpcap related source files:
 -----------------------------
-pcap-util.c
-pcap-util.h
-pcap-util-int.h
-pcap-util-unix.c
+capture-pcap-util.c
+capture-pcap-util.h
+capture-pcap-util-int.h
+capture-pcap-util-unix.c
 capture-wpcap.c
 capture-wpcap.h
 capture_wpcap_packet.c

diff --git a/dumpcap.c b/dumpcap.c
index 5e86c9d62aa592edc89e3ec7c9969a3485367848..1a764a514feffb20cfa962d72c9f2a65dbf32d42 100644 (file)
--- a/dumpcap.c
+++ b/dumpcap.c
@@ -52,7 +52,7 @@
 #include "version_info.h"
 
 #include <pcap.h>
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 
 #ifdef _WIN32
 #include "capture-wpcap.h"

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index 8746bf6ba950b4c4915dc206541c3d6ca09161b1..1509bbc53f19783be36ab4c00ec73f3b4155a287 100644 (file)
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -44,7 +44,7 @@
 #include "filter_dlg.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include "capture_ui_utils.h"
 #include <epan/prefs.h>
 #include "ringbuffer.h"

diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index cfac902365367c34e94531cb858e3ddb32fc0449..417f11eed9ec61151bcbf9e4a8d3c1e19ab4260d 100644 (file)
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -38,7 +38,7 @@
 #include <gtk/gtk.h>
 
 #include "globals.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 
 #ifdef _WIN32
 #include "capture-wpcap.h"

diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 6b503792b759f21833408172464b396e6f8f0cde..86a8be2c1d4e99a18d7dfbc630155502c798fed2 100644 (file)
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -45,7 +45,7 @@
 #include "dlg_utils.h"
 #include "gui_utils.h"
 #include "main.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 
 /* a single capture counter value (with title, pointer to value and GtkWidgets) */
 /* as the packet_counts is a struct, not an array, keep a pointer to the */

diff --git a/gtk/capture_prefs.c b/gtk/capture_prefs.c
index cdbcb96da106d5646d55169640dfe599bafe2407..403990169e8380c9e0081486415df9e5891d8165 100644 (file)
--- a/gtk/capture_prefs.c
+++ b/gtk/capture_prefs.c
@@ -40,7 +40,7 @@
 #include "gui_utils.h"
 #include "dlg_utils.h"
 #include "simple_dialog.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include "capture_ui_utils.h"
 #include "main.h"
 #include "compat_macros.h"

diff --git a/gtk/main.c b/gtk/main.c
index 1a32ca63889932e20e941e062298afcdb9b83aaf..42972861f92e7e07c9d7dd3287d3fa53a7f7a244 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -89,7 +89,7 @@
 
 #ifdef HAVE_LIBPCAP
 #include <pcap.h>
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include "capture.h"
 #include "capture_loop.h"
 #include "capture_sync.h"

diff --git a/tethereal.c b/tethereal.c
index eddcffa281c740f91fc220aa4601068bfbea1d95..05b8016fed2c70f165bac76299b831d90b70ee99 100644 (file)
--- a/tethereal.c
+++ b/tethereal.c
@@ -92,7 +92,7 @@
 #ifdef HAVE_LIBPCAP
 #include <pcap.h>
 #include <setjmp.h>
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 #include <wiretap/wtap-capture.h>
 #include <wiretap/libpcap.h>
 #ifdef _WIN32

diff --git a/version_info.c b/version_info.c
index e53acc30b38a6de712005a268ec024c824357c29..954b05379e02bb72b60be657b87c780e42873585 100644 (file)
--- a/version_info.c
+++ b/version_info.c
@@ -71,7 +71,7 @@
 #endif
 
 #include "version_info.h"
-#include "pcap-util.h"
+#include "capture-pcap-util.h"
 
 #include "svnversion.h"