summaryrefslogtreecommitdiff
path: root/backend/pie.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:25:39 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:25:39 +0200
commit1edb02101a9306fc711cd422ed507d18165b1691 (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/pie.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
move from support/1.0.27 to feature/1.0.27
Diffstat (limited to 'backend/pie.c')
-rw-r--r--backend/pie.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/backend/pie.c b/backend/pie.c
index 941ed62..76cbb47 100644
--- a/backend/pie.c
+++ b/backend/pie.c
@@ -2781,7 +2781,7 @@ pie_reader_process (Pie_Scanner * scanner, FILE * fp)
/* --------------------------------- READER PROCESS SIGTERM HANDLER ------------ */
-static RETSIGTYPE
+static void
reader_process_sigterm_handler (int signal)
{
DBG (DBG_sane_info, "reader_process: terminated by signal %d\n", signal);
@@ -2896,7 +2896,7 @@ do_cancel (Pie_Scanner * scanner)
scanner->scanning = SANE_FALSE;
- if (scanner->reader_pid != -1)
+ if (sanei_thread_is_valid (scanner->reader_pid))
{
DBG (DBG_sane_info, "killing reader_process\n");
sanei_thread_kill (scanner->reader_pid);
@@ -3703,7 +3703,7 @@ sane_start (SANE_Handle handle)
scanner->reader_fds = fds[1];
scanner->reader_pid = sanei_thread_begin( reader_process, (void*)scanner );
- if (scanner->reader_pid == -1)
+ if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
strerror (errno));