From 842128f160a48e5545900ea3bc3ba2ce40539d11 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:10 -0300 Subject: Linux: consolidate inotify_init implementation Use inotify_init syscall if defined, otherwise use inotify_init1. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/generic/inotify_init.c | 28 ---------------------- sysdeps/unix/sysv/linux/inotify_init.c | 33 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/generic/inotify_init.c create mode 100644 sysdeps/unix/sysv/linux/inotify_init.c diff --git a/sysdeps/unix/sysv/linux/generic/inotify_init.c b/sysdeps/unix/sysv/linux/generic/inotify_init.c deleted file mode 100644 index 3297ebc705..0000000000 --- a/sysdeps/unix/sysv/linux/generic/inotify_init.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2011-2022 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include -#include - -libc_hidden_proto (inotify_init) - -int -inotify_init (void) -{ - return INLINE_SYSCALL (inotify_init1, 1, 0); -} -libc_hidden_def (inotify_init) diff --git a/sysdeps/unix/sysv/linux/inotify_init.c b/sysdeps/unix/sysv/linux/inotify_init.c new file mode 100644 index 0000000000..4da5b723a6 --- /dev/null +++ b/sysdeps/unix/sysv/linux/inotify_init.c @@ -0,0 +1,33 @@ +/* Initialize an inotify instance. Linux version. + Copyright (C) 2011-2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#include +#include + +libc_hidden_proto (inotify_init) + +int +inotify_init (void) +{ +#ifdef __NR_inotify_init + return INLINE_SYSCALL_CALL (inotify_init); +#else + return INLINE_SYSCALL_CALL (inotify_init1, 0); +#endif +} +libc_hidden_def (inotify_init) -- cgit 1.4.1