mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

hp: Fix [-Wint-conversion] compiler warnings 

Don't do yourself what sanei_thread does for you already ;-)
merge-requests/1/head
Olaf Meeuwissen 2017-07-15 17:00:08 +09:00
rodzic df1aba21bc
commit 3caf05c033
1 zmienionych plików z 4 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
backend/hp-handle.c
Wyświetl plik

@ -227,16 +227,9 @@ hp_handle_stopScan (HpHandle this)
{ {
int info; int info;
DBG(3, "hp_handle_stopScan: killing child (%ld)\n", (long) this->reader_pid); DBG(3, "hp_handle_stopScan: killing child (%ld)\n", (long) this->reader_pid);
if (this->child_forked) sanei_thread_kill (this->reader_pid);
{ sanei_thread_waitpid(this->reader_pid, &info);
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);
}
DBG(1, "hp_handle_stopScan: child %s = %d\n", DBG(1, "hp_handle_stopScan: child %s = %d\n",
WIFEXITED(info) ? "exited, status" : "signalled, signal", WIFEXITED(info) ? "exited, status" : "signalled, signal",
WIFEXITED(info) ? WEXITSTATUS(info) : WTERMSIG(info)); 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", DBG(3,"sanei_hp_handle_cancel: send SIGTERM to child (%ld)\n",
(long) this->reader_pid); (long) this->reader_pid);
if (this->child_forked) sanei_thread_kill(this->reader_pid);
kill(this->reader_pid, SIGTERM);
else
sanei_thread_kill(this->reader_pid);
} }
} }