svn commit: trunk/uClibc/libc: misc/internals sysdeps/linux/common

[vda at uclibc.org]

Author: vda
Date: 2008-12-10 09:33:45 -0800 (Wed, 10 Dec 2008)
New Revision: 24362

Log:
remove __libc_fcntl[64]



Modified:
   trunk/uClibc/libc/misc/internals/__uClibc_main.c
   trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c
   trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c	2008-12-10 16:40:40 UTC (rev 24361)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2008-12-10 17:33:45 UTC (rev 24362)
@@ -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 @@
 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();

Modified: trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c	2008-12-10 16:40:40 UTC (rev 24361)
+++ trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c	2008-12-10 17:33:45 UTC (rev 24362)
@@ -12,19 +12,11 @@
 #include <fcntl.h>
 #include <bits/wordsize.h>
 
-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 @@
 #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 @@
 
 	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

Modified: trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c	2008-12-10 16:40:40 UTC (rev 24361)
+++ trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl64.c	2008-12-10 17:33:45 UTC (rev 24362)
@@ -12,12 +12,10 @@
 #include <fcntl.h>
 
 #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 @@
 
 	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