diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-03-30 21:30:45 +0200 |
| commit | ee770c2346eb37e0dcb8b6cf3eaacf3d8efd6bbc (patch) | |
| tree | 58f05092be1a17a939e861f8cadcda1b6ca2ecef /backend/hp-handle.c | |
| parent | 0da9e21872802cfc6e975b1ebaf9efb9e5934d84 (diff) | |
| parent | fef76e17ed4c607ea73b81279f9ef1d7121be900 (diff) | |
Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1
Diffstat (limited to 'backend/hp-handle.c')
| -rw-r--r-- | backend/hp-handle.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/backend/hp-handle.c b/backend/hp-handle.c index ec8adbc..63e9fcb 100644 --- a/backend/hp-handle.c +++ b/backend/hp-handle.c @@ -227,16 +227,9 @@ hp_handle_stopScan (HpHandle this) { int info; DBG(3, "hp_handle_stopScan: killing child (%ld)\n", (long) this->reader_pid); - if (this->child_forked) - { - kill(this->reader_pid, SIGTERM); - waitpid(this->reader_pid, &info, 0); - } - else - { - sanei_thread_kill (this->reader_pid); - sanei_thread_waitpid(this->reader_pid, &info); - } + sanei_thread_kill (this->reader_pid); + sanei_thread_waitpid(this->reader_pid, &info); + DBG(1, "hp_handle_stopScan: child %s = %d\n", WIFEXITED(info) ? "exited, status" : "signalled, signal", WIFEXITED(info) ? WEXITSTATUS(info) : WTERMSIG(info)); @@ -746,10 +739,7 @@ sanei_hp_handle_cancel (HpHandle this) { DBG(3,"sanei_hp_handle_cancel: send SIGTERM to child (%ld)\n", (long) this->reader_pid); - if (this->child_forked) - kill(this->reader_pid, SIGTERM); - else - sanei_thread_kill(this->reader_pid); + sanei_thread_kill(this->reader_pid); } } |