diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/notify_kernel.c | 12 | ||||
| -rw-r--r-- | source3/smbd/oplock.c | 2 | ||||
| -rw-r--r-- | source3/smbd/oplock_linux.c | 10 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/server.c | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c index ef4e47acf1..d7408c06b5 100644 --- a/source3/smbd/notify_kernel.c +++ b/source3/smbd/notify_kernel.c @@ -24,9 +24,9 @@ #if HAVE_KERNEL_CHANGE_NOTIFY extern int DEBUGLEVEL; -static VOLATILE SIG_ATOMIC_T fd_pending; -static VOLATILE SIG_ATOMIC_T signals_received; -static VOLATILE SIG_ATOMIC_T signals_processed; +static VOLATILE sig_atomic_t fd_pending; +static VOLATILE sig_atomic_t signals_received; +static VOLATILE sig_atomic_t signals_processed; #ifndef DN_ACCESS #define DN_ACCESS 0x00000001 /* File accessed in directory */ @@ -65,7 +65,7 @@ the signal handler for change notify static void signal_handler(int sig, siginfo_t *info, void *unused) { BlockSignals(True, sig); - fd_pending = (SIG_ATOMIC_T)info->si_fd; + fd_pending = (sig_atomic_t)info->si_fd; signals_received++; sys_select_signal(); } @@ -89,7 +89,7 @@ static BOOL kernel_check_notify(connection_struct *conn, uint16 vuid, char *path DEBUG(3,("kernel change notify on %s fd=%d\n", path, (int)fd_pending)); close((int)fd_pending); - fd_pending = (SIG_ATOMIC_T)-1; + fd_pending = (sig_atomic_t)-1; data->directory_handle = -1; signals_processed++; BlockSignals(False, RT_SIGNAL_NOTIFY); @@ -105,7 +105,7 @@ static void kernel_remove_notify(void *datap) int fd = data->directory_handle; if (fd != -1) { if (fd == (int)fd_pending) { - fd_pending = (SIG_ATOMIC_T)-1; + fd_pending = (sig_atomic_t)-1; signals_processed++; BlockSignals(False, RT_SIGNAL_NOTIFY); } diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 4482c0221c..cc2581375e 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -1195,7 +1195,7 @@ setup oplocks for this process BOOL init_oplocks(void) { struct sockaddr_in sock_name; - int len = sizeof(sock_name); + socklen_t len = sizeof(sock_name); DEBUG(3,("open_oplock_ipc: opening loopback UDP socket.\n")); diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 9edeb1b513..39ee3eb86b 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -25,9 +25,9 @@ extern int DEBUGLEVEL; -static VOLATILE SIG_ATOMIC_T signals_received; -static VOLATILE SIG_ATOMIC_T signals_processed; -static VOLATILE SIG_ATOMIC_T fd_pending; /* the fd of the current pending signal */ +static VOLATILE sig_atomic_t signals_received; +static VOLATILE sig_atomic_t signals_processed; +static VOLATILE sig_atomic_t fd_pending; /* the fd of the current pending signal */ #ifndef F_SETLEASE #define F_SETLEASE 1024 @@ -55,7 +55,7 @@ handle a LEASE signal, incrementing the signals_received and blocking the signal static void signal_handler(int sig, siginfo_t *info, void *unused) { BlockSignals(True, sig); - fd_pending = (SIG_ATOMIC_T)info->si_fd; + fd_pending = (sig_atomic_t)info->si_fd; signals_received++; sys_select_signal(); } @@ -160,7 +160,7 @@ dev = %x, inode = %.0f\n", (unsigned int)dev, (double)inode )); out: /* now we can receive more signals */ - fd_pending = (SIG_ATOMIC_T)-1; + fd_pending = (sig_atomic_t)-1; signals_processed++; BlockSignals(False, RT_SIGNAL_LEASE); diff --git a/source3/smbd/process.c b/source3/smbd/process.c index dae99ec80e..f43c675289 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -48,7 +48,7 @@ extern char *last_inbuf; extern char *InBuffer; extern char *OutBuffer; extern int smb_read_error; -extern VOLATILE SIG_ATOMIC_T reload_after_sighup; +extern VOLATILE sig_atomic_t reload_after_sighup; extern BOOL global_machine_password_needs_changing; extern fstring global_myworkgroup; extern pstring global_myname; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 17b7774b1d..1dcf861a17 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -208,7 +208,7 @@ max can be %d\n", num = sys_select(FD_SETSIZE,&lfds,NULL); if (num == -1 && errno == EINTR) { - extern VOLATILE SIG_ATOMIC_T reload_after_sighup; + extern VOLATILE sig_atomic_t reload_after_sighup; /* check for sighup processing */ if (reload_after_sighup) { @@ -228,7 +228,7 @@ max can be %d\n", accept on these. */ for( ; num > 0; num--) { struct sockaddr addr; - int in_addrlen = sizeof(addr); + socklen_t in_addrlen = sizeof(addr); s = -1; for(i = 0; i < num_interfaces; i++) { @@ -366,7 +366,7 @@ BOOL reload_services(BOOL test) Catch a sighup. ****************************************************************************/ -VOLATILE SIG_ATOMIC_T reload_after_sighup = False; +VOLATILE sig_atomic_t reload_after_sighup = False; static void sig_hup(int sig) { |