diff options
author | Ulf Lamping <ulf.lamping@web.de> | 2005-03-28 15:31:13 +0000 |
---|---|---|
committer | Ulf Lamping <ulf.lamping@web.de> | 2005-03-28 15:31:13 +0000 |
commit | 9d6ac60cefff17895674beaf30447b7a2c9285fc (patch) | |
tree | afad86f42c3922fe5312deb0752f39c15db559ed /capture.c | |
parent | daa67c79ba2b65c3893ffdf9022c5cf64025c4e7 (diff) | |
download | wireshark-9d6ac60cefff17895674beaf30447b7a2c9285fc.tar.gz wireshark-9d6ac60cefff17895674beaf30447b7a2c9285fc.tar.bz2 wireshark-9d6ac60cefff17895674beaf30447b7a2c9285fc.zip |
remove capture_child flag from capture_opts as it's no longer required
svn path=/trunk/; revision=13954
Diffstat (limited to 'capture.c')
-rw-r--r-- | capture.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -314,8 +314,6 @@ capture_child_stop_signal_handler(int signo _U_) int capture_child_start(capture_options *capture_opts, gboolean *stats_known, struct pcap_stat *stats) { - g_assert(capture_opts->capture_child); - #ifndef _WIN32 /* * Catch SIGUSR1, so that we exit cleanly if the parent process @@ -328,18 +326,20 @@ capture_child_start(capture_options *capture_opts, gboolean *stats_known, struct } void -capture_stop(capture_options *capture_opts) +capture_child_stop(capture_options *capture_opts) { - /* stop the capture child, if we have one */ - if (!capture_opts->capture_child) { - sync_pipe_stop(capture_opts); - } - /* stop the capture loop */ capture_loop_stop(); } void +capture_stop(capture_options *capture_opts) +{ + /* stop the capture child, if we have one */ + sync_pipe_stop(capture_opts); +} + +void capture_kill_child(capture_options *capture_opts) { /* kill the capture child, if we have one */ |