forked from osmocom/wireshark
(hopefully) removed various gcc warnings
svn path=/trunk/; revision=14241
This commit is contained in:
parent
ab066c9e87
commit
be9bdd1fee
|
@ -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);
|
||||
|
|
|
@ -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. */
|
||||
|
|
|
@ -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];
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue