From 58912f68c2489bcee787599837447e0d64dfd61a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 24 May 2017 21:03:56 +0200 Subject: New upstream version 1.0.27 --- backend/pie.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'backend/pie.c') 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)); -- cgit v1.2.3 From 1687222e1b9e74c89cafbb5910e72d8ec7bfd40f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 31 Jul 2019 16:59:49 +0200 Subject: New upstream version 1.0.28 --- backend/pie.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backend/pie.c') diff --git a/backend/pie.c b/backend/pie.c index 76cbb47..0e56a5a 100644 --- a/backend/pie.c +++ b/backend/pie.c @@ -2901,7 +2901,7 @@ do_cancel (Pie_Scanner * scanner) DBG (DBG_sane_info, "killing reader_process\n"); sanei_thread_kill (scanner->reader_pid); sanei_thread_waitpid (scanner->reader_pid, 0); - scanner->reader_pid = -1; + sanei_thread_invalidate (scanner->reader_pid); DBG (DBG_sane_info, "reader_process killed\n"); } -- cgit v1.2.3