aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--capture_sync.c2
-rw-r--r--file.c6
-rw-r--r--file.h2
3 files changed, 4 insertions, 6 deletions
diff --git a/capture_sync.c b/capture_sync.c
index 057c826196..f589b099b3 100644
--- a/capture_sync.c
+++ b/capture_sync.c
@@ -485,7 +485,7 @@ sync_pipe_do_capture(capture_options *capture_opts, gboolean is_tempfile) {
/* The child process started a capture.
Attempt to open the capture file and set up to read it. */
- switch(cf_start_tail(capture_opts->cf, capture_opts->save_file, capture_opts->iface, is_tempfile, &err)) {
+ switch(cf_start_tail(capture_opts->cf, capture_opts->save_file, is_tempfile, &err)) {
case CF_OK:
/* We were able to open and set up to read the capture file;
arrange that our callback be called whenever it's possible
diff --git a/file.c b/file.c
index 4efffb2e14..c08a3c8d28 100644
--- a/file.c
+++ b/file.c
@@ -140,8 +140,6 @@ static gboolean copy_binary_file(const char *from_filename, const char *to_fil
#define FRAME_DATA_CHUNK_SIZE 1024
-typedef void (*cf_callback_t) (gint event, gpointer data, gpointer user_data);
-
/* one callback for now, we could have a list later */
cf_callback_t cf_cb = NULL;
gpointer cf_cb_user_data = NULL;
@@ -165,7 +163,7 @@ cf_callback_add(cf_callback_t func, gpointer user_data)
}
void
-cf_callback_remove(cf_callback_t func)
+cf_callback_remove(cf_callback_t func _U_)
{
g_assert(cf_cb != NULL);
cf_cb = NULL;
@@ -487,7 +485,7 @@ cf_read(capture_file *cf)
#ifdef HAVE_LIBPCAP
cf_status_t
-cf_start_tail(capture_file *cf, const char *fname, const char *iface, gboolean is_tempfile, int *err)
+cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempfile, int *err)
{
cf_status_t cf_status;
diff --git a/file.h b/file.h
index a1f7a97069..a87899f49b 100644
--- a/file.h
+++ b/file.h
@@ -120,7 +120,7 @@ cf_read_status_t cf_read(capture_file *cf);
* @param err the error code, if an error had occured
* @return one of cf_status_t
*/
-cf_status_t cf_start_tail(capture_file *cf, const char *fname, const char *iface, gboolean is_tempfile, int *err);
+cf_status_t cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempfile, int *err);
/**
* Read packets from the "end" of a capture file.