diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2005-02-03 21:58:33 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2005-02-03 21:58:33 +0000 |
| commit | be0e6a06316f5de9e8c580c4df4987104750ac28 (patch) | |
| tree | debfef3929170f5a8699b9c0c93f3427c89b35af /capture_loop.c | |
| parent | 915e63ae1839dd1c26bdb39a98a880c83014730a (diff) | |
prevent ringbuffer from having to know about capture_file type at all (decoupling dependencies)
svn path=/trunk/; revision=13266
Diffstat (limited to 'capture_loop.c')
| -rw-r--r-- | capture_loop.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/capture_loop.c b/capture_loop.c index fdad9599b4..76a9685266 100644 --- a/capture_loop.c +++ b/capture_loop.c @@ -840,7 +840,7 @@ static int capture_loop_open_wiretap_output(capture_options *capture_opts, loop_ static gboolean capture_loop_close_output(capture_options *capture_opts, loop_data *ld, int *err_close) { if (capture_opts->multi_files_on) { - return ringbuf_wtap_dump_close(&cfile, err_close); + return ringbuf_wtap_dump_close(&cfile.save_file, err_close); } else { return wtap_dump_close(ld->wtap_pdh, err_close); } @@ -1106,7 +1106,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct } /* Switch to the next ringbuffer file */ - if (ringbuf_switch_file(&cfile, &ld.wtap_pdh, &ld.err)) { + if (ringbuf_switch_file(&ld.wtap_pdh, &cfile.save_file, &cfile.save_file_fd, &ld.err)) { /* File switch succeeded: reset the conditions */ cnd_reset(cnd_autostop_size); if (cnd_file_duration) { @@ -1175,7 +1175,7 @@ capture_loop_start(capture_options *capture_opts, gboolean *stats_known, struct } /* Switch to the next ringbuffer file */ - if (ringbuf_switch_file(&cfile, &ld.wtap_pdh, &ld.err)) { + if (ringbuf_switch_file(&ld.wtap_pdh, &cfile.save_file, &cfile.save_file_fd, &ld.err)) { /* file switch succeeded: reset the conditions */ cnd_reset(cnd_file_duration); if(cnd_autostop_size) |