summaryrefslogtreecommitdiff
path: root/backend/plustek.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/plustek.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/plustek.c')
-rw-r--r--backend/plustek.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/backend/plustek.c b/backend/plustek.c
index cd83c26..062df37 100644
--- a/backend/plustek.c
+++ b/backend/plustek.c
@@ -416,21 +416,21 @@ sig_chldhandler( int signo )
/** signal handler to kill the child process
*/
-static RETSIGTYPE
+static void
reader_process_sigterm_handler( int signo )
{
DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
_exit( SANE_STATUS_GOOD );
}
-static RETSIGTYPE
+static void
usb_reader_process_sigterm_handler( int signo )
{
DBG( _DBG_PROC, "(SIG) reader_process: terminated by signal %d\n", signo );
cancelRead = SANE_TRUE;
}
-static RETSIGTYPE
+static void
sigalarm_handler( int signo )
{
_VAR_NOT_USED( signo );
@@ -572,7 +572,7 @@ do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
DBG( _DBG_PROC,"do_cancel\n" );
scanner->scanning = SANE_FALSE;
- if( scanner->reader_pid != -1 ) {
+ if( sanei_thread_is_valid (scanner->reader_pid) ) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
@@ -2629,7 +2629,7 @@ sane_start( SANE_Handle handle )
cancelRead = SANE_FALSE;
- if( s->reader_pid == -1 ) {
+ if( !sanei_thread_is_valid (s->reader_pid) ) {
DBG( _DBG_ERROR, "ERROR: could not start reader task\n" );
s->scanning = SANE_FALSE;
usbDev_close( dev );