mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Invert sense of sanei_thread validity check 

Double negatives suck.
merge-requests/1/head
Olaf Meeuwissen 2015-11-13 22:06:30 +09:00
rodzic fe12d31e68
commit e094c5b43b
19 zmienionych plików z 47 dodań i 47 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/agfafocus.c
Wyświetl plik

@ -947,7 +947,7 @@ do_cancel (AgfaFocus_Scanner * s)
do_eof (s);
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
{
int exit_status;
@ -2054,7 +2054,7 @@ sane_cancel (SANE_Handle handle)
{
AgfaFocus_Scanner *s = handle;
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
sanei_thread_kill (s->reader_pid);
s->scanning = SANE_FALSE;
}

4
backend/artec_eplus48u.c
Wyświetl plik

@ -3483,7 +3483,7 @@ do_cancel (Artec48U_Scanner * s, SANE_Bool closepipe)
s->scanning = SANE_FALSE;
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
{
/*parent */
XDBG ((1, "killing reader_process\n"));
@ -4301,7 +4301,7 @@ sane_start (SANE_Handle handle)
s->reader_pipe = fds[1];
s->reader_pid = sanei_thread_begin (reader_process, s);
cancelRead = SANE_FALSE;
if (sanei_thread_is_invalid (s->reader_pid))
if (!sanei_thread_is_valid (s->reader_pid))
{
s->scanning = SANE_FALSE;
XDBG ((2, "sane_start: sanei_thread_begin failed (%s)\n", strerror (errno)));

2
backend/avision.c
Wyświetl plik

@ -6216,7 +6216,7 @@ do_cancel (Avision_Scanner* s)
s->duplex_rear_valid = SANE_FALSE;
s->page = 0;
if (!sanei_thread_is_invalid (s->reader_pid)) {
if (sanei_thread_is_valid (s->reader_pid)) {
int exit_status;
/* ensure child knows it's time to stop: */

6
backend/coolscan.c
Wyświetl plik

@ -2029,7 +2029,7 @@ do_cancel (Coolscan_t * scanner)
do_eof (scanner); /* close pipe and reposition scanner */
if (!sanei_thread_is_invalid (scanner->reader_pid))
if (sanei_thread_is_valid (scanner->reader_pid))
{
int exit_status;
@ -4093,7 +4093,7 @@ sane_start (SANE_Handle handle)
scanner->pipe = fds[0];
scanner->reader_fds = fds[1];
scanner->reader_pid = sanei_thread_begin( reader_process, (void*)scanner );
if (sanei_thread_is_invalid (scanner->reader_pid))
if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
strerror (errno));
@ -4153,7 +4153,7 @@ sane_cancel (SANE_Handle handle)
{
Coolscan_t *s = handle;
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
{
sanei_thread_kill ( s->reader_pid );
sanei_thread_waitpid( s->reader_pid, NULL );

2
backend/hp-handle.c
Wyświetl plik

@ -192,7 +192,7 @@ hp_handle_startReader (HpHandle this, HpScsi scsi)
this->pipe_write_fd = -1;
}
if (sanei_thread_is_invalid (this->reader_pid))
if (!sanei_thread_is_valid (this->reader_pid))
{
if ( !this->child_forked )
{

4
backend/hp3500.c
Wyświetl plik

@ -703,7 +703,7 @@ sane_start (SANE_Handle handle)
scanner->reader_pid = sanei_thread_begin (reader_process, scanner);
time (&scanner->last_scan);
if (sanei_thread_is_invalid (scanner->reader_pid))
if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG (MSG_ERR, "cannot fork reader process.\n");
DBG (MSG_ERR, "%s", strerror (errno));
@ -1098,7 +1098,7 @@ do_reset (struct hp3500_data *scanner)
static void
do_cancel (struct hp3500_data *scanner)
{
if (!sanei_thread_is_invalid (scanner->reader_pid))
if (sanei_thread_is_valid (scanner->reader_pid))
{
if (sanei_thread_kill (scanner->reader_pid) == 0)

4
backend/microtek2.c
Wyświetl plik

@ -909,7 +909,7 @@ cancel_scan(Microtek2_Scanner *ms)
of material on a feeder, then pid may be already -1 and
kill(-1, SIGTERM), i.e. killing all our processes, is not
likely what we really want - --mj, 2001/Nov/19 */
if (!sanei_thread_is_invalid (ms->pid))
if (sanei_thread_is_valid (ms->pid))
{
sanei_thread_kill(ms->pid);
sanei_thread_waitpid(ms->pid, NULL);
@ -5503,7 +5503,7 @@ sane_start(SANE_Handle handle)
/* create reader routine as new thread or process */
ms->pid = sanei_thread_begin( reader_process,(void*) ms);
if ( sanei_thread_is_invalid (ms->pid) )
if ( !sanei_thread_is_valid (ms->pid) )
{
DBG(1, "sane_start: fork failed\n");
status = SANE_STATUS_IO_ERROR;

6
backend/mustek.c
Wyświetl plik

@ -2952,7 +2952,7 @@ do_stop (Mustek_Scanner * s)
s->scanning = SANE_FALSE;
s->pass = 0;
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
{
SANE_Int exit_status;
struct timeval now;
@ -2983,7 +2983,7 @@ do_stop (Mustek_Scanner * s)
sanei_thread_kill (s->reader_pid);
pid = sanei_thread_waitpid (s->reader_pid, &exit_status);
if (sanei_thread_is_invalid (pid))
if (!sanei_thread_is_valid (pid))
{
DBG (1,
"do_stop: sanei_thread_waitpid failed, already terminated? (%s)\n",
@ -6565,7 +6565,7 @@ sane_start (SANE_Handle handle)
/* create reader routine as new process or thread */
s->reader_pid = sanei_thread_begin (reader_process, (void *) s);
if (sanei_thread_is_invalid (s->reader_pid))
if (!sanei_thread_is_valid (s->reader_pid))
{
DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
strerror (errno));

4
backend/pie.c
Wyświetl plik

@ -2896,7 +2896,7 @@ do_cancel (Pie_Scanner * scanner)
scanner->scanning = SANE_FALSE;
if (!sanei_thread_is_invalid (scanner->reader_pid))
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 (sanei_thread_is_invalid (scanner->reader_pid))
if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
strerror (errno));

8
backend/pixma.c
Wyświetl plik

@ -1083,7 +1083,7 @@ terminate_reader_task (pixma_sane_t * ss, int *exit_code)
int status = 0;
pid = ss->reader_taskid;
if (sanei_thread_is_invalid (pid))
if (!sanei_thread_is_valid (pid))
return -1;
if (sanei_thread_is_forked ())
{
@ -1129,7 +1129,7 @@ start_reader_task (pixma_sane_t * ss)
ss->rpipe = -1;
ss->wpipe = -1;
}
if (!sanei_thread_is_invalid (ss->reader_taskid))
if (sanei_thread_is_valid (ss->reader_taskid))
{
PDBG (pixma_dbg
(1, "BUG:reader_taskid(%ld) != -1\n", (long) ss->reader_taskid));
@ -1159,7 +1159,7 @@ start_reader_task (pixma_sane_t * ss)
{
pid = sanei_thread_begin (reader_thread, ss);
}
if (sanei_thread_is_invalid (pid))
if (!sanei_thread_is_valid (pid))
{
close (ss->wpipe);
close (ss->rpipe);
@ -1227,7 +1227,7 @@ read_image (pixma_sane_t * ss, void *buf, unsigned size, int *readlen)
ss->image_bytes_read, ss->sp.image_size));
close (ss->rpipe);
ss->rpipe = -1;
if (!sanei_thread_is_invalid (terminate_reader_task (ss, &status))
if (sanei_thread_is_valid (terminate_reader_task (ss, &status))
&& status != SANE_STATUS_GOOD)
{
return status;

4
backend/plustek.c
Wyświetl plik

@ -572,7 +572,7 @@ do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
DBG( _DBG_PROC,"do_cancel\n" );
scanner->scanning = SANE_FALSE;
if( !sanei_thread_is_invalid (scanner->reader_pid) ) {
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( sanei_thread_is_invalid (s->reader_pid) ) {
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 );

10
backend/snapscan.c
Wyświetl plik

@ -1301,7 +1301,7 @@ static SANE_Status start_reader (SnapScan_Scanner *pss)
cancelRead = SANE_FALSE;
if (sanei_thread_is_invalid (pss->child))
if (!sanei_thread_is_valid (pss->child))
{
/* we'll have to read in blocking mode */
DBG (DL_MAJOR_ERROR,
@ -1815,7 +1815,7 @@ SANE_Status sane_read (SANE_Handle h,
if (pss->psrc == NULL || pss->psrc->remaining(pss->psrc) == 0)
{
if (!sanei_thread_is_invalid (pss->child))
if (sanei_thread_is_valid (pss->child))
{
sanei_thread_waitpid (pss->child, 0); /* ensure no zombies */
pss->child = -1;
@ -1875,7 +1875,7 @@ void sane_cancel (SANE_Handle h)
/* signal a cancellation has occurred */
pss->state = ST_CANCEL_INIT;
/* signal the reader, if any */
if (!sanei_thread_is_invalid (pss->child))
if (sanei_thread_is_valid (pss->child))
{
DBG( DL_INFO, ">>>>>>>> killing reader_process <<<<<<<<\n" );
@ -1941,7 +1941,7 @@ SANE_Status sane_set_io_mode (SANE_Handle h, SANE_Bool m)
if (m)
{
if (sanei_thread_is_invalid (pss->child))
if (!sanei_thread_is_valid (pss->child))
{
DBG (DL_MINOR_INFO,
"%s: no reader child; must use blocking mode.\n",
@ -1971,7 +1971,7 @@ SANE_Status sane_get_select_fd (SANE_Handle h, SANE_Int * fd)
if (pss->state != ST_SCAN_INIT)
return SANE_STATUS_INVAL;
if (sanei_thread_is_invalid (pss->child))
if (!sanei_thread_is_valid (pss->child))
{
DBG (DL_MINOR_INFO,
"%s: no reader child; cannot provide select file descriptor.\n",

2
backend/sp15c.c
Wyświetl plik

@ -1762,7 +1762,7 @@ do_cancel (struct sp15c *scanner)
do_eof (scanner); /* close pipe and reposition scanner */
if (!sanei_thread_is_invalid (scanner->reader_pid))
if (sanei_thread_is_valid (scanner->reader_pid))
{
int exit_status;
DBG (10, "do_cancel: kill reader_process\n");

4
backend/tamarack.c
Wyświetl plik

@ -470,7 +470,7 @@ do_cancel (Tamarack_Scanner *s)
do_eof (s);
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
{
int exit_status;
@ -1442,7 +1442,7 @@ sane_cancel (SANE_Handle handle)
{
Tamarack_Scanner *s = handle;
if (!sanei_thread_is_invalid (s->reader_pid))
if (sanei_thread_is_valid (s->reader_pid))
sanei_thread_kill (s->reader_pid);
s->scanning = SANE_FALSE;
}

6
backend/test.c
Wyświetl plik

@ -1355,7 +1355,7 @@ finish_pass (Test_Device * test_device)
DBG (2, "finish_pass: pipe closed\n");
test_device->pipe = -1;
}
if (!sanei_thread_is_invalid (test_device->reader_pid))
if (sanei_thread_is_valid (test_device->reader_pid))
{
int status;
SANE_Pid pid;
@ -1364,7 +1364,7 @@ finish_pass (Test_Device * test_device)
(long) test_device->reader_pid);
sanei_thread_kill (test_device->reader_pid);
pid = sanei_thread_waitpid (test_device->reader_pid, &status);
if (sanei_thread_is_invalid (pid))
if (!sanei_thread_is_valid (pid))
{
DBG (1,
"finish_pass: sanei_thread_waitpid failed, already terminated? (%s)\n",
@ -2568,7 +2568,7 @@ sane_start (SANE_Handle handle)
test_device->reader_pid =
sanei_thread_begin (reader_task, (void *) test_device);
if (sanei_thread_is_invalid (test_device->reader_pid))
if (!sanei_thread_is_valid (test_device->reader_pid))
{
DBG (1, "sane_start: sanei_thread_begin failed (%s)\n",
strerror (errno));

4
backend/u12.c
Wyświetl plik

@ -391,7 +391,7 @@ static SANE_Status do_cancel( U12_Scanner *scanner, SANE_Bool closepipe )
scanner->scanning = SANE_FALSE;
if( !sanei_thread_is_invalid (scanner->reader_pid) ) {
if( sanei_thread_is_valid (scanner->reader_pid) ) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
@ -1731,7 +1731,7 @@ SANE_Status sane_start( SANE_Handle handle )
cancelRead = SANE_FALSE;
if( sanei_thread_is_invalid (s->reader_pid) ) {
if( !sanei_thread_is_valid (s->reader_pid) ) {
DBG( _DBG_ERROR, "ERROR: could not start reader task\n" );
s->scanning = SANE_FALSE;
u12if_close( dev );

6
backend/umax.c
Wyświetl plik

@ -4670,14 +4670,14 @@ static SANE_Status do_cancel(Umax_Scanner *scanner)
scanner->scanning = SANE_FALSE;
if (!sanei_thread_is_invalid (scanner->reader_pid))
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 (sanei_thread_is_invalid (pid))
if (!sanei_thread_is_valid (pid))
{
DBG(DBG_sane_info, "do_cancel: sanei_thread_waitpid failed, already terminated ? (%s)\n", strerror(errno));
}
@ -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 (sanei_thread_is_invalid (scanner->reader_pid))
if (!sanei_thread_is_valid (scanner->reader_pid))
{
DBG(DBG_error, "ERROR: sanei_thread_begin failed (%s)\n", strerror(errno));
scanner->scanning = SANE_FALSE;

6
include/sane/sanei_thread.h
Wyświetl plik

@ -88,10 +88,10 @@ extern SANE_Bool sanei_thread_is_forked (void);
* regardless of SANE_Pid's data type.
*
* @return
* - SANE_TRUE - if pid is not a valid process
* - SANE_FALSE - if pid is a valid process
* - SANE_TRUE - if pid is a valid process
* - SANE_FALSE - if pid is not a valid process
*/
extern SANE_Bool sanei_thread_is_invalid (SANE_Pid pid);
extern SANE_Bool sanei_thread_is_valid (SANE_Pid pid);
/** Spawn a new task.
*

8
sanei/sanei_thread.c
Wyświetl plik

@ -135,9 +135,9 @@ sanei_thread_set_invalid( SANE_Pid *pid )
/* Return if PID is a valid PID or not. */
SANE_Bool
sanei_thread_is_invalid( SANE_Pid pid )
sanei_thread_is_valid( SANE_Pid pid )
{
SANE_Bool rc = SANE_FALSE;
SANE_Bool rc = SANE_TRUE;
#ifdef WIN32
#ifdef WINPTHREAD_API
@ -145,10 +145,10 @@ sanei_thread_is_invalid( SANE_Pid pid )
#else
if (pid.p == 0)
#endif
rc = SANE_TRUE;
rc = SANE_FALSE;
#else
if (pid == (SANE_Pid) -1)
rc = SANE_TRUE;
rc = SANE_FALSE;
#endif
return rc;