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

svn path=/trunk/; revision=16691

19 files changed, 30 insertions, 30 deletions

diff --git a/Makefile.am b/Makefile.am
index 13013ba281..d92a62215d 100644
--- 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 00b99de8fd..4e4b3abce7 100644
--- 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
index 83988d9015..fb55568369 100644
--- 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
index 9f4a6798d7..ad563995ea 100644
--- 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
index 38565f4e87..c6e205f077 100644
--- 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
index df1770ea77..d9cd527364 100644
--- 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 d0a51ab367..fe0ff5d60e 100644
--- 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 f1cb5501aa..6bb18ca01f 100644
--- 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 8463a8f3df..31c0283d73 100644
--- 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 dd93d2ce24..53740237b2 100644
--- 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 b0477d6238..4a7786a908 100644
--- 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 5e86c9d62a..1a764a514f 100644
--- 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 8746bf6ba9..1509bbc53f 100644
--- 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 cfac902365..417f11eed9 100644
--- 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 6b503792b7..86a8be2c1d 100644
--- 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 cdbcb96da1..403990169e 100644
--- 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 1a32ca6388..42972861f9 100644
--- 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 eddcffa281..05b8016fed 100644
--- 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 e53acc30b3..954b05379e 100644
--- 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"