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

fixed some warning conditions.

merge-requests/1/head
Gerhard Jaeger 2004-04-14 19:33:56 +00:00
rodzic 5c295cea4b
commit c95a1a3cde
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
sanei/sanei_thread.c
Wyświetl plik

@ -197,7 +197,7 @@ sanei_thread_sendsig( int pid, int sig )
static void static void
thread_exit_handler( int signo ) thread_exit_handler( int signo )
{ {
DBG( 2, "signal caught, calling pthread_exit now...\n" ); DBG( 2, "signal(%i) caught, calling pthread_exit now...\n", signo );
pthread_exit( PTHREAD_CANCELED ); pthread_exit( PTHREAD_CANCELED );
} }
#endif #endif
@ -207,7 +207,6 @@ static void*
local_thread( void *arg ) local_thread( void *arg )
{ {
static int status; static int status;
int old;
pThreadDataDef ltd = (pThreadDataDef)arg; pThreadDataDef ltd = (pThreadDataDef)arg;
#if defined (__APPLE__) && defined (__MACH__) #if defined (__APPLE__) && defined (__MACH__)
@ -218,6 +217,8 @@ local_thread( void *arg )
act.sa_handler = thread_exit_handler; act.sa_handler = thread_exit_handler;
sigaction( SIGUSR2, &act, 0 ); sigaction( SIGUSR2, &act, 0 );
#else #else
int old;
pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &old ); pthread_setcancelstate( PTHREAD_CANCEL_ENABLE, &old );
pthread_setcanceltype ( PTHREAD_CANCEL_ASYNCHRONOUS, &old ); pthread_setcanceltype ( PTHREAD_CANCEL_ASYNCHRONOUS, &old );
#endif #endif
@ -362,7 +363,7 @@ sanei_thread_waitpid( int pid, int *status )
DBG(2, "sanei_thread_waitpid() - %d\n", (int)pid); DBG(2, "sanei_thread_waitpid() - %d\n", (int)pid);
#ifdef USE_PTHREAD #ifdef USE_PTHREAD
result = pthread_join((pthread_t)pid, (void**)&ls ); result = pthread_join((pthread_t)pid, (void*)&ls );
if( 0 == result ) { if( 0 == result ) {
if( PTHREAD_CANCELED == ls ) { if( PTHREAD_CANCELED == ls ) {