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

Merge branch 'log-messages-no-git-conflict-markers' into 'master' 

Don't use strings that are similar to conflict markers in debug msgs

See merge request sane-project/backends!60
merge-requests/62/head
Olaf Meeuwissen 2019-05-11 08:13:18 +00:00
rodzic 856391100f 16a8d55480
commit 15fd9bc9ce
4 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
backend/plustek.c
Wyświetl plik

@ -574,7 +574,7 @@ do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
if( sanei_thread_is_valid (scanner->reader_pid) ) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
DBG( _DBG_PROC, "---- killing reader_process ----\n" );
cancelRead = SANE_TRUE;
scanner->calibrating = SANE_FALSE;

2
backend/plustek_pp.c
Wyświetl plik

@ -473,7 +473,7 @@ static SANE_Status do_cancel( Plustek_Scanner *scanner, SANE_Bool closepipe )
if( sanei_thread_is_valid( scanner->reader_pid )) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
DBG( _DBG_PROC, "---- killing reader_process ----\n" );
/* tell the driver to stop scanning */
if( -1 != scanner->hw->fd ) {

2
backend/snapscan.c
Wyświetl plik

@ -1871,7 +1871,7 @@ void sane_cancel (SANE_Handle h)
/* signal the reader, if any */
if (sanei_thread_is_valid (pss->child))
{
DBG( DL_INFO, ">>>>>>>> killing reader_process <<<<<<<<\n" );
DBG( DL_INFO, "---- killing reader_process ----\n" );
sigemptyset(&(act.sa_mask));
act.sa_flags = 0;

2
backend/u12.c
Wyświetl plik

@ -393,7 +393,7 @@ static SANE_Status do_cancel( U12_Scanner *scanner, SANE_Bool closepipe )
if( sanei_thread_is_valid (scanner->reader_pid) ) {
DBG( _DBG_PROC, ">>>>>>>> killing reader_process <<<<<<<<\n" );
DBG( _DBG_PROC, "---- killing reader_process ----\n" );
cancelRead = SANE_TRUE;