From aae1de7f9e5ea7cf9684aa827afad910fead1311 Mon Sep 17 00:00:00 2001 From: Jeff Morriss Date: Fri, 11 Oct 2013 21:29:12 +0000 Subject: [PATCH] cf_start_tail() is (now) just a wrapper around cf_open(). Get rid of it and just call cf_open(). svn path=/trunk/; revision=52553 --- capture.c | 2 +- file.c | 9 --------- file.h | 12 ------------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/capture.c b/capture.c index 5868923fb4..76882f086a 100644 --- a/capture.c +++ b/capture.c @@ -361,7 +361,7 @@ capture_input_new_file(capture_session *cap_session, gchar *new_file) /* if we are in real-time mode, open the new file now */ if(capture_opts->real_time_mode) { /* Attempt to open the capture file and set up to read from it. */ - switch(cf_start_tail((capture_file *)cap_session->cf, capture_opts->save_file, is_tempfile, &err)) { + switch(cf_open((capture_file *)cap_session->cf, capture_opts->save_file, is_tempfile, &err)) { case CF_OK: break; case CF_ERROR: diff --git a/file.c b/file.c index 8b12314390..5103116416 100644 --- a/file.c +++ b/file.c @@ -826,15 +826,6 @@ cf_read(capture_file *cf, gboolean reloading) } #ifdef HAVE_LIBPCAP -cf_status_t -cf_start_tail(capture_file *cf, const char *fname, gboolean is_tempfile, int *err) -{ - cf_status_t cf_status; - - cf_status = cf_open(cf, fname, is_tempfile, err); - return cf_status; -} - cf_read_status_t cf_continue_tail(capture_file *cf, volatile int to_read, int *err) { diff --git a/file.h b/file.h index 320a713ba3..e375a196f1 100644 --- a/file.h +++ b/file.h @@ -162,18 +162,6 @@ gboolean cf_read_frame_r(capture_file *cf, const frame_data *fdata, */ gboolean cf_read_frame(capture_file *cf, frame_data *fdata); -/** - * Start reading from the end of a capture file. - * This is used in "Update list of packets in Real-Time". - * - * @param cf the capture file to be read from - * @param fname the filename to be read from - * @param is_tempfile is this a temporary file? - * @param err the error code, if an error had occurred - * @return one of cf_status_t - */ -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. *