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 'avision_warning_fix' into 'master' 

avision: fix for warning related to pthread unused variable and shadowed variable name.

See merge request sane-project/backends!809
merge-requests/813/head
Ralph Little 2023-11-06 18:37:43 +00:00
rodzic 86f41b1360 43135ab7ed
commit 5b067b7cda
1 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
backend/avision.c
Wyświetl plik

@ -7520,7 +7520,6 @@ reader_process (void *data)
sigset_t sigterm_set;
sigset_t ignore_set;
struct SIGACTION act;
int old;
FILE* fp;
FILE* fp_fd = 0; /* for ADF bottom offset truncating */
@ -7800,7 +7799,10 @@ reader_process (void *data)
sigprocmask (SIG_BLOCK, &sigterm_set, 0);
#ifdef USE_PTHREAD
else
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old);
{
int old;
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old);
}
#endif
status = read_data (s, stripe_data + stripe_fill, &this_read);
@ -7809,10 +7811,12 @@ reader_process (void *data)
sigprocmask (SIG_UNBLOCK, &sigterm_set, 0);
#ifdef USE_PTHREAD
else
pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &old);
{
int old;
pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &old);
}
#endif
/* only EOF on the second stripe, as otherwise the rear page
is shorter */
if (status == SANE_STATUS_EOF && deinterlace == STRIPE) {