[PATCH 1/4] inotify_rm_watch: Change second argument to int

Kevin Cernekee cernekee at gmail.com
Sun Apr 8 18:42:59 UTC 2012


>From glibc:

2009-01-30  Ulrich Drepper  <drepper at redhat.com>

        [BZ #7040]
        * sysdeps/unix/sysv/linux/sys/inotify.h: Second parameter of
        inotify_rm_watch should have type int.

This change allows us to copy inotify.h verbatim from glibc into uClibc.

Signed-off-by: Kevin Cernekee <cernekee at gmail.com>
---
 libc/sysdeps/linux/common/inotify.c     |    2 +-
 libc/sysdeps/linux/common/sys/inotify.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libc/sysdeps/linux/common/inotify.c b/libc/sysdeps/linux/common/inotify.c
index e35f043..e2f3836 100644
--- a/libc/sysdeps/linux/common/inotify.c
+++ b/libc/sysdeps/linux/common/inotify.c
@@ -24,5 +24,5 @@ _syscall3(int, inotify_add_watch, int, fd, const char *, path, uint32_t, mask)
 #endif
 
 #ifdef __NR_inotify_rm_watch
-_syscall2(int, inotify_rm_watch, int, fd, uint32_t, wd)
+_syscall2(int, inotify_rm_watch, int, fd, int, wd)
 #endif
diff --git a/libc/sysdeps/linux/common/sys/inotify.h b/libc/sysdeps/linux/common/sys/inotify.h
index dc4e19d..07be37d 100644
--- a/libc/sysdeps/linux/common/sys/inotify.h
+++ b/libc/sysdeps/linux/common/sys/inotify.h
@@ -98,7 +98,7 @@ extern int inotify_add_watch (int __fd, const char *__name, uint32_t __mask)
   __THROW;
 
 /* Remove the watch specified by WD from the inotify instance FD.  */
-extern int inotify_rm_watch (int __fd, uint32_t __wd) __THROW;
+extern int inotify_rm_watch (int __fd, int __wd) __THROW;
 
 __END_DECLS
 
-- 
1.7.8.3



More information about the uClibc mailing list