osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jeff Morriss 2013-10-11 21:29:12 +00:00
parent 564ca2d5e9
commit aae1de7f9e
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
capture.c
View File

@ -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:

9
file.c
View File

@ -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)
{

12
file.h
View File

@ -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.
*