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/artec_eplus48u.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'backend/artec_eplus48u.c') diff --git a/backend/artec_eplus48u.c b/backend/artec_eplus48u.c index bc3b2f8..f31bf5c 100644 --- a/backend/artec_eplus48u.c +++ b/backend/artec_eplus48u.c @@ -1785,14 +1785,14 @@ artec48u_device_read_prepare (Artec48U_Device * dev, size_t expected_count) return SANE_STATUS_GOOD; } -static RETSIGTYPE +static void reader_process_sigterm_handler (int signal) { XDBG ((1, "reader_process: terminated by signal %d\n", signal)); _exit (SANE_STATUS_GOOD); } -static RETSIGTYPE +static void usb_reader_process_sigterm_handler (int signal) { XDBG ((1, "reader_process (usb): terminated by signal %d\n", signal)); @@ -3372,12 +3372,10 @@ close_pipe (Artec48U_Scanner * s) } return SANE_STATUS_EOF; } -static RETSIGTYPE -sigalarm_handler (int signal) +static void +sigalarm_handler (int __sane_unused__ signal) { - int dummy; /*Henning doesn't like warnings :-) */ XDBG ((1, "ALARM!!!\n")); - dummy = signal; cancelRead = SANE_TRUE; } @@ -3483,7 +3481,7 @@ do_cancel (Artec48U_Scanner * s, SANE_Bool closepipe) s->scanning = SANE_FALSE; - if (s->reader_pid != -1) + if (sanei_thread_is_valid (s->reader_pid)) { /*parent */ XDBG ((1, "killing reader_process\n")); @@ -3906,17 +3904,15 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle) void sane_close (SANE_Handle handle) { - Artec48U_Scanner *prev, *s; + Artec48U_Scanner *s; XDBG ((5, "sane_close: start\n")); /* remove handle from list of open handles: */ - prev = 0; for (s = first_handle; s; s = s->next) { if (s == handle) break; - prev = s; } if (!s) { @@ -4301,7 +4297,7 @@ sane_start (SANE_Handle handle) s->reader_pipe = fds[1]; s->reader_pid = sanei_thread_begin (reader_process, s); cancelRead = SANE_FALSE; - if (s->reader_pid == -1) + if (!sanei_thread_is_valid (s->reader_pid)) { s->scanning = SANE_FALSE; XDBG ((2, "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/artec_eplus48u.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backend/artec_eplus48u.c') diff --git a/backend/artec_eplus48u.c b/backend/artec_eplus48u.c index f31bf5c..0e81b06 100644 --- a/backend/artec_eplus48u.c +++ b/backend/artec_eplus48u.c @@ -3505,7 +3505,7 @@ do_cancel (Artec48U_Scanner * s, SANE_Bool closepipe) { XDBG ((1, "sanei_thread_waitpid() failed !\n")); } - s->reader_pid = -1; + sanei_thread_invalidate (s->reader_pid); XDBG ((1, "reader_process killed\n")); } if (SANE_TRUE == closepipe) @@ -4337,7 +4337,7 @@ sane_read (SANE_Handle handle, SANE_Byte * data, if (s->eof == SANE_TRUE) { sanei_thread_waitpid (s->reader_pid, 0); - s->reader_pid = -1; + sanei_thread_invalidate (s->reader_pid); artec48u_scanner_stop_scan (s); artec48u_carriage_home (s->dev); return close_pipe (s); -- cgit v1.2.3