From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 6 Oct 2007 22:28:14 +0000 Subject: r25554: Convert last instances of BOOL, True and False to the standard types. (This used to be commit 566aa14139510788548a874e9213d91317f83ca9) --- source4/ntvfs/sysdep/inotify.c | 14 +++++++------- source4/ntvfs/sysdep/sys_notify.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'source4/ntvfs/sysdep') diff --git a/source4/ntvfs/sysdep/inotify.c b/source4/ntvfs/sysdep/inotify.c index 191212580b..3fa710415b 100644 --- a/source4/ntvfs/sysdep/inotify.c +++ b/source4/ntvfs/sysdep/inotify.c @@ -83,19 +83,19 @@ struct inotify_watch_context { see if a particular event from inotify really does match a requested notify event in SMB */ -static BOOL filter_match(struct inotify_watch_context *w, +static bool filter_match(struct inotify_watch_context *w, struct inotify_event *e) { if ((e->mask & w->mask) == 0) { /* this happens because inotify_add_watch() coalesces watches on the same path, oring their masks together */ - return False; + return false; } /* SMB separates the filters for files and directories */ if (e->mask & IN_ISDIR) { if ((w->filter & FILE_NOTIFY_CHANGE_DIR_NAME) == 0) { - return False; + return false; } } else { if ((e->mask & IN_ATTRIB) && @@ -104,18 +104,18 @@ static BOOL filter_match(struct inotify_watch_context *w, FILE_NOTIFY_CHANGE_LAST_ACCESS| FILE_NOTIFY_CHANGE_EA| FILE_NOTIFY_CHANGE_SECURITY))) { - return True; + return true; } if ((e->mask & IN_MODIFY) && (w->filter & FILE_NOTIFY_CHANGE_ATTRIBUTES)) { - return True; + return true; } if ((w->filter & FILE_NOTIFY_CHANGE_FILE_NAME) == 0) { - return False; + return false; } } - return True; + return true; } diff --git a/source4/ntvfs/sysdep/sys_notify.c b/source4/ntvfs/sysdep/sys_notify.c index a13d02c12e..1664461d33 100644 --- a/source4/ntvfs/sysdep/sys_notify.c +++ b/source4/ntvfs/sysdep/sys_notify.c @@ -123,13 +123,13 @@ _PUBLIC_ NTSTATUS sys_notify_register(struct sys_notify_backend *backend) _PUBLIC_ NTSTATUS sys_notify_init(void) { - static BOOL initialized = False; + static bool initialized = false; init_module_fn static_init[] = STATIC_sys_notify_MODULES; init_module_fn *shared_init; if (initialized) return NT_STATUS_OK; - initialized = True; + initialized = true; shared_init = load_samba_modules(NULL, global_loadparm, "sys_notify"); -- cgit