Have "do_capture()" take, as an argument, a pointer to the name of the

file to which to write the capture; if it's NULL, create a temporary
file and use that.

Have "-w" set a local variable, which starts out null, and, for "-k"
captures, call "do_capture()" and pass it that local variable as an
argument; this lets you do "-k" without "-w", which makes it use a
temporary file for the capture.

This means "run_capture()" no longer serves a useful purpose, as its
only caller is "do_capture()"; swallow it into "do_capture()".

svn path=/trunk/; revision=748

1 files changed, 4 insertions, 8 deletions

diff --git a/capture.h b/capture.h
index e03efc1966..555dbab72f 100644
--- a/capture.h
+++ b/capture.h
@@ -1,7 +1,7 @@
 /* capture.h
  * Definitions for packet capture windows
  *
- * $Id: capture.h,v 1.18 1999/10/02 06:00:07 guy Exp $
+ * $Id: capture.h,v 1.19 1999/10/02 06:26:45 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -51,13 +51,9 @@
 /* Name we give to the child process when doing a "-S" or "-F" capture. */
 #define	CHILD_NAME	"ethereal-capture"
 
-/* Create a temporary file and start a capture to it. */
-void   do_capture(void);
-
-/* Start a capture to a file we've opened; "cf.save_file" is the
-   pathname of the file, and "cf.save_file_fd" is the file descriptor
-   we got when we opened it. */
-void   run_capture(void);
+/* Open a specified file, or create a temporary file, and start a capture
+   to the file in question. */
+void   do_capture(char *capfile_name);
 
 /* Do the low-level work of a capture. */
 int    capture(void);