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

54 files changed, 313 insertions, 387 deletions

diff --git a/usr/src/lib/libc/port/stdio/__extensions.c b/usr/src/lib/libc/port/stdio/__extensions.c
index bd680ce136..e5620dd446 100644
--- a/usr/src/lib/libc/port/stdio/__extensions.c
+++ b/usr/src/lib/libc/port/stdio/__extensions.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,14 +18,15 @@
  *
  * 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"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/_endopen.c b/usr/src/lib/libc/port/stdio/_endopen.c
index e58a779cc5..8e9ef792ac 100644
--- a/usr/src/lib/libc/port/stdio/_endopen.c
+++ b/usr/src/lib/libc/port/stdio/_endopen.c
@@ -18,16 +18,16 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2006 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  *	This routine is a special case, in that it is aware of
@@ -35,16 +35,6 @@
  *	in the small compilation environment.
  */
 
-#include <sys/feature_tests.h>
-
-#define	close		_close
-#define	lseek		_lseek
-#define	open		_open
-#if !defined(_LP64)
-#define	lseek64		_lseek64
-#define	open64		_open64
-#endif
-
 #include "lint.h"
 #include "file64.h"
 #include <mtlib.h>
diff --git a/usr/src/lib/libc/port/stdio/_filbuf.c b/usr/src/lib/libc/port/stdio/_filbuf.c
index 4b271cef2d..73150feb3a 100644
--- a/usr/src/lib/libc/port/stdio/_filbuf.c
+++ b/usr/src/lib/libc/port/stdio/_filbuf.c
@@ -30,9 +30,9 @@
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 
-#pragma weak _filbuf = __filbuf
+#pragma weak __filbuf = _filbuf
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/usr/src/lib/libc/port/stdio/_findbuf.c b/usr/src/lib/libc/port/stdio/_findbuf.c
index cbb323c3eb..d0c1949e98 100644
--- a/usr/src/lib/libc/port/stdio/_findbuf.c
+++ b/usr/src/lib/libc/port/stdio/_findbuf.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -32,7 +32,7 @@
 
 #define	_LARGEFILE64_SOURCE	1
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/_flsbuf.c b/usr/src/lib/libc/port/stdio/_flsbuf.c
index bcbc7f1a5a..234d9fd2c4 100644
--- a/usr/src/lib/libc/port/stdio/_flsbuf.c
+++ b/usr/src/lib/libc/port/stdio/_flsbuf.c
@@ -29,8 +29,9 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak _flsbuf = __flsbuf
-#include "synonyms.h"
+#pragma weak __flsbuf = _flsbuf
+
+#include "lint.h"
 #include "file64.h"
 #include <mtlib.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/_wrtchk.c b/usr/src/lib/libc/port/stdio/_wrtchk.c
index 40bce18a96..767e81ac39 100644
--- a/usr/src/lib/libc/port/stdio/_wrtchk.c
+++ b/usr/src/lib/libc/port/stdio/_wrtchk.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <stdio.h>
 #include <errno.h>
diff --git a/usr/src/lib/libc/port/stdio/clearerr.c b/usr/src/lib/libc/port/stdio/clearerr.c
index 57ded209c0..9e3d95e291 100644
--- a/usr/src/lib/libc/port/stdio/clearerr.c
+++ b/usr/src/lib/libc/port/stdio/clearerr.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,20 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak clearerr_unlocked = _clearerr_unlocked
-
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <mtlib.h>
 #include <stdio.h>
@@ -52,9 +49,3 @@ clearerr(FILE *iop)
 	iop->_flag &= ~(_IOERR | _IOEOF);
 	FUNLOCKFILE(lk);
 }
-
-void
-_clearerr_unlocked(FILE *iop)
-{
-	iop->_flag &= ~(_IOERR | _IOEOF);
-}
diff --git a/usr/src/lib/libc/port/stdio/ctermid.c b/usr/src/lib/libc/port/stdio/ctermid.c
index ea49f58b8a..0aba1d8d12 100644
--- a/usr/src/lib/libc/port/stdio/ctermid.c
+++ b/usr/src/lib/libc/port/stdio/ctermid.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,20 +18,20 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak ctermid = _ctermid
+#pragma weak _ctermid = ctermid
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include <stdio.h>
 #include <string.h>
diff --git a/usr/src/lib/libc/port/stdio/ctermid_r.c b/usr/src/lib/libc/port/stdio/ctermid_r.c
index 7bf667c0fe..a6fed17995 100644
--- a/usr/src/lib/libc/port/stdio/ctermid_r.c
+++ b/usr/src/lib/libc/port/stdio/ctermid_r.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,20 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak ctermid_r = _ctermid_r
-
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include <stdio.h>
 #include <string.h>
@@ -44,7 +41,7 @@
  */
 
 char *
-_ctermid_r(char *s)
+ctermid_r(char *s)
 {
 	return (s ? strcpy(s, "/dev/tty") : NULL);
 }
diff --git a/usr/src/lib/libc/port/stdio/cuserid.c b/usr/src/lib/libc/port/stdio/cuserid.c
index ec46291230..9d0c784e48 100644
--- a/usr/src/lib/libc/port/stdio/cuserid.c
+++ b/usr/src/lib/libc/port/stdio/cuserid.c
@@ -24,14 +24,14 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma weak cuserid = _cuserid
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#pragma weak _cuserid = cuserid
 
-#include "synonyms.h"
+#include "lint.h"
 #include <stdio.h>
 #include <pwd.h>
 #include <string.h>
diff --git a/usr/src/lib/libc/port/stdio/data.c b/usr/src/lib/libc/port/stdio/data.c
index a4da2c23e3..42293e2a75 100644
--- a/usr/src/lib/libc/port/stdio/data.c
+++ b/usr/src/lib/libc/port/stdio/data.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,20 +18,20 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak _iob = __iob
+#pragma weak __iob = _iob
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mbstatet.h"
 #include "mtlib.h"
 #include "file64.h"
diff --git a/usr/src/lib/libc/port/stdio/doscan.c b/usr/src/lib/libc/port/stdio/doscan.c
index 961afe65c8..1f473a608d 100644
--- a/usr/src/lib/libc/port/stdio/doscan.c
+++ b/usr/src/lib/libc/port/stdio/doscan.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,18 +18,18 @@
  *
  * CDDL HEADER END
  */
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
-
 
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
+/*	Copyright (c) 1988 AT&T	*/
+/*	  All Rights Reserved  	*/
+
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include "mtlib.h"
 #include "file64.h"
@@ -738,7 +737,7 @@ number(int *chcount, int *flag_eof, int stow, int type, int len, int size,
 		if ((type != 'i' && type != 'x') || (len <= 1))
 			break;
 		if (((inchar = locgetc((*chcount))) == 'x') ||
-			(inchar == 'X')) {
+		    (inchar == 'X')) {
 			lookahead = readchar(iop, chcount);
 			if (isxdigit(lookahead)) {
 				base = 16;
@@ -765,12 +764,12 @@ number(int *chcount, int *flag_eof, int stow, int type, int len, int size,
 	}
 	for (; --len  >= 0; *np++ = (char)c, c = locgetc((*chcount))) {
 		if (np > numbuf + 62) {
-		    errno = ERANGE;
-		    return (0);
+			errno = ERANGE;
+			return (0);
 		}
 		if (isdigit(c) || base == 16 && isxdigit(c)) {
 			int digit = c - (isdigit(c) ? '0' :
-				isupper(c) ? 'A' - 10 : 'a' - 10);
+			    isupper(c) ? 'A' - 10 : 'a' - 10);
 			if (digit >= base)
 				break;
 			if (stow)
@@ -804,7 +803,7 @@ number(int *chcount, int *flag_eof, int stow, int type, int len, int size,
 		}
 	}
 	if (locungetc((*chcount), c) == EOF)
-	    *flag_eof = 1;
+		*flag_eof = 1;
 	return (digitseen); /* successful match if non-zero */
 }
 
@@ -842,11 +841,11 @@ string(int *chcount, int *flag_eof, int stow, int type, int len, char *tab,
 		len = 1;
 #ifdef	_WIDE
 	while ((ch = locgetc((*chcount))) != EOF &&
-		!(((type == 's') || (type == 'S')) && isspace(ch))) {
+	    !(((type == 's') || (type == 'S')) && isspace(ch))) {
 #else  /* _WIDE */
 	while ((ch = locgetc((*chcount))) != EOF &&
-		!(((type == 's') || (type == 'S')) &&
-			isspace(ch) || type == '[' && tab[ch])) {
+	    !(((type == 's') || (type == 'S')) &&
+	    isspace(ch) || type == '[' && tab[ch])) {
 #endif /* _WIDE */
 		if (stow)
 			*ptr = (char)ch;
@@ -973,7 +972,7 @@ wstring(int *chcount, int *flag_eof, int stow, int type,
 	if ((type == 'c') && len == MAXINT)
 		len = 1;
 	while (((wch = _wd_getwc(chcount, iop)) != WEOF) &&
-		!(type == 's' && iswspace(wch))) {
+	    !(type == 's' && iswspace(wch))) {
 		if (stow)
 			*ptr = wch;
 		ptr++;
@@ -1007,7 +1006,7 @@ wstring(int *chcount, int *flag_eof, int stow, int type, int len, FILE *iop,
 	if ((type == 'c') && len == MAXINT)
 		len = 1;
 	while (((wch = _bi_getwc(iop)) != EOF) &&
-		!(type == 's' && (isascii(wch) ? isspace(wch) : 0))) {
+	    !(type == 's' && (isascii(wch) ? isspace(wch) : 0))) {
 		(*chcount) += _scrwidth((wchar_t)wch);
 		if (stow)
 			*ptr = wch;
@@ -1047,7 +1046,7 @@ _wd_getwc(int *chcount, FILE *iop)
 		if (*iop->_ptr == '\0')
 			return (WEOF);
 		len = mbtowc((wchar_t *)&wc, (const char *)iop->_ptr,
-								MB_CUR_MAX);
+		    MB_CUR_MAX);
 		if (len == -1)
 			return (WEOF);
 		iop->_ptr += len;
@@ -1094,7 +1093,7 @@ _watoi(wchar_t *fmt)
 	if ((ch >= 0) && (ch < 256) && isdigit((int)ch)) {
 		n = ch - '0';
 		while (((ch = *++fmt) >= 0) && (ch < 256) &&
-				isdigit((int)ch)) {
+		    isdigit((int)ch)) {
 			n *= 10;
 			n += ch - '0';
 		}
@@ -1129,7 +1128,7 @@ wbrstring(int *chcount, int *flag_eof, int stow, int type,
 		}
 		str[i] = '\0';
 		if (fnmatch((const char *)brstr, (const char *)str,
-			FNM_NOESCAPE)) {
+		    FNM_NOESCAPE)) {
 			break;
 		} else {
 			if (len > 0) {
@@ -1188,7 +1187,7 @@ brstring(int *chcount, int *flag_eof, int stow, int type,
 		}
 		str[i] = '\0';
 		if (fnmatch((const char *)brstr, (const char *)str,
-			FNM_NOESCAPE)) {
+		    FNM_NOESCAPE)) {
 			break;
 		} else {
 			if (len >= i) {
diff --git a/usr/src/lib/libc/port/stdio/fdopen.c b/usr/src/lib/libc/port/stdio/fdopen.c
index 4865ec9a39..f07d8b0a88 100644
--- a/usr/src/lib/libc/port/stdio/fdopen.c
+++ b/usr/src/lib/libc/port/stdio/fdopen.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -37,9 +37,9 @@
 
 #define	_LARGEFILE64_SOURCE 1
 
-#pragma weak fdopen = _fdopen
+#pragma weak _fdopen = fdopen
 
-#include "synonyms.h"
+#include "lint.h"
 #include <mtlib.h>
 #include "file64.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/feof.c b/usr/src/lib/libc/port/stdio/feof.c
index dab0610326..3d4f3c8e1f 100644
--- a/usr/src/lib/libc/port/stdio/feof.c
+++ b/usr/src/lib/libc/port/stdio/feof.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.
@@ -21,16 +20,16 @@
  */
 
 /*
- * Copyright 2006 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#include "synonyms.h"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include "lint.h"
 #include <mtlib.h>
 #include "file64.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/ferror.c b/usr/src/lib/libc/port/stdio/ferror.c
index 3ee8b6f865..49312b4ce6 100644
--- a/usr/src/lib/libc/port/stdio/ferror.c
+++ b/usr/src/lib/libc/port/stdio/ferror.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.
@@ -21,16 +20,16 @@
  */
 
 /*
- * Copyright 2006 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#include "synonyms.h"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/fgetc.c b/usr/src/lib/libc/port/stdio/fgetc.c
index 36a6851758..4c368459cf 100644
--- a/usr/src/lib/libc/port/stdio/fgetc.c
+++ b/usr/src/lib/libc/port/stdio/fgetc.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/fgets.c b/usr/src/lib/libc/port/stdio/fgets.c
index 972223d4ff..ea19354d81 100644
--- a/usr/src/lib/libc/port/stdio/fgets.c
+++ b/usr/src/lib/libc/port/stdio/fgets.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fileno.c b/usr/src/lib/libc/port/stdio/fileno.c
index 643ee4cb01..70f64faa89 100644
--- a/usr/src/lib/libc/port/stdio/fileno.c
+++ b/usr/src/lib/libc/port/stdio/fileno.c
@@ -20,18 +20,18 @@
  */
 
 /*
- * Copyright 2006 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#pragma weak fileno = _fileno
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#pragma weak _fileno = fileno
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -41,7 +41,7 @@
 #include "stdiom.h"
 
 int
-_fileno(FILE *iop)
+fileno(FILE *iop)
 {
 	return (GET_FD(iop));
 }
diff --git a/usr/src/lib/libc/port/stdio/flockf.c b/usr/src/lib/libc/port/stdio/flockf.c
index ac9db7ccae..0d31d5649b 100644
--- a/usr/src/lib/libc/port/stdio/flockf.c
+++ b/usr/src/lib/libc/port/stdio/flockf.c
@@ -29,15 +29,8 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak flockfile = _flockfile
-#pragma weak ftrylockfile = _ftrylockfile
-#pragma weak funlockfile = _funlockfile
-
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
-
-#define	_iob	__iob
-
 #include "file64.h"
 #include <stdio.h>
 #include <thread.h>
@@ -47,6 +40,8 @@
 #include <stdio_ext.h>
 #include "stdiom.h"
 
+#define	_iob	__iob
+
 /*
  * _flockget and _flockrel are only called by the
  * FLOCKFILE/FUNLOCKFILE macros in mtlib.h.
@@ -82,7 +77,7 @@ flockfile(FILE *iop)
 	rmutex_t *rl = IOB_LCK(iop);
 
 	if (rl != NULL)
-		mutex_lock(rl);
+		(void) mutex_lock(rl);
 }
 
 void
@@ -91,7 +86,7 @@ funlockfile(FILE *iop)
 	rmutex_t *rl = IOB_LCK(iop);
 
 	if (rl != NULL)
-		mutex_unlock(rl);
+		(void) mutex_unlock(rl);
 }
 
 int
diff --git a/usr/src/lib/libc/port/stdio/flush.c b/usr/src/lib/libc/port/stdio/flush.c
index 9d87b8c4fd..fb8d058e4c 100644
--- a/usr/src/lib/libc/port/stdio/flush.c
+++ b/usr/src/lib/libc/port/stdio/flush.c
@@ -24,18 +24,14 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include "file64.h"
-
-#define	_iob	__iob
-
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -50,6 +46,8 @@
 #include <errno.h>
 #include <fcntl.h>
 
+#define	_iob	__iob
+
 #undef end
 
 #define	FILE_ARY_SZ	8 /* a nice size for FILE array & end_buffer_ptrs */
@@ -365,14 +363,16 @@ rescan:
 #ifdef	_LP64
 	fp = hdr->iobp;
 	for (i = 0; i < FILE_ARY_SZ; i++)
-		mutex_init(&fp[i]._lock, USYNC_THREAD | LOCK_RECURSIVE, NULL);
+		(void) mutex_init(&fp[i]._lock,
+		    USYNC_THREAD | LOCK_RECURSIVE, NULL);
 #else
 	xfp = hdr->iobp;
 	fp = &xfp->_iob;
 
 	for (i = 0; i < FILE_ARY_SZ; i++) {
 		xfp[i].xmagic = XMAGIC(&xfp[i]);
-		mutex_init(&xfp[i].xlock, USYNC_THREAD | LOCK_RECURSIVE, NULL);
+		(void) mutex_init(&xfp[i].xlock,
+		    USYNC_THREAD | LOCK_RECURSIVE, NULL);
 	}
 #endif	/*	_LP64	*/
 
diff --git a/usr/src/lib/libc/port/stdio/fopen.c b/usr/src/lib/libc/port/stdio/fopen.c
index 4881cef27d..eea8093aca 100644
--- a/usr/src/lib/libc/port/stdio/fopen.c
+++ b/usr/src/lib/libc/port/stdio/fopen.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.
@@ -21,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -40,7 +39,7 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fpos.c b/usr/src/lib/libc/port/stdio/fpos.c
index d2395fc801..8fb2b87e74 100644
--- a/usr/src/lib/libc/port/stdio/fpos.c
+++ b/usr/src/lib/libc/port/stdio/fpos.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.
@@ -21,17 +20,16 @@
  */
 
 /*
- * Copyright 2006 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <unistd.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fputc.c b/usr/src/lib/libc/port/stdio/fputc.c
index adb4de9306..d85917d11d 100644
--- a/usr/src/lib/libc/port/stdio/fputc.c
+++ b/usr/src/lib/libc/port/stdio/fputc.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/fputs.c b/usr/src/lib/libc/port/stdio/fputs.c
index e115d4012e..be0f5b4f8f 100644
--- a/usr/src/lib/libc/port/stdio/fputs.c
+++ b/usr/src/lib/libc/port/stdio/fputs.c
@@ -34,7 +34,7 @@
  * Ptr args aren't checked for NULL because the program would be a
  * catastrophic mess anyway.  Better to abort than just to return NULL.
  */
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fread.c b/usr/src/lib/libc/port/stdio/fread.c
index 59d0e44bfe..db58e7bde1 100644
--- a/usr/src/lib/libc/port/stdio/fread.c
+++ b/usr/src/lib/libc/port/stdio/fread.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fseek.c b/usr/src/lib/libc/port/stdio/fseek.c
index b553424de6..55017a6584 100644
--- a/usr/src/lib/libc/port/stdio/fseek.c
+++ b/usr/src/lib/libc/port/stdio/fseek.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,24 +18,24 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Seek for standard library.  Coordinates with buffering.
  */
 
-#pragma weak fseek = _fseek
+#pragma weak _fseek = fseek
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/fseeko.c b/usr/src/lib/libc/port/stdio/fseeko.c
index e0cadc5f3f..b47c7a5313 100644
--- a/usr/src/lib/libc/port/stdio/fseeko.c
+++ b/usr/src/lib/libc/port/stdio/fseeko.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,16 +18,16 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Seek for standard library.  Coordinates with buffering.
@@ -37,11 +36,11 @@
 #include <sys/feature_tests.h>
 
 #if !defined(_LP64)
-#pragma weak fseeko64 = _fseeko64
+#pragma weak _fseeko64 = fseeko64
 #endif
-#pragma weak fseeko = _fseeko
+#pragma weak _fseeko = fseeko
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/ftell.c b/usr/src/lib/libc/port/stdio/ftell.c
index 831ef96cad..45c0b841d6 100644
--- a/usr/src/lib/libc/port/stdio/ftell.c
+++ b/usr/src/lib/libc/port/stdio/ftell.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,24 +18,24 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Return file offset.
  * Coordinates with buffering.
  */
-#pragma weak ftell = _ftell
+#pragma weak _ftell = ftell
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <fcntl.h>
@@ -65,7 +64,7 @@ ftell(FILE *iop)
 	else if (iop->_flag & (_IOWRT | _IORW)) {
 		adjust = 0;
 		if (((iop->_flag & (_IOWRT | _IONBF)) == _IOWRT) &&
-						(iop->_base != 0))
+		    (iop->_base != 0))
 			adjust = iop->_ptr - iop->_base;
 		else if ((iop->_flag & _IORW) && (iop->_base != 0))
 			adjust = (ptrdiff_t)-iop->_cnt;
diff --git a/usr/src/lib/libc/port/stdio/ftello.c b/usr/src/lib/libc/port/stdio/ftello.c
index a7e1dd7400..2eafdf1fef 100644
--- a/usr/src/lib/libc/port/stdio/ftello.c
+++ b/usr/src/lib/libc/port/stdio/ftello.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,16 +18,16 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * Return file offset.
@@ -38,11 +37,11 @@
 #include <sys/feature_tests.h>
 
 #if !defined(_LP64)
-#pragma weak ftello64 = _ftello64
+#pragma weak _ftello64 = ftello64
 #endif
-#pragma weak ftello = _ftello
+#pragma weak _ftello = ftello
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -73,7 +72,7 @@ ftello64(FILE *iop)
 	else if (iop->_flag & (_IOWRT | _IORW)) {
 		adjust = 0;
 		if (((iop->_flag & (_IOWRT | _IONBF)) == _IOWRT) &&
-						(iop->_base != 0))
+		    (iop->_base != 0))
 			adjust = iop->_ptr - iop->_base;
 	} else {
 		errno = EBADF;	/* file descriptor refers to no open file */
diff --git a/usr/src/lib/libc/port/stdio/fwrite.c b/usr/src/lib/libc/port/stdio/fwrite.c
index 6ab340e26d..db5928f9f4 100644
--- a/usr/src/lib/libc/port/stdio/fwrite.c
+++ b/usr/src/lib/libc/port/stdio/fwrite.c
@@ -24,13 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/getc.c b/usr/src/lib/libc/port/stdio/getc.c
index ea757d6bdc..cfcf53f347 100644
--- a/usr/src/lib/libc/port/stdio/getc.c
+++ b/usr/src/lib/libc/port/stdio/getc.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,20 +18,20 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak getc_unlocked = _getc_unlocked
+#pragma weak _getc_unlocked = getc_unlocked
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -43,8 +42,7 @@
 #include "mse.h"
 
 #undef getc
-
-#undef _getc_unlocked
+#undef getc_unlocked
 
 int
 getc(FILE *iop)
@@ -63,7 +61,7 @@ getc(FILE *iop)
 
 
 int
-_getc_unlocked(FILE *iop)
+getc_unlocked(FILE *iop)
 {
 	return ((--iop->_cnt < 0) ? __filbuf(iop) : *iop->_ptr++);
 }
diff --git a/usr/src/lib/libc/port/stdio/getchar.c b/usr/src/lib/libc/port/stdio/getchar.c
index cef4de7ba0..31a32f3842 100644
--- a/usr/src/lib/libc/port/stdio/getchar.c
+++ b/usr/src/lib/libc/port/stdio/getchar.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,24 +18,22 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * A subroutine version of the macro getchar.
  */
 
-#pragma weak getchar_unlocked = _getchar_unlocked
-
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -46,8 +43,7 @@
 #include "stdiom.h"
 
 #undef getchar
-
-#undef _getchar_unlocked
+#undef getchar_unlocked
 
 int
 getchar(void)
@@ -61,9 +57,8 @@ getchar(void)
  * A subroutine version of the macro getchar_unlocked.
  */
 
-
 int
-_getchar_unlocked(void)
+getchar_unlocked(void)
 {
 	FILE *iop = stdin;
 
diff --git a/usr/src/lib/libc/port/stdio/getpass.c b/usr/src/lib/libc/port/stdio/getpass.c
index b67975b751..f59d9134c6 100644
--- a/usr/src/lib/libc/port/stdio/getpass.c
+++ b/usr/src/lib/libc/port/stdio/getpass.c
@@ -18,21 +18,21 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2007 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak getpass = _getpass
-#pragma weak getpassphrase = _getpassphrase
+#pragma weak _getpass = getpass
+#pragma weak _getpassphrase = getpassphrase
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
@@ -98,7 +98,7 @@ __getpass(const char *prompt, int size)
 	(void) fputs(prompt, fi);
 	p = pbuf;
 	while (!intrupt &&
-		(c = GETC(fi)) != '\n' && c != '\r' && c != EOF) {
+	    (c = GETC(fi)) != '\n' && c != '\r' && c != EOF) {
 		if (p < &pbuf[ size ])
 			*p++ = (char)c;
 	}
diff --git a/usr/src/lib/libc/port/stdio/gets.c b/usr/src/lib/libc/port/stdio/gets.c
index 5aacf35465..7e3f1967ec 100644
--- a/usr/src/lib/libc/port/stdio/gets.c
+++ b/usr/src/lib/libc/port/stdio/gets.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/getw.c b/usr/src/lib/libc/port/stdio/getw.c
index ab3f20574d..cca7732a00 100644
--- a/usr/src/lib/libc/port/stdio/getw.c
+++ b/usr/src/lib/libc/port/stdio/getw.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,16 +18,16 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * The intent here is to provide a means to make the order of
@@ -36,9 +35,9 @@
  * in the memory while doing the io a `word' at a time.
  */
 
-#pragma weak getw = _getw
+#pragma weak _getw = getw
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/mse.c b/usr/src/lib/libc/port/stdio/mse.c
index bf3c823640..4d5ee6874a 100644
--- a/usr/src/lib/libc/port/stdio/mse.c
+++ b/usr/src/lib/libc/port/stdio/mse.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,14 +18,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 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"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include "mbstatet.h"
 #include "file64.h"
@@ -137,7 +137,7 @@ _get_internal_mbstate(int item)
 	lmutex_lock(&__top_mbstates_lock);
 	if (__top_mbstates == NULL) {
 		__top_mbstates =
-			lmalloc((_MAX_MB_FUNC + 1) * sizeof (mbstate_t *));
+		    lmalloc((_MAX_MB_FUNC + 1) * sizeof (mbstate_t *));
 		if (__top_mbstates == NULL) {
 			lmutex_unlock(&__top_mbstates_lock);
 			return (NULL);
@@ -203,8 +203,7 @@ __mbst_get_consumed_array(const mbstate_t *ps, char *str,
 		/* The max size of __consumed[] is 8 */
 		return (-1);
 	}
-	(void) memcpy((void *)str, (const void *)&ps->__consumed[index],
-		len);
+	(void) memcpy((void *)str, (const void *)&ps->__consumed[index], len);
 	return (0);
 }
 
@@ -217,8 +216,7 @@ __mbst_set_consumed_array(mbstate_t *ps, const char *str,
 		/* The max size of __consumed[] is 8 */
 		return (-1);
 	}
-	(void) memcpy((void *)&ps->__consumed[index], (const void *)str,
-		len);
+	(void) memcpy((void *)&ps->__consumed[index], (const void *)str, len);
 	return (0);
 }
 
diff --git a/usr/src/lib/libc/port/stdio/popen.c b/usr/src/lib/libc/port/stdio/popen.c
index 899e19d05b..9ceb9cc42a 100644
--- a/usr/src/lib/libc/port/stdio/popen.c
+++ b/usr/src/lib/libc/port/stdio/popen.c
@@ -29,10 +29,10 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak pclose = _pclose
-#pragma weak popen = _popen
+#pragma weak _pclose = pclose
+#pragma weak _popen = popen
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include "file64.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/putc.c b/usr/src/lib/libc/port/stdio/putc.c
index 2770af552c..05383201a3 100644
--- a/usr/src/lib/libc/port/stdio/putc.c
+++ b/usr/src/lib/libc/port/stdio/putc.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,20 +18,20 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak putc_unlocked = _putc_unlocked
+#pragma weak _putc_unlocked = putc_unlocked
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
@@ -43,7 +42,6 @@
 #include "mse.h"
 
 #undef putc
-
 #undef putc_unlocked
 
 int
@@ -68,7 +66,7 @@ putc(int ch, FILE *iop)
 
 
 int
-_putc_unlocked(int ch, FILE *iop)
+putc_unlocked(int ch, FILE *iop)
 {
 	if (--iop->_cnt < 0)
 		return (__flsbuf((unsigned char) ch, iop));
diff --git a/usr/src/lib/libc/port/stdio/putchar.c b/usr/src/lib/libc/port/stdio/putchar.c
index 5cef46dc80..fce981d014 100644
--- a/usr/src/lib/libc/port/stdio/putchar.c
+++ b/usr/src/lib/libc/port/stdio/putchar.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,24 +18,22 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * A subroutine version of the macro putchar
  */
 
-#pragma weak putchar_unlocked = _putchar_unlocked
-
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <stdio.h>
 #include <thread.h>
@@ -55,14 +52,14 @@ putchar(ch)
 	return (putc(ch, iop));
 }
 
-#undef _putchar_unlocked
+#undef putchar_unlocked
 
 /*
  * A subroutine version of the macro putchar_unlocked
  */
 
 int
-_putchar_unlocked(ch)
+putchar_unlocked(ch)
 	int ch;
 {
 	FILE *iop = stdout;
diff --git a/usr/src/lib/libc/port/stdio/puts.c b/usr/src/lib/libc/port/stdio/puts.c
index 213dc93f5f..84279dcb1d 100644
--- a/usr/src/lib/libc/port/stdio/puts.c
+++ b/usr/src/lib/libc/port/stdio/puts.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/putw.c b/usr/src/lib/libc/port/stdio/putw.c
index 8cad40a887..043125e113 100644
--- a/usr/src/lib/libc/port/stdio/putw.c
+++ b/usr/src/lib/libc/port/stdio/putw.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,16 +18,16 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  * The intent here is to provide a means to make the order of
@@ -36,9 +35,9 @@
  * in the memory while doing the io a `word' at a time.
  */
 
-#pragma weak putw = _putw
+#pragma weak _putw = putw
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/rewind.c b/usr/src/lib/libc/port/stdio/rewind.c
index 06cc555790..57e4cc2540 100644
--- a/usr/src/lib/libc/port/stdio/rewind.c
+++ b/usr/src/lib/libc/port/stdio/rewind.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/scanf.c b/usr/src/lib/libc/port/stdio/scanf.c
index d5b769e0e2..31c8d09f5e 100644
--- a/usr/src/lib/libc/port/stdio/scanf.c
+++ b/usr/src/lib/libc/port/stdio/scanf.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/setbuf.c b/usr/src/lib/libc/port/stdio/setbuf.c
index efd2bea743..78c4c8cc76 100644
--- a/usr/src/lib/libc/port/stdio/setbuf.c
+++ b/usr/src/lib/libc/port/stdio/setbuf.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -29,8 +29,7 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/setbuffer.c b/usr/src/lib/libc/port/stdio/setbuffer.c
index 97a4dcc69d..4f3ef505cd 100644
--- a/usr/src/lib/libc/port/stdio/setbuffer.c
+++ b/usr/src/lib/libc/port/stdio/setbuffer.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.
  */
 
@@ -30,7 +30,7 @@
  * Compatibility wrappers for setbuffer and setlinebuf
  */
 
-#include "synonyms.h"
+#include "lint.h"
 #include <sys/types.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/usr/src/lib/libc/port/stdio/setvbuf.c b/usr/src/lib/libc/port/stdio/setvbuf.c
index 40a075637f..a6e63e09f7 100644
--- a/usr/src/lib/libc/port/stdio/setvbuf.c
+++ b/usr/src/lib/libc/port/stdio/setvbuf.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -29,8 +29,7 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/system.c b/usr/src/lib/libc/port/stdio/system.c
index cef2648ced..d27a194095 100644
--- a/usr/src/lib/libc/port/stdio/system.c
+++ b/usr/src/lib/libc/port/stdio/system.c
@@ -24,12 +24,12 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
-#include "synonyms.h"
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+
+#include "lint.h"
 #include "mtlib.h"
 #include <sys/types.h>
 #include <sys/wait.h>
diff --git a/usr/src/lib/libc/port/stdio/tempnam.c b/usr/src/lib/libc/port/stdio/tempnam.c
index e3dfdf9cc1..a2d4c42cc9 100644
--- a/usr/src/lib/libc/port/stdio/tempnam.c
+++ b/usr/src/lib/libc/port/stdio/tempnam.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,20 +18,20 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak tempnam = _tempnam
+#pragma weak _tempnam = tempnam
 
-#include "synonyms.h"
+#include "lint.h"
 #include <mtlib.h>
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/tmpfile.c b/usr/src/lib/libc/port/stdio/tmpfile.c
index 723b15011c..884a7a369a 100644
--- a/usr/src/lib/libc/port/stdio/tmpfile.c
+++ b/usr/src/lib/libc/port/stdio/tmpfile.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,16 +18,16 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
 /*
  *	tmpfile - return a pointer to an update file that can be
@@ -36,7 +35,7 @@
  *		go away if the program using it terminates.
  */
 
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include <sys/types.h>
 #include <unistd.h>
diff --git a/usr/src/lib/libc/port/stdio/tmpnam_r.c b/usr/src/lib/libc/port/stdio/tmpnam_r.c
index 5c2e6f3ab9..003235c6a7 100644
--- a/usr/src/lib/libc/port/stdio/tmpnam_r.c
+++ b/usr/src/lib/libc/port/stdio/tmpnam_r.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,21 +18,18 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 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"
-
 /*	Copyright (c) 1988 AT&T */
 /*	  All Rights Reserved	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#pragma weak tmpnam = _tmpnam
-#pragma weak tmpnam_r = _tmpnam_r
-
-#include "synonyms.h"
+#include "lint.h"
 #include "mtlib.h"
 #include <sys/types.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/ungetc.c b/usr/src/lib/libc/port/stdio/ungetc.c
index dfa831e977..8fb8fa40e9 100644
--- a/usr/src/lib/libc/port/stdio/ungetc.c
+++ b/usr/src/lib/libc/port/stdio/ungetc.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,18 +18,18 @@
  *
  * 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"
-
 /*	Copyright (c) 1988 AT&T	*/
 /*	  All Rights Reserved  	*/
 
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <sys/types.h>
diff --git a/usr/src/lib/libc/port/stdio/vscanf.c b/usr/src/lib/libc/port/stdio/vscanf.c
index 1ca2e8db2d..c41093ee7a 100644
--- a/usr/src/lib/libc/port/stdio/vscanf.c
+++ b/usr/src/lib/libc/port/stdio/vscanf.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -29,14 +29,13 @@
 
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 
-
 #ifndef _C89_INTMAX32
-#pragma weak vscanf = _vscanf
-#pragma weak vfscanf = _vfscanf
-#pragma weak vsscanf = _vsscanf
+#pragma weak _vscanf = vscanf
+#pragma weak _vfscanf = vfscanf
+#pragma weak _vsscanf = vsscanf
 #endif
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include "mtlib.h"
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/vwscanf.c b/usr/src/lib/libc/port/stdio/vwscanf.c
index 684163a496..7448e6ffad 100644
--- a/usr/src/lib/libc/port/stdio/vwscanf.c
+++ b/usr/src/lib/libc/port/stdio/vwscanf.c
@@ -20,13 +20,13 @@
  */
 
 /*
- * Copyright 2006 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"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <mtlib.h>
 #include <stdio.h>
diff --git a/usr/src/lib/libc/port/stdio/wscanf.c b/usr/src/lib/libc/port/stdio/wscanf.c
index 5b42ec9d51..a1c0873bce 100644
--- a/usr/src/lib/libc/port/stdio/wscanf.c
+++ b/usr/src/lib/libc/port/stdio/wscanf.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,14 +18,15 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2005 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"
 
-#include "synonyms.h"
+#include "lint.h"
 #include "file64.h"
 #include <mtlib.h>
 #include <stdio.h>