sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-11 16:58:40 +03:00
Code

s3: Rename a variable in inotify_watch for clarity

Browse Source
This commit is contained in:
Volker Lendecke 2012-03-26 13:09:33 +02:00
parent 6355d2e68a
commit 58c8857b72
1 changed files with 5 additions and 5 deletions

10
source3/smbd/notify_inotify.c

@ -383,7 +383,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
int wd; int wd;
uint32_t mask; uint32_t mask;
struct inotify_watch_context *w; struct inotify_watch_context *w;
uint32_t filter = e->filter; uint32_t orig_filter = e->filter;
void **handle = (void **)handle_p; void **handle = (void **)handle_p;
/* maybe setup the inotify fd */ /* maybe setup the inotify fd */
@ -408,7 +408,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
/* get a new watch descriptor for this path */ /* get a new watch descriptor for this path */
wd = inotify_add_watch(in->fd, path, mask); wd = inotify_add_watch(in->fd, path, mask);
if (wd == -1) { if (wd == -1) {
e->filter = filter; e->filter = orig_filter;
DEBUG(1, ("inotify_add_watch returned %s\n", strerror(errno))); DEBUG(1, ("inotify_add_watch returned %s\n", strerror(errno)));
return map_nt_error_from_unix(errno); return map_nt_error_from_unix(errno);
} }
@ -419,7 +419,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
w = talloc(in, struct inotify_watch_context); w = talloc(in, struct inotify_watch_context);
if (w == NULL) { if (w == NULL) {
inotify_rm_watch(in->fd, wd); inotify_rm_watch(in->fd, wd);
e->filter = filter; e->filter = orig_filter;
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }
@ -428,11 +428,11 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
w->callback = callback; w->callback = callback;
w->private_data = private_data; w->private_data = private_data;
w->mask = mask; w->mask = mask;
w->filter = filter; w->filter = orig_filter;
w->path = talloc_strdup(w, path); w->path = talloc_strdup(w, path);
if (w->path == NULL) { if (w->path == NULL) {
inotify_rm_watch(in->fd, wd); inotify_rm_watch(in->fd, wd);
e->filter = filter; e->filter = orig_filter;
return NT_STATUS_NO_MEMORY; return NT_STATUS_NO_MEMORY;
} }