summaryrefslogtreecommitdiff
path: root/backend/plustek_pp.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_pp.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_pp.c')
-rw-r--r--backend/plustek_pp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/backend/plustek_pp.c b/backend/plustek_pp.c
index bf4c0d0..f48c3dc 100644
--- a/backend/plustek_pp.c
+++ b/backend/plustek_pp.c
@@ -348,13 +348,13 @@ static void sig_chldhandler( int signo )
/** signal handler to kill the child process
*/
-static RETSIGTYPE reader_process_sigterm_handler( int signo )
+static void reader_process_sigterm_handler( int signo )
{
DBG( _DBG_PROC, "reader_process: terminated by signal %d\n", signo );
_exit( SANE_STATUS_GOOD );
}
-static RETSIGTYPE sigalarm_handler( int signo )
+static void sigalarm_handler( int signo )
{
_VAR_NOT_USED( signo );
DBG( _DBG_PROC, "ALARM!!!\n" );
@@ -471,7 +471,7 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
scanner->scanning = SANE_FALSE;
- if( scanner->reader_pid != -1 ) {
+ if( sanei_thread_is_valid( scanner->reader_pid )) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
@@ -2014,7 +2014,7 @@ SANE_Status sane_start( SANE_Handle handle )
s->w_pipe = fds[1];
s->reader_pid = sanei_thread_begin( reader_process, s );
- if( s->reader_pid == -1 ) {
+ if(!sanei_thread_is_valid( s->reader_pid )) {
DBG( _DBG_ERROR, "ERROR: could not create child process\n" );
s->scanning = SANE_FALSE;
s->hw->close( s->hw );