(hopefully) removed various gcc warnings
authorulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 30 Apr 2005 15:39:40 +0000 (15:39 +0000)
committerulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7>
Sat, 30 Apr 2005 15:39:40 +0000 (15:39 +0000)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@14241 f5534014-38df-0310-8fa8-9805f1628bb7

capture.c
capture_loop.c
capture_sync.c
capture_sync.h
fileset.c

index daf653f611b8052b90924160540eca9ac57a2f1f..50336593e73d67201667a69e256e02cf7e24f007 100644 (file)
--- a/capture.c
+++ b/capture.c
@@ -86,7 +86,7 @@ capture_start(capture_options *capture_opts)
   capture_opts->state = CAPTURE_PREPARING;
 
   /* try to start the capture child process */
-  ret = sync_pipe_start(capture_opts, capture_opts->save_file == NULL);
+  ret = sync_pipe_start(capture_opts);
   if(!ret) {
       if(capture_opts->save_file != NULL) {
           g_free(capture_opts->save_file);
index dbe9a7e87b818e9e4d9088d49fbaeb2db2258903..906bdf06560ec0aed5f0df8f07c8cb303a3ec783 100644 (file)
@@ -1499,7 +1499,7 @@ capture_loop_get_errmsg(char *errmsg, int errmsglen, const char *fname,
 }
 
 static void
-capture_loop_popup_errmsg(capture_options *capture_opts, const char *errmsg)
+capture_loop_popup_errmsg(capture_options *capture_opts _U_, const char *errmsg)
 {
     /* Send the error message to our parent, so they can display a
        dialog box containing it. */
index b03cb9eb327ec4d49d16c5587c00c5b43821b3ef..16fe008c5728aced9ed2006d7e29db03ea50cbc7 100644 (file)
@@ -107,7 +107,6 @@ static char *sync_pipe_signame(int);
 #endif
 
 
-static gboolean sync_pipe_input_wait_for_start(capture_options *capture_opts, int sync_pipe_read);
 static gboolean sync_pipe_input_cb(gint source, gpointer user_data);
 static void sync_pipe_wait_for_child(capture_options *capture_opts, gboolean always_report);
 
@@ -315,7 +314,7 @@ sync_pipe_quote_encapsulate(const char *string)
 #define ARGV_NUMBER_LEN 24
 
 gboolean
-sync_pipe_start(capture_options *capture_opts, gboolean is_tempfile) {
+sync_pipe_start(capture_options *capture_opts) {
     char ssnap[ARGV_NUMBER_LEN];
     char scount[ARGV_NUMBER_LEN];
     char sfilesize[ARGV_NUMBER_LEN];
index fc6b0a63c9da2721cd5c189e7dff0b500e0d925a..614747ee5e1f0d4b2766c23bba8082a1c5ea829b 100644 (file)
  *  Most of the parameters are passed through the global capture_opts.
  *
  *  @param capture_opts the options
- *  @param is_tempfile  TRUE if the current cfile is a tempfile
  *  @return             TRUE if a capture could be started, FALSE if not
  */
 extern gboolean 
-sync_pipe_start(capture_options *capture_opts, gboolean is_tempfile);
+sync_pipe_start(capture_options *capture_opts);
 
 /** User wants to stop capturing, gracefully close the capture child */
 extern void
index 42455a97be6c80fba8c8478f3d4b29380c6af980..c47f7ee44ba76bb75924c70a44766fb2efa3b72e 100644 (file)
--- a/fileset.c
+++ b/fileset.c
 # include "config.h"
 #endif
 
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif