Simplify sytem call renaming. Instead of _foo() <-- _libc_foo <-- foo(),

just use _foo() <-- foo().  In the case of a libpthread that doesn't do
call conversion (such as linuxthreads and our upcoming libpthread), this
is adequate.  In the case of libc_r, we still need three names, which are
now _thread_sys_foo() <-- _foo() <-- foo().

Convert all internal libc usage of: aio_suspend(), close(), fsync(), msync(),
nanosleep(), open(), fcntl(), read(), and write() to _foo() instead of foo().

Remove all internal libc usage of: creat(), pause(), sleep(), system(),
tcdrain(), wait(), and waitpid().

Make thread cancellation fully POSIX-compliant.

Suggested by:	deischen

1 files changed, 13 insertions, 13 deletions

diff --git a/lib/libpthread/thread/thr_msync.c b/lib/libpthread/thread/thr_msync.c
index 9559ec4..2ae6ac7 100644
--- a/lib/libpthread/thread/thr_msync.c
+++ b/lib/libpthread/thread/thr_msync.c
@@ -13,30 +13,30 @@
 #include "pthread_private.h"
 
 int
-_libc_msync(addr, len, flags)
-	void *addr;
-	size_t len;
-	int flags;
+_msync(void *addr, size_t len, int flags)
 {
 	int ret;
 
+	ret = _thread_sys_msync(addr, len, flags);
+
+	return (ret);
+}
+
+int
+msync(void *addr, size_t len, int flags)
+{
+	int	ret;
+
 	/*
 	 * XXX This is quite pointless unless we know how to get the
 	 * file descriptor associated with the memory, and lock it for
 	 * write. The only real use of this wrapper is to guarantee
 	 * a cancellation point, as per the standard. sigh.
 	 */
-
-	/* This is a cancellation point: */
 	_thread_enter_cancellation_point();
-
-	ret = _thread_sys_msync(addr, len, flags);
-
-	/* No longer in a cancellation point: */
+	ret = _msync(addr, len, flags);
 	_thread_leave_cancellation_point();
 
-	return (ret);
+	return ret;
 }
-
-__weak_reference(_libc_msync, msync);
 #endif