Imported Upstream version 2.6.3
This commit is contained in:
parent
45043b58d0
commit
fad6ced6f6
255 changed files with 11081 additions and 4629 deletions
|
|
@ -122,7 +122,6 @@ nutscan_device_t * nutscan_scan_nut(const char* startIP, const char* stopIP, con
|
|||
int change_action_handler = 0;
|
||||
int i;
|
||||
struct scan_nut_arg *nut_arg;
|
||||
|
||||
#ifdef HAVE_PTHREAD
|
||||
pthread_t thread;
|
||||
pthread_t * thread_array = NULL;
|
||||
|
|
@ -131,6 +130,10 @@ nutscan_device_t * nutscan_scan_nut(const char* startIP, const char* stopIP, con
|
|||
pthread_mutex_init(&dev_mutex,NULL);
|
||||
#endif
|
||||
|
||||
if( !nutscan_avail_nut ) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Ignore SIGPIPE if the caller hasn't set a handler for it yet */
|
||||
if( sigaction(SIGPIPE, NULL, &oldact) == 0 ) {
|
||||
if( oldact.sa_handler == SIG_DFL ) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue