From 3d6648de144081c92358b36d88b25efc6e0cef5a Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Wed, 10 Dec 2008 17:33:45 +0000 Subject: remove __libc_fcntl[64] --- libc/misc/internals/__uClibc_main.c | 6 ++---- libc/sysdeps/linux/common/__syscall_fcntl.c | 22 ++++------------------ libc/sysdeps/linux/common/__syscall_fcntl64.c | 10 ++-------- 3 files changed, 8 insertions(+), 30 deletions(-) (limited to 'libc') diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c index d0de0d30e..3804e5e15 100644 --- a/libc/misc/internals/__uClibc_main.c +++ b/libc/misc/internals/__uClibc_main.c @@ -43,8 +43,6 @@ extern __typeof(open) __libc_open; libc_hidden_proto(__libc_open) -extern __typeof(fcntl) __libc_fcntl; -libc_hidden_proto(__libc_fcntl) #endif #ifndef SHARED @@ -139,13 +137,13 @@ size_t __pagesize = 0; static void __check_one_fd(int fd, int mode) { /* Check if the specified fd is already open */ - if (__libc_fcntl(fd, F_GETFD) == -1) + if (fcntl(fd, F_GETFD) == -1) { /* The descriptor is probably not open, so try to use /dev/null */ int nullfd = __libc_open(_PATH_DEVNULL, mode); /* /dev/null is major=1 minor=3. Make absolutely certain * that is in fact the device that we have opened and not - * some other wierd file... */ + * some other wierd file... [removed in uclibc] */ if (nullfd!=fd) { abort(); diff --git a/libc/sysdeps/linux/common/__syscall_fcntl.c b/libc/sysdeps/linux/common/__syscall_fcntl.c index e95c6fe2d..8b896b4f7 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl.c @@ -12,19 +12,11 @@ #include #include -extern __typeof(fcntl) __libc_fcntl; -libc_hidden_proto(__libc_fcntl) - -#if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 -extern __typeof(fcntl64) __libc_fcntl64; -libc_hidden_proto(__libc_fcntl64) -#endif - #define __NR___syscall_fcntl __NR_fcntl static __always_inline _syscall3(int, __syscall_fcntl, int, fd, int, cmd, long, arg) -int __libc_fcntl(int fd, int cmd, ...) +int fcntl(int fd, int cmd, ...) { long arg; va_list list; @@ -36,7 +28,7 @@ int __libc_fcntl(int fd, int cmd, ...) #if __WORDSIZE == 32 if (cmd == F_GETLK64 || cmd == F_SETLK64 || cmd == F_SETLKW64) { #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 - return __libc_fcntl64(fd, cmd, arg); + return fcntl64(fd, cmd, arg); #else __set_errno(ENOSYS); return -1; @@ -46,14 +38,8 @@ int __libc_fcntl(int fd, int cmd, ...) return (__syscall_fcntl(fd, cmd, arg)); } -libc_hidden_def(__libc_fcntl) +libc_hidden_def(fcntl) -/* libc_hidden_proto(fcntl) */ -weak_alias(__libc_fcntl,fcntl) -libc_hidden_weak(fcntl) #if ! defined __NR_fcntl64 && defined __UCLIBC_HAS_LFS__ -strong_alias(__libc_fcntl,__libc_fcntl64) -/* libc_hidden_proto(fcntl64) */ -weak_alias(__libc_fcntl,fcntl64) -libc_hidden_weak(fcntl64) +strong_alias(fcntl,fcntl64) #endif diff --git a/libc/sysdeps/linux/common/__syscall_fcntl64.c b/libc/sysdeps/linux/common/__syscall_fcntl64.c index cd5c59bd2..e8782e967 100644 --- a/libc/sysdeps/linux/common/__syscall_fcntl64.c +++ b/libc/sysdeps/linux/common/__syscall_fcntl64.c @@ -12,12 +12,10 @@ #include #if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64 -extern __typeof(fcntl64) __libc_fcntl64; -libc_hidden_proto(__libc_fcntl64) #define __NR___syscall_fcntl64 __NR_fcntl64 static __inline__ _syscall3(int, __syscall_fcntl64, int, fd, int, cmd, long, arg) -int __libc_fcntl64(int fd, int cmd, ...) +int fcntl64(int fd, int cmd, ...) { long arg; va_list list; @@ -28,9 +26,5 @@ int __libc_fcntl64(int fd, int cmd, ...) return (__syscall_fcntl64(fd, cmd, arg)); } -libc_hidden_def(__libc_fcntl64) - -/* libc_hidden_proto(fcntl64) */ -strong_alias(__libc_fcntl64,fcntl64) -libc_hidden_weak(fcntl64) +libc_hidden_def(fcntl64) #endif -- cgit v1.2.3