diff options
| -rw-r--r-- | capture.c | 2 | ||||
| -rw-r--r-- | capture_loop.c | 2 | ||||
| -rw-r--r-- | capture_sync.c | 3 | ||||
| -rw-r--r-- | capture_sync.h | 3 | ||||
| -rw-r--r-- | fileset.c | 4 |
5 files changed, 8 insertions, 6 deletions
@@ -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); diff --git a/capture_loop.c b/capture_loop.c index dbe9a7e87b..906bdf0656 100644 --- a/capture_loop.c +++ b/capture_loop.c @@ -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. */ diff --git a/capture_sync.c b/capture_sync.c index b03cb9eb32..16fe008c57 100644 --- a/capture_sync.c +++ b/capture_sync.c @@ -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]; diff --git a/capture_sync.h b/capture_sync.h index fc6b0a63c9..614747ee5e 100644 --- a/capture_sync.h +++ b/capture_sync.h @@ -43,11 +43,10 @@ * 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 @@ -26,6 +26,10 @@ # include "config.h" #endif +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #ifdef HAVE_IO_H #include <io.h> #endif |