diff options
| author | Gerald Carter <jerry@samba.org> | 2005-05-31 13:46:45 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:57:02 -0500 |
| commit | f24d88cf9da46680d52b42b92bd484e7b09ce99b (patch) | |
| tree | b30342fd7677a0d17306130077995110bfae344a /source3/smbd/notify_kernel.c | |
| parent | 450e8d5749504f8392c0cfe8b79218f03b88076a (diff) | |
| download | samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.gz samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.tar.bz2 samba-f24d88cf9da46680d52b42b92bd484e7b09ce99b.zip | |
r7139: trying to reduce the number of diffs between trunk and 3.0; changing version to 3.0.20pre1
(This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1)
Diffstat (limited to 'source3/smbd/notify_kernel.c')
| -rw-r--r-- | source3/smbd/notify_kernel.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/smbd/notify_kernel.c b/source3/smbd/notify_kernel.c index 5c9d885eed..b2ccfc2796 100644 --- a/source3/smbd/notify_kernel.c +++ b/source3/smbd/notify_kernel.c @@ -101,9 +101,8 @@ static BOOL kernel_check_notify(connection_struct *conn, uint16 vuid, char *path close((int)fd_pending_array[i]); fd_pending_array[i] = (SIG_ATOMIC_T)-1; if (signals_received - i - 1) { - memmove(CONST_DISCARD(void *, &fd_pending_array[i]), - CONST_DISCARD(void *, &fd_pending_array[i+1]), - sizeof(SIG_ATOMIC_T)*(signals_received-i-1)); + memmove((void *)&fd_pending_array[i], (void *)&fd_pending_array[i+1], + sizeof(SIG_ATOMIC_T)*(signals_received-i-1)); } data->directory_handle = -1; signals_received--; @@ -130,9 +129,8 @@ static void kernel_remove_notify(void *datap) if (fd == (int)fd_pending_array[i]) { fd_pending_array[i] = (SIG_ATOMIC_T)-1; if (signals_received - i - 1) { - memmove(CONST_DISCARD(void *, &fd_pending_array[i]), - CONST_DISCARD(void *, &fd_pending_array[i+1]), - sizeof(SIG_ATOMIC_T)*(signals_received-i-1)); + memmove((void *)&fd_pending_array[i], (void *)&fd_pending_array[i+1], + sizeof(SIG_ATOMIC_T)*(signals_received-i-1)); } data->directory_handle = -1; signals_received--; |