summaryrefslogtreecommitdiff
path: root/source3/smbd/notify_kernel.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-06-25 02:53:13 +0000
committerAndrew Tridgell <tridge@samba.org>2001-06-25 02:53:13 +0000
commitb95a294a0879e800e816281a80d0074224cd8cd4 (patch)
treef6f57c9b0138c1a3027fa1ed78186d9df0830c0d /source3/smbd/notify_kernel.c
parent413ad23faff509332985d6972c931900af2fd5f5 (diff)
downloadsamba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.gz
samba-b95a294a0879e800e816281a80d0074224cd8cd4.tar.bz2
samba-b95a294a0879e800e816281a80d0074224cd8cd4.zip
fixed usage of socklen_t and also tidied up SIG_ATOMIC_T, using a typedef instead of a define
(This used to be commit e2ecff419fdc0a0dc7551b33b377dc11061ef2a3)
Diffstat (limited to 'source3/smbd/notify_kernel.c')
-rw-r--r--source3/smbd/notify_kernel.c12
1 files changed, 6 insertions, 6 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);
}