summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-03-26 13:09:33 +0200
committerVolker Lendecke <vl@samba.org>2012-03-26 13:10:10 +0200
commit58c8857b72fc76fb4ef5787daa823e26b58e5f12 (patch)
treeb211e44d60b0216e1190184521792a69af2289ee
parent6355d2e68a5d959f38fcab12af46e61013abd72a (diff)
downloadsamba-58c8857b72fc76fb4ef5787daa823e26b58e5f12.tar.gz
samba-58c8857b72fc76fb4ef5787daa823e26b58e5f12.tar.bz2
samba-58c8857b72fc76fb4ef5787daa823e26b58e5f12.zip
s3: Rename a variable in inotify_watch for clarity
-rw-r--r--source3/smbd/notify_inotify.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index fb972beafb..a03ad49d82 100644
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -383,7 +383,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
int wd;
uint32_t mask;
struct inotify_watch_context *w;
- uint32_t filter = e->filter;
+ uint32_t orig_filter = e->filter;
void **handle = (void **)handle_p;
/* 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 */
wd = inotify_add_watch(in->fd, path, mask);
if (wd == -1) {
- e->filter = filter;
+ e->filter = orig_filter;
DEBUG(1, ("inotify_add_watch returned %s\n", strerror(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);
if (w == NULL) {
inotify_rm_watch(in->fd, wd);
- e->filter = filter;
+ e->filter = orig_filter;
return NT_STATUS_NO_MEMORY;
}
@@ -428,11 +428,11 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
w->callback = callback;
w->private_data = private_data;
w->mask = mask;
- w->filter = filter;
+ w->filter = orig_filter;
w->path = talloc_strdup(w, path);
if (w->path == NULL) {
inotify_rm_watch(in->fd, wd);
- e->filter = filter;
+ e->filter = orig_filter;
return NT_STATUS_NO_MEMORY;
}