PSARC 2008/309 expunge synonyms.h

6700179 expunge synonyms.h

--HG--
rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h
rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c
rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h
rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h
rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c
rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c
rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c
rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c
rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c
rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c
rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h
rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c
rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c
rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg
rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h
rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h
rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh
rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c
rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c

1 files changed, 12 insertions, 12 deletions

diff --git a/usr/src/lib/libc/port/gen/catopen.c b/usr/src/lib/libc/port/gen/catopen.c
index 1cf6a6abcb..0da2a749fa 100644
--- a/usr/src/lib/libc/port/gen/catopen.c
+++ b/usr/src/lib/libc/port/gen/catopen.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,8 +18,9 @@
  *
  * 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.
  */
 
@@ -31,10 +31,10 @@
  *
  */
 
-#pragma weak catopen = _catopen
-#pragma weak catclose = _catclose
+#pragma weak _catopen = catopen
+#pragma weak _catclose = catclose
 
-#include "synonyms.h"
+#include "lint.h"
 #include "libc.h"
 #include <sys/types.h>
 #include <unistd.h>
@@ -58,7 +58,7 @@ static nl_catd file_open(const char *, int);
 static nl_catd process_nls_path(char *, int);
 
 nl_catd
-_catopen(const char *name, int oflag)
+catopen(const char *name, int oflag)
 {
 	nl_catd p;
 
@@ -156,7 +156,7 @@ process_nls_path(char *name, int oflag)
 
 			/* replace Substitution field */
 			s = replace_nls_option(s, name, pathname, locale,
-						lang, territory, codeset);
+			    lang, territory, codeset);
 
 			p = file_open(pathname, UNSAFE_F);
 			if (p != NULL) {
@@ -246,14 +246,14 @@ replace_nls_option(char *s, char *name, char *pathname, char *locale,
 				if (lang) {
 					u = lang;
 					while (*u && *u != '_' &&
-						t < pathname + PATH_MAX)
+					    t < pathname + PATH_MAX)
 						*t++ = *u++;
 				}
 			} else if (*s == 't') {
 				if (territory) {
 					u = territory;
 					while (*u && *u != '.' &&
-						t < pathname + PATH_MAX)
+					    t < pathname + PATH_MAX)
 						*t++ = *u++;
 				}
 			} else if (*s == 'c') {
@@ -320,7 +320,7 @@ file_open(const char *name, int safe)
 }
 
 int
-_catclose(nl_catd catd)
+catclose(nl_catd catd)
 {
 	if (catd &&
 	    catd != (nl_catd)-1) {