6598890 cancellation code abuses synonyms

--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c

1 files changed, 14 insertions, 20 deletions

diff --git a/usr/src/lib/libc/port/sys/openat.c b/usr/src/lib/libc/port/sys/openat.c
index 5549abf5d9..483a88a948 100644
--- a/usr/src/lib/libc/port/sys/openat.c
+++ b/usr/src/lib/libc/port/sys/openat.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,19 +18,14 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#if !defined(_LP64) && _FILE_OFFSET_BITS == 64
-#pragma weak openat64 = _openat64
-#else
-#pragma weak openat = _openat
-#endif
-
 #include "synonyms.h"
 #include <stdarg.h>
 #include <sys/types.h>
@@ -40,29 +34,29 @@
 #if !defined(_LP64) && _FILE_OFFSET_BITS == 64
 
 int
-openat64(int fd, const char *name, int omode, ...)
+__openat64(int fd, const char *name, int oflag, ...)
 {
 	va_list ap;
-	mode_t cmode;
+	mode_t mode;
 
-	va_start(ap, omode);
-	cmode = va_arg(ap, mode_t);
+	va_start(ap, oflag);
+	mode = va_arg(ap, mode_t);
 	va_end(ap);
-	return (syscall(SYS_fsat, 1, fd, name, omode, cmode));
+	return (syscall(SYS_fsat, 1, fd, name, oflag, mode));
 }
 
 #else
 
 int
-openat(int fd, const char *name, int omode, ...)
+__openat(int fd, const char *name, int oflag, ...)
 {
 	va_list ap;
-	mode_t cmode;
+	mode_t mode;
 
-	va_start(ap, omode);
-	cmode = va_arg(ap, mode_t);
+	va_start(ap, oflag);
+	mode = va_arg(ap, mode_t);
 	va_end(ap);
-	return (syscall(SYS_fsat, 0, fd, name, omode, cmode));
+	return (syscall(SYS_fsat, 0, fd, name, oflag, mode));
 }
 
 #endif