summaryrefslogtreecommitdiff
path: root/backend/umax.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/umax.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
move from support/1.0.27 to feature/1.0.27
Diffstat (limited to 'backend/umax.c')
-rw-r--r--backend/umax.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/backend/umax.c b/backend/umax.c
index 0d8ddba..22fa2d3 100644
--- a/backend/umax.c
+++ b/backend/umax.c
@@ -399,7 +399,7 @@ static void umax_print_inquiry(Umax_Device *dev)
DBG_inq_nz(" - relative address\n", get_inquiry_scsi_reladr(inquiry_block));
DBG_inq_nz(" - wide bus 32 bit\n", get_inquiry_scsi_wbus32(inquiry_block));
DBG_inq_nz(" - wide bus 16 bit\n", get_inquiry_scsi_wbus16(inquiry_block));
- DBG_inq_nz(" - syncronous neg.\n", get_inquiry_scsi_sync(inquiry_block));
+ DBG_inq_nz(" - synchronous neg.\n", get_inquiry_scsi_sync(inquiry_block));
DBG_inq_nz(" - linked commands\n", get_inquiry_scsi_linked(inquiry_block));
DBG_inq_nz(" - (reserved)\n", get_inquiry_scsi_R(inquiry_block));
DBG_inq_nz(" - command queueing\n", get_inquiry_scsi_cmdqueue(inquiry_block));
@@ -526,7 +526,7 @@ static void umax_print_inquiry(Umax_Device *dev)
DBG_inq_nz(" + ADF: no paper\n", get_inquiry_ADF_no_paper(inquiry_block));
DBG_inq_nz(" + ADF: cover open\n", get_inquiry_ADF_cover_open(inquiry_block));
DBG_inq_nz(" + ADF: paper jam\n", get_inquiry_ADF_paper_jam(inquiry_block));
- DBG_inq_nz(" - unknwon flag; 0x63 bit 3\n", get_inquiry_0x63_bit3(inquiry_block));
+ DBG_inq_nz(" - unknown flag; 0x63 bit 3\n", get_inquiry_0x63_bit3(inquiry_block));
DBG_inq_nz(" - unknown lfag: 0x63 bit 4\n", get_inquiry_0x63_bit4(inquiry_block));
DBG_inq_nz(" - lens calib in doc pos\n", get_inquiry_lens_cal_in_doc_pos(inquiry_block));
DBG_inq_nz(" - manual focus\n", get_inquiry_manual_focus(inquiry_block));
@@ -4670,14 +4670,14 @@ static SANE_Status do_cancel(Umax_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);
pid = sanei_thread_waitpid(scanner->reader_pid, &status);
- if (pid == -1)
+ if (!sanei_thread_is_valid (pid))
{
DBG(DBG_sane_info, "do_cancel: sanei_thread_waitpid failed, already terminated ? (%s)\n", strerror(errno));
}
@@ -4928,7 +4928,7 @@ static SANE_Status attach_scanner(const char *devicename, Umax_Device **devp, in
/* ------------------------------------------------------------ READER PROCESS SIGTERM HANDLER ------------ */
-static RETSIGTYPE reader_process_sigterm_handler(int signal)
+static void reader_process_sigterm_handler(int signal)
{
DBG(DBG_sane_info,"reader_process: terminated by signal %d\n", signal);
@@ -7624,7 +7624,7 @@ SANE_Status sane_start(SANE_Handle handle)
/* of the x-origin defined by the scanner`s inquiry */
if (scanner->device->dor != 0) /* dor mode active */
{
- DBG(DBG_info,"substracting DOR x-origin-offset from upper left x\n");
+ DBG(DBG_info,"subtracting DOR x-origin-offset from upper left x\n");
scanner->device->upper_left_x -= scanner->device->inquiry_dor_x_off * scanner->device->x_coordinate_base; /* correct DOR x-origin */
if (scanner->device->upper_left_x < 0) /* rounding errors may create a negative value */
@@ -7996,7 +7996,7 @@ SANE_Status sane_start(SANE_Handle handle)
/* start reader_process, deponds on OS if fork() or threads are used */
scanner->reader_pid = sanei_thread_begin(reader_process, (void *) scanner);
- if (scanner->reader_pid == -1)
+ if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG(DBG_error, "ERROR: sanei_thread_begin failed (%s)\n", strerror(errno));
scanner->scanning = SANE_FALSE;