diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/unix/getdents.c | 35 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/getdents.c | 38 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/syscalls.list | 1 |
4 files changed, 4 insertions, 74 deletions
diff --git a/ChangeLog b/ChangeLog index 282d0a1df5..e69155ec78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-04-24 Joseph Myers <joseph@codesourcery.com> + * sysdeps/unix/getdents.c: Remove file. + * sysdeps/unix/sysv/getdents.c: Likewise. + * sysdeps/unix/sysv/syscalls.list (s_getdents): Remove. + * sysdeps/unix/syscalls.list (madvise): Add syscall from sysdeps/unix/mman/syscalls.list. (mmap): Likewise. diff --git a/sysdeps/unix/getdents.c b/sysdeps/unix/getdents.c deleted file mode 100644 index 842de402cf..0000000000 --- a/sysdeps/unix/getdents.c +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright (C) 1993, 1995, 1996, 1997 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 - <http://www.gnu.org/licenses/>. */ - -#include <stddef.h> -#include <sys/types.h> -#include <unistd.h> - -ssize_t -__getdirentries (fd, buf, nbytes, basep) - int fd; - char *buf; - size_t nbytes; - off_t *basep; -{ - if (basep) - *basep = __lseek (fd, (off_t) 0, SEEK_CUR); - - return (ssize_t) __read (fd, buf, nbytes); -} - -weak_alias (__getdirentries, getdirentries) diff --git a/sysdeps/unix/sysv/getdents.c b/sysdeps/unix/sysv/getdents.c deleted file mode 100644 index fb05979e2f..0000000000 --- a/sysdeps/unix/sysv/getdents.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright (C) 1993, 1995, 1997, 2004 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 - <http://www.gnu.org/licenses/>. */ - -#include <stddef.h> -#include <errno.h> -#include <sys/types.h> -#include <unistd.h> - -extern ssize_t __getdents (int fd, char *buf, size_t nbytes); - -ssize_t -__getdirentries (fd, buf, nbytes, basep) - int fd; - char *buf; - size_t nbytes; - off_t *basep; -{ - if (basep) - *basep = __lseek (fd, (off_t) 0, SEEK_CUR); - - return __getdents (fd, buf, nbytes); -} - -weak_alias (__getdirentries, getdirentries) diff --git a/sysdeps/unix/sysv/syscalls.list b/sysdeps/unix/sysv/syscalls.list index f65ed79f70..dc6a4311f1 100644 --- a/sysdeps/unix/sysv/syscalls.list +++ b/sysdeps/unix/sysv/syscalls.list @@ -5,7 +5,6 @@ ftime - ftime i:p ftime nice - nice i:i nice pause - pause Ci: pause poll - poll Ci:pii poll -s_getdents getdents getdents i:ipi __getdents setrlimit - setrlimit i:ip __setrlimit setrlimit settimeofday - settimeofday i:PP __settimeofday settimeofday signal - signal i:ii signal |