kopia lustrzana https://gitlab.com/sane-project/backends
avision: fix for warning related to pthread unused variable and shadowed variable name.
rodzic
86f41b1360
commit
43135ab7ed
|
@ -7520,7 +7520,6 @@ reader_process (void *data)
|
||||||
sigset_t sigterm_set;
|
sigset_t sigterm_set;
|
||||||
sigset_t ignore_set;
|
sigset_t ignore_set;
|
||||||
struct SIGACTION act;
|
struct SIGACTION act;
|
||||||
int old;
|
|
||||||
|
|
||||||
FILE* fp;
|
FILE* fp;
|
||||||
FILE* fp_fd = 0; /* for ADF bottom offset truncating */
|
FILE* fp_fd = 0; /* for ADF bottom offset truncating */
|
||||||
|
@ -7800,7 +7799,10 @@ reader_process (void *data)
|
||||||
sigprocmask (SIG_BLOCK, &sigterm_set, 0);
|
sigprocmask (SIG_BLOCK, &sigterm_set, 0);
|
||||||
#ifdef USE_PTHREAD
|
#ifdef USE_PTHREAD
|
||||||
else
|
else
|
||||||
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old);
|
{
|
||||||
|
int old;
|
||||||
|
pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &old);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
status = read_data (s, stripe_data + stripe_fill, &this_read);
|
status = read_data (s, stripe_data + stripe_fill, &this_read);
|
||||||
|
@ -7809,10 +7811,12 @@ reader_process (void *data)
|
||||||
sigprocmask (SIG_UNBLOCK, &sigterm_set, 0);
|
sigprocmask (SIG_UNBLOCK, &sigterm_set, 0);
|
||||||
#ifdef USE_PTHREAD
|
#ifdef USE_PTHREAD
|
||||||
else
|
else
|
||||||
pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &old);
|
{
|
||||||
|
int old;
|
||||||
|
pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, &old);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/* only EOF on the second stripe, as otherwise the rear page
|
/* only EOF on the second stripe, as otherwise the rear page
|
||||||
is shorter */
|
is shorter */
|
||||||
if (status == SANE_STATUS_EOF && deinterlace == STRIPE) {
|
if (status == SANE_STATUS_EOF && deinterlace == STRIPE) {
|
||||||
|
|
Ładowanie…
Reference in New Issue