diff options
Diffstat (limited to 'usr/src/lib/libc/port/gen')
239 files changed, 1749 insertions, 2043 deletions
diff --git a/usr/src/lib/libc/port/gen/_ftoll.c b/usr/src/lib/libc/port/gen/_ftoll.c index 66c6a217f0..857a52b8a1 100644 --- a/usr/src/lib/libc/port/gen/_ftoll.c +++ b/usr/src/lib/libc/port/gen/_ftoll.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 <sys/isa_defs.h> #include <floatingpoint.h> #include <limits.h> @@ -104,7 +104,7 @@ __dtoll(double dval) default: if (exp > 30) { m1 = (m0 << (exp - 30)) | - (m1 >> (62 - exp)) & ~(-1 << (exp - 30)); + (m1 >> (62 - exp)) & ~(-1 << (exp - 30)); m0 >>= 62 - exp; } else { m1 = m0 >> (30 - exp); @@ -275,7 +275,7 @@ _Q_qtoll(long double longdbl) default: if (exp > 30) { m1 = (m0 << (exp - 30)) | - (m1 >> (62 - exp)) & ~(-1 << (exp - 30)); + (m1 >> (62 - exp)) & ~(-1 << (exp - 30)); m0 >>= 62 - exp; } else { m1 = m0 >> (30 - exp); diff --git a/usr/src/lib/libc/port/gen/_ftoull.c b/usr/src/lib/libc/port/gen/_ftoull.c index a4ba2d15ec..6388c2a8da 100644 --- a/usr/src/lib/libc/port/gen/_ftoull.c +++ b/usr/src/lib/libc/port/gen/_ftoull.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 <sys/isa_defs.h> #include <floatingpoint.h> #include <limits.h> diff --git a/usr/src/lib/libc/port/gen/_libc_gettext.h b/usr/src/lib/libc/port/gen/_libc_gettext.h index b64d29b24a..b73bc6e95c 100644 --- a/usr/src/lib/libc/port/gen/_libc_gettext.h +++ b/usr/src/lib/libc/port/gen/_libc_gettext.h @@ -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,17 +18,24 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1990 by Sun Microsystems, Inc. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#ident "%Z%%M% %I% %E% SMI" +#ifndef _LIBC_GETTEXT_H +#define _LIBC_GETTEXT_H + +#pragma ident "%Z%%M% %I% %E% SMI" + +#include <libintl.h> /* Header file for _libc_gettext() macro. */ #if !defined(TEXT_DOMAIN) /* Should be defined thru -D flag. */ -# define TEXT_DOMAIN "SYS_TEST" +#define TEXT_DOMAIN "SYS_TEST" #endif -char * _dgettext(const char *, const char *); -#define _libc_gettext(msg_id) _dgettext(TEXT_DOMAIN, msg_id) +#define _libc_gettext(msg_id) dgettext(TEXT_DOMAIN, msg_id) +#endif /* _LIBC_GETTEXT_H */ diff --git a/usr/src/lib/libc/port/gen/_xftw.c b/usr/src/lib/libc/port/gen/_xftw.c index 09e4d0017b..c30d19fac0 100644 --- a/usr/src/lib/libc/port/gen/_xftw.c +++ b/usr/src/lib/libc/port/gen/_xftw.c @@ -18,16 +18,16 @@ * * 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" /* * _xftw - file tree walk the uses expanded stat structure @@ -93,31 +93,6 @@ #undef _STYPES #endif -#include <sys/feature_tests.h> - -#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#define fstatat64 _fstatat64 -#define lstat64 _lstat64 -#define openat64 _openat64 -#define readdir64 _readdir64 -#define stat64 _stat64 -#else -#define fstatat _fstatat -#define lstat _lstat -#define openat _openat -#define readdir _readdir -#define stat _stat -#endif /* !_LP64 && _FILE_OFFSET_BITS == 64 */ - -#define close _close -#define closedir _closedir -#define fdopendir _fdopendir -#define opendir _opendir -#define seekdir _seekdir -#define strdup _strdup -#define strtok_r _strtok_r -#define telldir _telldir - #include "lint.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/usr/src/lib/libc/port/gen/a64l.c b/usr/src/lib/libc/port/gen/a64l.c index d645089ecb..40c4a9eb46 100644 --- a/usr/src/lib/libc/port/gen/a64l.c +++ b/usr/src/lib/libc/port/gen/a64l.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,23 @@ * * 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" /* * convert base 64 ascii to long int * char set is [./0-9A-Za-z] * */ -#pragma weak a64l = _a64l -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/abort.c b/usr/src/lib/libc/port/gen/abort.c index 0d0ef4a8e3..9d1518a458 100644 --- a/usr/src/lib/libc/port/gen/abort.c +++ b/usr/src/lib/libc/port/gen/abort.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 <signal.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/addsev.c b/usr/src/lib/libc/port/gen/addsev.c index 0c3be15d20..2e47ff7a66 100644 --- a/usr/src/lib/libc/port/gen/addsev.c +++ b/usr/src/lib/libc/port/gen/addsev.c @@ -18,19 +18,20 @@ * * 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 weak addsev = _addsev +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _addsev = addsev -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include "libc.h" #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/assert.c b/usr/src/lib/libc/port/gen/assert.c index 0e915cdd98..968a4e6b6f 100644 --- a/usr/src/lib/libc/port/gen/assert.c +++ b/usr/src/lib/libc/port/gen/assert.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,21 @@ * * 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 _assert = __assert -#pragma weak _assert_c99 = __assert_c99 +#pragma weak __assert = _assert +#pragma weak __assert_c99 = _assert_c99 -#include "synonyms.h" +#include "lint.h" #include "_libc_gettext.h" #include <string.h> #include <stdlib.h> @@ -50,7 +49,6 @@ _assert(const char *assertion, const char *filename, int line_num) { char buf[512]; - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), _libc_gettext("Assertion failed: %s, file %s, line %d\n"), assertion, filename, line_num); @@ -70,7 +68,6 @@ _assert_c99(const char *assertion, const char *filename, int line_num, { char buf[512]; - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), _libc_gettext("Assertion failed: %s, file %s, line %d, \ function %s\n"), diff --git a/usr/src/lib/libc/port/gen/atexit.c b/usr/src/lib/libc/port/gen/atexit.c index 560e5852e7..a355553303 100644 --- a/usr/src/lib/libc/port/gen/atexit.c +++ b/usr/src/lib/libc/port/gen/atexit.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 atexit = _atexit +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _atexit = atexit -#include "synonyms.h" +#include "lint.h" #include "thr_uberdata.h" #include "libc_int.h" #include "atexit.h" @@ -95,7 +95,7 @@ atexit_unlocks() * Be careful about dereferencing self->ul_uberdata->atexit_root. */ int -_atexit(void (*func)(void)) +atexit(void (*func)(void)) { ulwp_t *self; atexit_root_t *arp; diff --git a/usr/src/lib/libc/port/gen/atfork.c b/usr/src/lib/libc/port/gen/atfork.c index 62ed20dce3..dd2c763df9 100644 --- a/usr/src/lib/libc/port/gen/atfork.c +++ b/usr/src/lib/libc/port/gen/atfork.c @@ -45,9 +45,8 @@ * handlers installed by a library are deleted when that library * is unloaded (see _preexec_atfork_unload() in atexit.c). */ -#pragma weak pthread_atfork = _pthread_atfork int -_pthread_atfork(void (*prepare)(void), +pthread_atfork(void (*prepare)(void), void (*parent)(void), void (*child)(void)) { ulwp_t *self = curthread; diff --git a/usr/src/lib/libc/port/gen/atoi.c b/usr/src/lib/libc/port/gen/atoi.c index b51a0abf5e..16ffa1256d 100644 --- a/usr/src/lib/libc/port/gen/atoi.c +++ b/usr/src/lib/libc/port/gen/atoi.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 <ctype.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/atol.c b/usr/src/lib/libc/port/gen/atol.c index 3c1ca0a99c..e9f6aae49c 100644 --- a/usr/src/lib/libc/port/gen/atol.c +++ b/usr/src/lib/libc/port/gen/atol.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 <ctype.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/atoll.c b/usr/src/lib/libc/port/gen/atoll.c index fb73cd40a0..7d2539d745 100644 --- a/usr/src/lib/libc/port/gen/atoll.c +++ b/usr/src/lib/libc/port/gen/atoll.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 atoll = _atoll - -#include "synonyms.h" +#include "lint.h" #include <ctype.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/attrat.c b/usr/src/lib/libc/port/gen/attrat.c index 547faa5e84..eab90989ef 100644 --- a/usr/src/lib/libc/port/gen/attrat.c +++ b/usr/src/lib/libc/port/gen/attrat.c @@ -25,7 +25,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <stdlib.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/attropen.c b/usr/src/lib/libc/port/gen/attropen.c index 93ad3d1c46..46a6111dd9 100644 --- a/usr/src/lib/libc/port/gen/attropen.c +++ b/usr/src/lib/libc/port/gen/attropen.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,20 +31,19 @@ */ #if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak attropen64 = _attropen64 +#pragma weak _attropen64 = attropen64 #else -#pragma weak attropen = _attropen +#pragma weak _attropen = attropen #endif -#include "synonyms.h" -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <sys/errno.h> -#include <stdlib.h> -#include <errno.h> -#include <unistd.h> -#include <stdarg.h> +#include "lint.h" +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <stdlib.h> +#include <errno.h> +#include <unistd.h> +#include <stdarg.h> #if !defined(_LP64) && _FILE_OFFSET_BITS == 64 @@ -64,7 +63,7 @@ attropen64(const char *file, const char *attr, int oflag, ...) } if ((attrfd = openat64(fd, attr, oflag | O_XATTR, - va_arg(ap, mode_t))) == -1) { + va_arg(ap, mode_t))) == -1) { saverrno = errno; (void) close(fd); errno = saverrno; @@ -95,7 +94,7 @@ attropen(const char *file, const char *attr, int oflag, ...) } if ((attrfd = openat(fd, attr, oflag | O_XATTR, - va_arg(ap, mode_t))) == -1) { + va_arg(ap, mode_t))) == -1) { saverrno = errno; (void) close(fd); errno = saverrno; diff --git a/usr/src/lib/libc/port/gen/basename.c b/usr/src/lib/libc/port/gen/basename.c index 00b2442253..80257d2e19 100644 --- a/usr/src/lib/libc/port/gen/basename.c +++ b/usr/src/lib/libc/port/gen/basename.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,28 +18,28 @@ * * 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 pointer to the last element of a pathname. */ -#pragma weak basename = _basename -#include "synonyms.h" +#pragma weak _basename = basename + +#include "lint.h" #include <libgen.h> #include <string.h> #include <sys/types.h> - char * basename(char *s) { diff --git a/usr/src/lib/libc/port/gen/calloc.c b/usr/src/lib/libc/port/gen/calloc.c index b642623d01..e9e4ad8244 100644 --- a/usr/src/lib/libc/port/gen/calloc.c +++ b/usr/src/lib/libc/port/gen/calloc.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 <stdlib.h> #include <string.h> #include <errno.h> @@ -51,8 +50,8 @@ calloc(size_t num, size_t size) /* check for overflow */ if (total / num != size) { - errno = ENOMEM; - return (0); + errno = ENOMEM; + return (0); } } return ((mp = malloc(total)) ? memset(mp, 0, total) : mp); diff --git a/usr/src/lib/libc/port/gen/catgets.c b/usr/src/lib/libc/port/gen/catgets.c index a0bdf7b9fb..d9f5a970e5 100644 --- a/usr/src/lib/libc/port/gen/catgets.c +++ b/usr/src/lib/libc/port/gen/catgets.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,16 +30,16 @@ * catgets.c */ -#pragma weak catgets = _catgets +#pragma weak _catgets = catgets -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <nl_types.h> #include <errno.h> #include "nlspath_checks.h" char * -_catgets(nl_catd catd_st, int set_id, int msg_id, const char *def_str) +catgets(nl_catd catd_st, int set_id, int msg_id, const char *def_str) { int hi, lo, mid; struct _cat_hdr *p; @@ -54,7 +54,7 @@ _catgets(nl_catd catd_st, int set_id, int msg_id, const char *def_str) } if ((catd_st->__content == NULL) && - (catd_st->__size == 0) && (catd_st->__trust == 1)) { + (catd_st->__size == 0) && (catd_st->__trust == 1)) { /* special message catalog descriptor for C locale */ return ((char *)def_str); } else if ((catd_st->__content == NULL) || (catd_st->__size == 0)) { @@ -75,33 +75,33 @@ _catgets(nl_catd catd_st, int set_id, int msg_id, const char *def_str) while (hi >= lo) { mid = (hi + lo) / 2; q = (struct _cat_set_hdr *) - ((uintptr_t)catd - + _CAT_HDR_SIZE - + _CAT_SET_HDR_SIZE * mid); + ((uintptr_t)catd + + _CAT_HDR_SIZE + + _CAT_SET_HDR_SIZE * mid); if (q->__set_no == set_id) { lo = q->__first_msg_hdr; hi = lo + q->__nmsgs - 1; while (hi >= lo) { mid = (hi + lo) / 2; r = (struct _cat_msg_hdr *) - ((uintptr_t)catd - + _CAT_HDR_SIZE - + p->__msg_hdr_offset - + _CAT_MSG_HDR_SIZE * mid); + ((uintptr_t)catd + + _CAT_HDR_SIZE + + p->__msg_hdr_offset + + _CAT_MSG_HDR_SIZE * mid); if (r->__msg_no == msg_id) { char *msg = (char *)catd - + _CAT_HDR_SIZE - + p->__msg_text_offset - + r->__msg_offset; + + _CAT_HDR_SIZE + + p->__msg_text_offset + + r->__msg_offset; if (!catd_st->__trust) { - int errno_save = errno; - char *cmsg = check_format( - def_str, msg, 0); + int errno_save = errno; + char *cmsg = check_format( + def_str, msg, 0); if (cmsg == def_str) { /* security */ return ((char *) - def_str); + def_str); } else { errno = errno_save; return (msg); 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) { diff --git a/usr/src/lib/libc/port/gen/cfgetispeed.c b/usr/src/lib/libc/port/gen/cfgetispeed.c index ec07ea0b36..f75e514dff 100644 --- a/usr/src/lib/libc/port/gen/cfgetispeed.c +++ b/usr/src/lib/libc/port/gen/cfgetispeed.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,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 _cfgetispeed = cfgetispeed -#pragma weak cfgetispeed = _cfgetispeed -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> diff --git a/usr/src/lib/libc/port/gen/cfgetospeed.c b/usr/src/lib/libc/port/gen/cfgetospeed.c index 26b714a4d8..46577a1525 100644 --- a/usr/src/lib/libc/port/gen/cfgetospeed.c +++ b/usr/src/lib/libc/port/gen/cfgetospeed.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,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 _cfgetospeed = cfgetospeed -#pragma weak cfgetospeed = _cfgetospeed -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> @@ -43,6 +43,6 @@ speed_t cfgetospeed(const struct termios *termios_p) { return (termios_p->c_cflag & CBAUDEXT ? - (termios_p->c_cflag & CBAUD) + CBAUD + 1 : - termios_p->c_cflag & CBAUD); + (termios_p->c_cflag & CBAUD) + CBAUD + 1 : + termios_p->c_cflag & CBAUD); } diff --git a/usr/src/lib/libc/port/gen/cfree.c b/usr/src/lib/libc/port/gen/cfree.c index a68e2b4b63..d113695cfb 100644 --- a/usr/src/lib/libc/port/gen/cfree.c +++ b/usr/src/lib/libc/port/gen/cfree.c @@ -20,21 +20,20 @@ */ /* - * 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" /* * cfree - clear memory block */ -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/cfsetispeed.c b/usr/src/lib/libc/port/gen/cfsetispeed.c index 947d83d7b8..3bd1c53d0d 100644 --- a/usr/src/lib/libc/port/gen/cfsetispeed.c +++ b/usr/src/lib/libc/port/gen/cfsetispeed.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,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 _cfsetispeed = cfsetispeed -#pragma weak cfsetispeed = _cfsetispeed -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> diff --git a/usr/src/lib/libc/port/gen/cfsetospeed.c b/usr/src/lib/libc/port/gen/cfsetospeed.c index 5b6905cc78..578bb1f5a3 100644 --- a/usr/src/lib/libc/port/gen/cfsetospeed.c +++ b/usr/src/lib/libc/port/gen/cfsetospeed.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,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 _cfsetospeed = cfsetospeed -#pragma weak cfsetospeed = _cfsetospeed -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> diff --git a/usr/src/lib/libc/port/gen/cftime.c b/usr/src/lib/libc/port/gen/cftime.c index 4e93b560da..f4fa872da8 100644 --- a/usr/src/lib/libc/port/gen/cftime.c +++ b/usr/src/lib/libc/port/gen/cftime.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 (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. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.15 */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + +#pragma ident "%Z%%M% %I% %E% SMI" /* * This routine converts time as follows. The epoch is 0000 Jan 1 @@ -62,10 +61,7 @@ * */ -#pragma weak ascftime = _ascftime -#pragma weak cftime = _cftime - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <stddef.h> #include <time.h> diff --git a/usr/src/lib/libc/port/gen/clock.c b/usr/src/lib/libc/port/gen/clock.c index 06dd1ca289..9ae651e6f9 100644 --- a/usr/src/lib/libc/port/gen/clock.c +++ b/usr/src/lib/libc/port/gen/clock.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 <sys/types.h> #include <sys/times.h> #include <time.h> diff --git a/usr/src/lib/libc/port/gen/closedir.c b/usr/src/lib/libc/port/gen/closedir.c index 780c1f3a84..ef5dbaad65 100644 --- a/usr/src/lib/libc/port/gen/closedir.c +++ b/usr/src/lib/libc/port/gen/closedir.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * closedir -- C library extension routine * @@ -37,9 +37,9 @@ * while holding internal libc locks. */ -#pragma weak closedir = _closedir +#pragma weak _closedir = closedir -#include "synonyms.h" +#include "lint.h" #include <dirent.h> #include <stdlib.h> #include <unistd.h> @@ -51,7 +51,7 @@ closedir(DIR *dirp) private_DIR *pdirp = (private_DIR *)(uintptr_t)dirp; int fd = dirp->dd_fd; - mutex_destroy(&pdirp->dd_lock); + (void) mutex_destroy(&pdirp->dd_lock); lfree(dirp->dd_buf, DIRBUF); lfree(pdirp, sizeof (*pdirp)); return (close(fd)); diff --git a/usr/src/lib/libc/port/gen/closefrom.c b/usr/src/lib/libc/port/gen/closefrom.c index 334a03de5b..315c9599cd 100644 --- a/usr/src/lib/libc/port/gen/closefrom.c +++ b/usr/src/lib/libc/port/gen/closefrom.c @@ -20,16 +20,16 @@ */ /* - * 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" -#pragma weak closefrom = _closefrom -#pragma weak fdwalk = _fdwalk +#pragma weak _closefrom = closefrom +#pragma weak _fdwalk = fdwalk -#include "synonyms.h" +#include "lint.h" #include <ctype.h> #include <stdlib.h> #include <unistd.h> @@ -91,7 +91,7 @@ fdwalk(int (*func)(void *, int), void *cd) */ if (getrlimit(RLIMIT_NOFILE, &rl) == 0) max_fds = (rl.rlim_max == RLIM_INFINITY)? - INT_MAX : rl.rlim_max; + INT_MAX : rl.rlim_max; for (i = 0; i < max_fds; i++) { if (fcntl(i, F_GETFD) < 0) continue; diff --git a/usr/src/lib/libc/port/gen/confstr.c b/usr/src/lib/libc/port/gen/confstr.c index d2837ed2da..5cc2afb7f8 100644 --- a/usr/src/lib/libc/port/gen/confstr.c +++ b/usr/src/lib/libc/port/gen/confstr.c @@ -18,16 +18,17 @@ * * 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" -#pragma weak confstr = _confstr +#pragma weak _confstr = confstr -#include "synonyms.h" +#include "lint.h" #include "xpg6.h" #include <sys/types.h> #include <unistd.h> @@ -101,11 +102,11 @@ confstr(int name, char *buf, size_t length) if (name == _CS_PATH) { if (__xpg6 & _C99SUSv3_XPG6_sysconf_version) - path = "/usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:"\ - "/usr/bin:/opt/SUNWspro/bin"; + path = "/usr/xpg6/bin:/usr/xpg4/bin:/usr/ccs/bin:" + "/usr/bin:/opt/SUNWspro/bin"; else - path = "/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:"\ - "/opt/SUNWspro/bin"; + path = "/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:" + "/opt/SUNWspro/bin"; conf_length = strlen(path) + 1; if (length != 0) { diff --git a/usr/src/lib/libc/port/gen/crypt.c b/usr/src/lib/libc/port/gen/crypt.c index ee77dea287..bfb859867e 100644 --- a/usr/src/lib/libc/port/gen/crypt.c +++ b/usr/src/lib/libc/port/gen/crypt.c @@ -20,17 +20,17 @@ */ /* - * 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" -#pragma weak crypt = _crypt -#pragma weak encrypt = _encrypt -#pragma weak setkey = _setkey +#pragma weak _crypt = crypt +#pragma weak _encrypt = encrypt +#pragma weak _setkey = setkey -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <synch.h> #include <thread.h> @@ -504,7 +504,7 @@ getalgbyname(const char *algname, boolean_t *found) if ((configfd = open(CRYPT_CONFFILE, O_RDONLY)) == -1) { syslog(LOG_ALERT, "crypt: open(%s) failed: %s", - CRYPT_CONFFILE, strerror(errno)); + CRYPT_CONFFILE, strerror(errno)); return (NULL); } @@ -513,7 +513,7 @@ getalgbyname(const char *algname, boolean_t *found) */ if (fstat(configfd, &stb) < 0) { syslog(LOG_ALERT, "crypt: stat(%s) failed: %s", - CRYPT_CONFFILE, strerror(errno)); + CRYPT_CONFFILE, strerror(errno)); goto cleanup; } @@ -536,13 +536,13 @@ getalgbyname(const char *algname, boolean_t *found) } if (stb.st_mode & S_IWOTH) { syslog(LOG_ALERT, - "crypt: %s writable by world", CRYPT_CONFFILE); + "crypt: %s writable by world", CRYPT_CONFFILE); goto cleanup; } if ((fconf = fdopen(configfd, "rF")) == NULL) { syslog(LOG_ALERT, "crypt: fdopen(%d) failed: %s", - configfd, strerror(errno)); + configfd, strerror(errno)); goto cleanup; } @@ -1037,12 +1037,12 @@ unlocked_encrypt(char *block, int fake) preS[j] = R[E[j]-1] ^ *(KS+index+j); for (j = 0; j < 8; j++) { t = 6 * j; - k = S[j][(preS[t+0]<<5)+ - (preS[t+1]<<3)+ - (preS[t+2]<<2)+ - (preS[t+3]<<1)+ - (preS[t+4]<<0)+ - (preS[t+5]<<4)]; + k = S[j][(preS[t+0]<<5) + + (preS[t+1]<<3) + + (preS[t+2]<<2) + + (preS[t+3]<<1) + + (preS[t+4]<<0) + + (preS[t+5]<<4)]; t = 4*j; f[t+0] = (k>>3)&01; f[t+1] = (k>>2)&01; diff --git a/usr/src/lib/libc/port/gen/csetlen.c b/usr/src/lib/libc/port/gen/csetlen.c index 98633f1f16..6f306728b9 100644 --- a/usr/src/lib/libc/port/gen/csetlen.c +++ b/usr/src/lib/libc/port/gen/csetlen.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 <sys/types.h> #include <ctype.h> #include <euc.h> diff --git a/usr/src/lib/libc/port/gen/ctime.c b/usr/src/lib/libc/port/gen/ctime.c index 89f7e18f06..097ef8ee0f 100644 --- a/usr/src/lib/libc/port/gen/ctime.c +++ b/usr/src/lib/libc/port/gen/ctime.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" /* * This routine converts time as follows. @@ -77,9 +76,7 @@ * may also be called explicitly by the user. */ -#pragma weak asctime_r = _asctime_r - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <time.h> @@ -119,7 +116,8 @@ __posix_asctime_r(const struct tm *t, char *cbuf) const char *Month = "JanFebMarAprMayJunJulAugSepOctNovDec"; cp = cbuf; - for (ncp = Date; *cp++ = *ncp++; /* */); + for (ncp = Date; *cp++ = *ncp++; /* */) + ; ncp = Day + (3 * t->tm_wday); cp = cbuf; *cp++ = *ncp++; diff --git a/usr/src/lib/libc/port/gen/ctime_r.c b/usr/src/lib/libc/port/gen/ctime_r.c index 4abcfe29d3..a57558169a 100644 --- a/usr/src/lib/libc/port/gen/ctime_r.c +++ b/usr/src/lib/libc/port/gen/ctime_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,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" /* * This routine converts time as follows. @@ -77,9 +76,7 @@ * may also be called explicitly by the user. */ -#pragma weak ctime_r = _ctime_r - -#include "synonyms.h" +#include "lint.h" #include <time.h> #include <sys/types.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/deflt.c b/usr/src/lib/libc/port/gen/deflt.c index 24cfd281fc..716b3dd79e 100644 --- a/usr/src/lib/libc/port/gen/deflt.c +++ b/usr/src/lib/libc/port/gen/deflt.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,11 +32,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak defopen = _defopen -#pragma weak defread = _defread -#pragma weak defcntl = _defcntl - -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <stdio.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/directio.c b/usr/src/lib/libc/port/gen/directio.c index 3a76c7bb9d..f6ff4f24a6 100644 --- a/usr/src/lib/libc/port/gen/directio.c +++ b/usr/src/lib/libc/port/gen/directio.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,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 <sys/types.h> #include <unistd.h> #include <sys/filio.h> diff --git a/usr/src/lib/libc/port/gen/dirname.c b/usr/src/lib/libc/port/gen/dirname.c index dbfbe11b17..46d695da72 100644 --- a/usr/src/lib/libc/port/gen/dirname.c +++ b/usr/src/lib/libc/port/gen/dirname.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 pointer to the directory name, stripping off the last @@ -36,8 +35,9 @@ * Works similar to /bin/dirname */ -#pragma weak dirname = _dirname -#include "synonyms.h" +#pragma weak _dirname = dirname + +#include "lint.h" #include <sys/types.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/div.c b/usr/src/lib/libc/port/gen/div.c index e45512760d..b2fc79f7ed 100644 --- a/usr/src/lib/libc/port/gen/div.c +++ b/usr/src/lib/libc/port/gen/div.c @@ -1,10 +1,8 @@ /* - * 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) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -41,7 +39,9 @@ * SUCH DAMAGE. */ -#include "synonyms.h" +#pragma ident "%Z%%M% %I% %E% SMI" + +#include "lint.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/drand48.c b/usr/src/lib/libc/port/gen/drand48.c index 7460dec5f7..897a3b65bd 100644 --- a/usr/src/lib/libc/port/gen/drand48.c +++ b/usr/src/lib/libc/port/gen/drand48.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" /* * drand48, etc. pseudo-random number generator @@ -47,17 +46,8 @@ * previously used (32 bit precision) are now using the int32_t * type (32 bit precision in both ILP32 and LP64 worlds). */ -#pragma weak drand48 = _drand48 -#pragma weak erand48 = _erand48 -#pragma weak lrand48 = _lrand48 -#pragma weak mrand48 = _mrand48 -#pragma weak srand48 = _srand48 -#pragma weak seed48 = _seed48 -#pragma weak lcong48 = _lcong48 -#pragma weak nrand48 = _nrand48 -#pragma weak jrand48 = _jrand48 - -#include "synonyms.h" + +#include "lint.h" #include <mtlib.h> #include <synch.h> #include <thread.h> @@ -148,13 +138,13 @@ next(void) ADDEQU(p[1], q[0], carry0); MUL(a[1], x[0], r); x[2] = LOW(carry0 + carry1 + CARRY(p[1], r[0]) + q[1] + r[1] + - a[0] * x[2] + a[1] * x[1] + a[2] * x[0]); + a[0] * x[2] + a[1] * x[1] + a[2] * x[0]); x[1] = LOW(p[1] + r[0]); x[0] = LOW(p[0]); } void -_srand48(long seedval) +srand48(long seedval) { int32_t fixseed = (int32_t)seedval; /* limit to 32 bits */ @@ -187,14 +177,14 @@ NEST(long, _nrand48_u, _lrand48_u) NEST(long, _jrand48_u, _mrand48_u) -EXPORT0(double, _drand48, _drand48_u) -EXPORT1(double, _erand48, _erand48_u) +EXPORT0(double, drand48, _drand48_u) +EXPORT1(double, erand48, _erand48_u) -EXPORT0(long, _lrand48, _lrand48_u) -EXPORT1(long, _nrand48, _nrand48_u) +EXPORT0(long, lrand48, _lrand48_u) +EXPORT1(long, nrand48, _nrand48_u) -EXPORT0(long, _mrand48, _mrand48_u) -EXPORT1(long, _jrand48, _jrand48_u) +EXPORT0(long, mrand48, _mrand48_u) +EXPORT1(long, jrand48, _jrand48_u) #ifdef DRIVER /* diff --git a/usr/src/lib/libc/port/gen/dup2.c b/usr/src/lib/libc/port/gen/dup2.c index eee3a10faa..9708d3afb3 100644 --- a/usr/src/lib/libc/port/gen/dup2.c +++ b/usr/src/lib/libc/port/gen/dup2.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,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 _dup2 = dup2 -#pragma weak dup2 = _dup2 -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <fcntl.h> diff --git a/usr/src/lib/libc/port/gen/ecvt.c b/usr/src/lib/libc/port/gen/ecvt.c index 00e422bf3d..f6f8f37058 100644 --- a/usr/src/lib/libc/port/gen/ecvt.c +++ b/usr/src/lib/libc/port/gen/ecvt.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" /* * ecvt converts to decimal @@ -37,10 +36,11 @@ * sign is set to 0 for positive, 1 for negative * */ -#pragma weak ecvt = _ecvt -#pragma weak fcvt = _fcvt -#include "synonyms.h" +#pragma weak _ecvt = ecvt +#pragma weak _fcvt = fcvt + +#include "lint.h" #include <sys/types.h> #include <values.h> #include <nan.h> diff --git a/usr/src/lib/libc/port/gen/err.c b/usr/src/lib/libc/port/gen/err.c index 3819d4881f..016d5e0b89 100644 --- a/usr/src/lib/libc/port/gen/err.c +++ b/usr/src/lib/libc/port/gen/err.c @@ -26,16 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak err = _err -#pragma weak errx = _errx -#pragma weak verr = _verr -#pragma weak verrx = _verrx -#pragma weak warn = _warn -#pragma weak warnx = _warnx -#pragma weak vwarn = _vwarn -#pragma weak vwarnx = _vwarnx - -#include "synonyms.h" +#include "lint.h" #include "file64.h" #include "mtlib.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/errlist.awk b/usr/src/lib/libc/port/gen/errlist.awk index 5acb2148d7..13c1c8ee21 100644 --- a/usr/src/lib/libc/port/gen/errlist.awk +++ b/usr/src/lib/libc/port/gen/errlist.awk @@ -1,13 +1,9 @@ # -# Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# Use is subject to license terms. -# # 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. @@ -22,6 +18,9 @@ # # CDDL HEADER END # +# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Use is subject to license terms. +# # ident "%Z%%M% %I% %E% SMI" # # Create two files from a list of input strings; @@ -58,8 +57,8 @@ BEGIN { oldfile = "errlst.c" print "#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n" >oldfile - print "#pragma weak sys_errlist = _sys_errlist\n" >oldfile - print "#include \"synonyms.h\"\n" >oldfile + print "#pragma weak _sys_errlist = sys_errlist\n" >oldfile + print "#include \"lint.h\"\n" >oldfile # We need to include the errors strings proper in the # C source for gettext; the macro C allows us to embed # them as comment. @@ -68,7 +67,7 @@ BEGIN { print "const char *sys_errlist[] = {" >oldfile print "#pragma ident\t\"%Z%%M%\t%I%\t%E% SMI\"\n" >newfile - print "#include \"synonyms.h\"" >newfile + print "#include \"lint.h\"" >newfile print "#include <sys/isa_defs.h>\n" >newfile print "#pragma weak __sys_errs = _sys_errs\n" >newfile } diff --git a/usr/src/lib/libc/port/gen/euclen.c b/usr/src/lib/libc/port/gen/euclen.c index 0328c5cffd..57aa49dd7e 100644 --- a/usr/src/lib/libc/port/gen/euclen.c +++ b/usr/src/lib/libc/port/gen/euclen.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,17 @@ * * CDDL HEADER END */ + /* - * Copyright 1996 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" /* Nihon Sun Micro JLE */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" -#include <euc.h> -#include <ctype.h> +#include "lint.h" +#include <euc.h> +#include <ctype.h> /* * euccol(s) returns the screen column width of the EUC char. diff --git a/usr/src/lib/libc/port/gen/event_port.c b/usr/src/lib/libc/port/gen/event_port.c index f4eb057dec..ee8317f21e 100644 --- a/usr/src/lib/libc/port/gen/event_port.c +++ b/usr/src/lib/libc/port/gen/event_port.c @@ -20,21 +20,12 @@ */ /* - * 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" -#pragma weak port_create = _port_create -#pragma weak port_associate = _port_associate -#pragma weak port_dissociate = _port_dissociate -#pragma weak port_send = _port_send -#pragma weak port_sendn = _port_sendn -#pragma weak port_get = _port_get -#pragma weak port_getn = _port_getn -#pragma weak port_alert = _port_alert - #include "lint.h" #include <sys/types.h> #include <sys/stat.h> @@ -57,7 +48,7 @@ * set to 0 and no check will be done in the kernel interface. */ int -_port_create() +port_create() { rval_t r; r.r_vals = _portfs(PORT_CREATE | PORT_SYS_NOPORT, 0, 0, 0, 0, 0); @@ -65,7 +56,7 @@ _port_create() } int -_port_associate(int port, int source, uintptr_t object, int events, void *user) +port_associate(int port, int source, uintptr_t object, int events, void *user) { rval_t r; r.r_vals = _portfs(PORT_ASSOCIATE, port, source, object, events, @@ -75,7 +66,7 @@ _port_associate(int port, int source, uintptr_t object, int events, void *user) int -_port_get(int port, port_event_t *pe, struct timespec *to) +port_get(int port, port_event_t *pe, struct timespec *to) { rval_t r; if (to) @@ -87,7 +78,7 @@ _port_get(int port, port_event_t *pe, struct timespec *to) } int -_port_getn(int port, port_event_t list[], uint_t max, uint_t *nget, +port_getn(int port, port_event_t list[], uint_t max, uint_t *nget, struct timespec *timeout) { rval_t r; @@ -110,7 +101,7 @@ _port_getn(int port, port_event_t list[], uint_t max, uint_t *nget, } int -_port_dissociate(int port, int source, uintptr_t object) +port_dissociate(int port, int source, uintptr_t object) { rval_t r; r.r_vals = _portfs(PORT_DISSOCIATE, port, source, object, 0, 0); @@ -118,7 +109,7 @@ _port_dissociate(int port, int source, uintptr_t object) } int -_port_send(int port, int events, void *user) +port_send(int port, int events, void *user) { rval_t r; r.r_vals = _portfs(PORT_SEND, port, events, (uintptr_t)user, NULL, @@ -146,7 +137,7 @@ _port_dispatch(int port, int flags, int source, int events, uintptr_t object, } int -_port_sendn(int ports[], int errors[], uint_t nent, int events, void *user) +port_sendn(int ports[], int errors[], uint_t nent, int events, void *user) { rval_t r; uint_t offset; @@ -184,7 +175,7 @@ _port_sendn(int ports[], int errors[], uint_t nent, int events, void *user) } int -_port_alert(int port, int flags, int events, void *user) +port_alert(int port, int flags, int events, void *user) { rval_t r; r.r_vals = _portfs(PORT_ALERT, port, flags, events, (uintptr_t)user, diff --git a/usr/src/lib/libc/port/gen/execvp.c b/usr/src/lib/libc/port/gen/execvp.c index 51e198048a..e46308bc1d 100644 --- a/usr/src/lib/libc/port/gen/execvp.c +++ b/usr/src/lib/libc/port/gen/execvp.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,26 @@ * * 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" /* * execlp(name, arg,...,0) (like execl, but does path search) * execvp(name, argv) (like execv, but does path search) */ -#pragma weak execlp = _execlp -#pragma weak execvp = _execvp -#include "synonyms.h" + +#pragma weak _execlp = execlp +#pragma weak _execvp = execvp + +#include "lint.h" #include <sys/types.h> #include <unistd.h> #include <string.h> @@ -137,7 +138,7 @@ execvp(const char *name, char *const *argv) pathstr = "/usr/sbin:/usr/ccs/bin:/usr/bin"; } else { /* XPG4 (CSPATH + /usr/sbin) */ pathstr = "/usr/xpg4/bin:/usr/ccs/bin:/usr/bin:" - "/opt/SUNWspro/bin:/usr/sbin"; + "/opt/SUNWspro/bin:/usr/sbin"; } } else { if (__xpg4 == 0) { /* not XPG4 */ diff --git a/usr/src/lib/libc/port/gen/fattach.c b/usr/src/lib/libc/port/gen/fattach.c index 4c1b497325..a56df22291 100644 --- a/usr/src/lib/libc/port/gen/fattach.c +++ b/usr/src/lib/libc/port/gen/fattach.c @@ -18,23 +18,25 @@ * * 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" /* * Attach a STREAMS or door based file descriptor to an object in the file * system name space. */ -#pragma weak fattach = _fattach -#include "synonyms.h" + +#pragma weak _fattach = fattach + +#include "lint.h" #include <sys/types.h> #include <errno.h> #include <stdio.h> diff --git a/usr/src/lib/libc/port/gen/fdetach.c b/usr/src/lib/libc/port/gen/fdetach.c index b1dba8f528..726803ea83 100644 --- a/usr/src/lib/libc/port/gen/fdetach.c +++ b/usr/src/lib/libc/port/gen/fdetach.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,25 +18,25 @@ * * 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" /* * Detach a STREAMS-based file descriptor from an object in the * file system name space. */ +#pragma weak _fdetach = fdetach -#pragma weak fdetach = _fdetach -#include "synonyms.h" +#include "lint.h" #include <sys/mount.h> int diff --git a/usr/src/lib/libc/port/gen/fdopendir.c b/usr/src/lib/libc/port/gen/fdopendir.c index 344c3af2be..0569b372c6 100644 --- a/usr/src/lib/libc/port/gen/fdopendir.c +++ b/usr/src/lib/libc/port/gen/fdopendir.c @@ -34,10 +34,9 @@ * while holding internal libc locks. */ -#pragma weak fdopendir = _fdopendir -#pragma weak dirfd = _dirfd +#pragma weak _fdopendir = fdopendir -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <dirent.h> #include <sys/stat.h> diff --git a/usr/src/lib/libc/port/gen/fmtmsg.c b/usr/src/lib/libc/port/gen/fmtmsg.c index 50a0fdbabb..08ada435ce 100644 --- a/usr/src/lib/libc/port/gen/fmtmsg.c +++ b/usr/src/lib/libc/port/gen/fmtmsg.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" /* * fmtmsg.c @@ -51,9 +51,10 @@ * <stdlib.h> miscellaneous function declarations */ -#pragma weak fmtmsg = _fmtmsg -#pragma weak addseverity = _addseverity -#include "synonyms.h" +#pragma weak _fmtmsg = fmtmsg +#pragma weak _addseverity = addseverity + +#include "lint.h" #include "mtlib.h" #include "libc.h" #include <sys/types.h> @@ -456,7 +457,7 @@ getauxsevs(char *ptr) */ if (*(tokend = - exttok(current, ":")) == ':') { + exttok(current, ":")) == ':') { *tokend = '\0'; leftoff = tokend + (ptrdiff_t)1; diff --git a/usr/src/lib/libc/port/gen/ftime.c b/usr/src/lib/libc/port/gen/ftime.c index fd124995f1..71012abe25 100644 --- a/usr/src/lib/libc/port/gen/ftime.c +++ b/usr/src/lib/libc/port/gen/ftime.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. */ @@ -39,7 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/timeb.h> diff --git a/usr/src/lib/libc/port/gen/ftok.c b/usr/src/lib/libc/port/gen/ftok.c index fd73a717b9..8eaeadf53f 100644 --- a/usr/src/lib/libc/port/gen/ftok.c +++ b/usr/src/lib/libc/port/gen/ftok.c @@ -18,19 +18,20 @@ * * CDDL HEADER END */ + /* * 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 _ftok = ftok -#pragma weak ftok = _ftok -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/usr/src/lib/libc/port/gen/ftw.c b/usr/src/lib/libc/port/gen/ftw.c index 34eade9780..6b7aee9261 100644 --- a/usr/src/lib/libc/port/gen/ftw.c +++ b/usr/src/lib/libc/port/gen/ftw.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,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 */ -#include <sys/feature_tests.h> +#pragma ident "%Z%%M% %I% %E% SMI" -#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak ftw64 = _ftw64 -#define _ftw _ftw64 -#else -#pragma weak ftw = _ftw -#endif +#include <sys/feature_tests.h> #include "lint.h" #include <mtlib.h> @@ -50,8 +43,18 @@ #include <thread.h> #include <synch.h> +#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#undef ftw +#undef ftw64 +#define ftw ftw64 +#pragma weak _ftw64 = ftw64 +#else +#undef ftw +#pragma weak _ftw = ftw +#endif + int -_ftw(const char *path, int (*fn)(), int depth) +ftw(const char *path, int (*fn)(), int depth) { return (_xftw(_XFTWVER, path, fn, depth)); } diff --git a/usr/src/lib/libc/port/gen/gcvt.c b/usr/src/lib/libc/port/gen/gcvt.c index 81eaa235d4..830884db14 100644 --- a/usr/src/lib/libc/port/gen/gcvt.c +++ b/usr/src/lib/libc/port/gen/gcvt.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" /* * gcvt - Floating output conversion to a pleasant-looking string. */ -#pragma weak gcvt = _gcvt +#pragma weak _gcvt = gcvt -#include "synonyms.h" +#include "lint.h" #include <floatingpoint.h> char * diff --git a/usr/src/lib/libc/port/gen/getauxv.c b/usr/src/lib/libc/port/gen/getauxv.c index 270c21f955..500675719c 100644 --- a/usr/src/lib/libc/port/gen/getauxv.c +++ b/usr/src/lib/libc/port/gen/getauxv.c @@ -20,13 +20,13 @@ */ /* - * 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" -#include "synonyms.h" +#include "lint.h" #include <libc.h> #include <fcntl.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/getcwd.c b/usr/src/lib/libc/port/gen/getcwd.c index aa55033301..d832d798d7 100644 --- a/usr/src/lib/libc/port/gen/getcwd.c +++ b/usr/src/lib/libc/port/gen/getcwd.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,9 +31,9 @@ * On error, a NULL pointer is returned and errno is set. */ -#pragma weak getcwd = _getcwd +#pragma weak _getcwd = getcwd -#include "synonyms.h" +#include "lint.h" #include <sys/syscall.h> #include <sys/types.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/getdate_err.c b/usr/src/lib/libc/port/gen/getdate_err.c index 2a3b33adff..08df100fc7 100644 --- a/usr/src/lib/libc/port/gen/getdate_err.c +++ b/usr/src/lib/libc/port/gen/getdate_err.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,28 +18,30 @@ * * 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" -#pragma weak getdate_err = _getdate_err +#pragma weak _getdate_err = getdate_err -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <time.h> #include <thread.h> #include <libc.h> #include "tsd.h" -int _getdate_err = 0; +#undef getdate_err +int getdate_err = 0; int * _getdate_err_addr(void) { - if (_thr_main()) - return (&_getdate_err); + if (thr_main()) + return (&getdate_err); return ((int *)tsdalloc(_T_GETDATE_ERR_ADDR, sizeof (int), NULL)); } diff --git a/usr/src/lib/libc/port/gen/getdtblsize.c b/usr/src/lib/libc/port/gen/getdtblsize.c index 56958579d2..905d779603 100644 --- a/usr/src/lib/libc/port/gen/getdtblsize.c +++ b/usr/src/lib/libc/port/gen/getdtblsize.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,10 +18,13 @@ * * 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. - * + */ + +/* * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T * All Rights Reserved * @@ -33,7 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/time.h> #include <sys/resource.h> diff --git a/usr/src/lib/libc/port/gen/getenv.c b/usr/src/lib/libc/port/gen/getenv.c index 6329a048d8..f9fb28ef72 100644 --- a/usr/src/lib/libc/port/gen/getenv.c +++ b/usr/src/lib/libc/port/gen/getenv.c @@ -20,23 +20,19 @@ */ /* - * 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 putenv = _putenv -#pragma weak setenv = _setenv -#pragma weak unsetenv = _unsetenv +#pragma weak _putenv = putenv -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> - #include <sys/types.h> #include <thread.h> #include <synch.h> diff --git a/usr/src/lib/libc/port/gen/getexecname.c b/usr/src/lib/libc/port/gen/getexecname.c index 879db6fbd9..51bb81e49b 100644 --- a/usr/src/lib/libc/port/gen/getexecname.c +++ b/usr/src/lib/libc/port/gen/getexecname.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,17 @@ * * 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" -/*LINTLIBRARY*/ - -#pragma weak getexecname = _getexecname -#include "synonyms.h" +#pragma weak _getexecname = getexecname +#include "lint.h" #include <stdlib.h> #include <unistd.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/getgrnam.c b/usr/src/lib/libc/port/gen/getgrnam.c index 5080bd2ac0..1d907976f3 100644 --- a/usr/src/lib/libc/port/gen/getgrnam.c +++ b/usr/src/lib/libc/port/gen/getgrnam.c @@ -18,25 +18,21 @@ * * CDDL HEADER END */ + /* * 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" -/* 3.0 SID # 1.2 */ - -#pragma weak getgrnam = _getgrnam -#pragma weak getgrgid = _getgrgid -#pragma weak getgrent = _getgrent -#pragma weak fgetgrent = _fgetgrent +#pragma weak _getgrnam = getgrnam +#pragma weak _getgrgid = getgrgid -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <grp.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libc/port/gen/getgrnam_r.c b/usr/src/lib/libc/port/gen/getgrnam_r.c index ab41c50bac..52e1b6d0e7 100644 --- a/usr/src/lib/libc/port/gen/getgrnam_r.c +++ b/usr/src/lib/libc/port/gen/getgrnam_r.c @@ -20,21 +20,13 @@ */ /* - * 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" -#pragma weak endgrent = _endgrent -#pragma weak setgrent = _setgrent - -#pragma weak getgrnam_r = _getgrnam_r -#pragma weak getgrgid_r = _getgrgid_r -#pragma weak getgrent_r = _getgrent_r -#pragma weak fgetgrent_r = _fgetgrent_r - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <grp.h> @@ -79,7 +71,7 @@ _uncached_getgrgid_r(gid_t gid, struct group *result, char *buffer, int buflen); * It was implemented by Solaris 2.3. */ struct group * -_getgrnam_r(const char *name, struct group *result, char *buffer, int buflen) +getgrnam_r(const char *name, struct group *result, char *buffer, int buflen) { nss_XbyY_args_t arg; @@ -90,7 +82,7 @@ _getgrnam_r(const char *name, struct group *result, char *buffer, int buflen) NSS_XbyY_INIT(&arg, result, buffer, buflen, str2group); arg.key.name = name; (void) nss_search(&db_root, _nss_initf_group, - NSS_DBOP_GROUP_BYNAME, &arg); + NSS_DBOP_GROUP_BYNAME, &arg); return ((struct group *)NSS_XbyY_FINI(&arg)); } @@ -99,14 +91,14 @@ _getgrnam_r(const char *name, struct group *result, char *buffer, int buflen) * It was implemented by Solaris 2.3. */ struct group * -_getgrgid_r(gid_t gid, struct group *result, char *buffer, int buflen) +getgrgid_r(gid_t gid, struct group *result, char *buffer, int buflen) { nss_XbyY_args_t arg; NSS_XbyY_INIT(&arg, result, buffer, buflen, str2group); arg.key.gid = gid; (void) nss_search(&db_root, _nss_initf_group, - NSS_DBOP_GROUP_BYGID, &arg); + NSS_DBOP_GROUP_BYGID, &arg); return ((struct group *)NSS_XbyY_FINI(&arg)); } @@ -119,7 +111,7 @@ _uncached_getgrgid_r(gid_t gid, struct group *result, char *buffer, NSS_XbyY_INIT(&arg, result, buffer, buflen, str2group); arg.key.gid = gid; (void) nss_search(&db_root, _nss_initf_group, - NSS_DBOP_GROUP_BYGID, &arg); + NSS_DBOP_GROUP_BYGID, &arg); return ((struct group *)NSS_XbyY_FINI(&arg)); } @@ -135,18 +127,14 @@ __posix_getgrgid_r(gid_t gid, struct group *grp, char *buffer, int oerrno = errno; errno = 0; - if ((*result = _getgrgid_r(gid, grp, buffer, (uintptr_t)bufsize)) - == NULL) { + if ((*result = getgrgid_r(gid, grp, buffer, (uintptr_t)bufsize)) + == NULL) { nerrno = errno; } errno = oerrno; return (nerrno); } -extern struct group * -_getgrnam_r(const char *name, struct group *result, char *buffer, - int buflen); - struct group * _uncached_getgrnam_r(const char *name, struct group *result, char *buffer, int buflen) @@ -156,7 +144,7 @@ _uncached_getgrnam_r(const char *name, struct group *result, char *buffer, NSS_XbyY_INIT(&arg, result, buffer, buflen, str2group); arg.key.name = name; (void) nss_search(&db_root, _nss_initf_group, - NSS_DBOP_GROUP_BYNAME, &arg); + NSS_DBOP_GROUP_BYNAME, &arg); return ((struct group *)NSS_XbyY_FINI(&arg)); } @@ -171,8 +159,8 @@ __posix_getgrnam_r(const char *name, struct group *grp, char *buffer, int nerrno = 0; int oerrno = errno; - if ((*result = _getgrnam_r(name, grp, buffer, (uintptr_t)bufsize)) - == NULL) { + if ((*result = getgrnam_r(name, grp, buffer, (uintptr_t)bufsize)) + == NULL) { nerrno = errno; } errno = oerrno; @@ -205,8 +193,8 @@ getgrent_r(struct group *result, char *buffer, int buflen) /* No key to fill in */ (void) nss_getent(&db_root, _nss_initf_group, &context, &arg); } while (arg.returnval != 0 && - (nam = ((struct group *)arg.returnval)->gr_name) != 0 && - (*nam == '+' || *nam == '-')); + (nam = ((struct group *)arg.returnval)->gr_name) != 0 && + (*nam == '+' || *nam == '-')); return ((struct group *)NSS_XbyY_FINI(&arg)); } @@ -289,7 +277,7 @@ _getgroupsbymember(const char *username, gid_t gid_array[], } (void) nss_search(&db_root, _nss_initf_group, - NSS_DBOP_GROUP_BYMEMBER, &arg); + NSS_DBOP_GROUP_BYMEMBER, &arg); return (arg.numgids); } @@ -445,7 +433,7 @@ process_cstr(const char *instr, int instr_len, struct nss_groupsbymem *gbm) grp = (struct group *)buf->result; parsestat = (*gbm->str2ent)(instr, instr_len, - grp, buf->buffer, buf->buflen); + grp, buf->buffer, buf->buflen); if (parsestat != NSS_STR_PARSE_SUCCESS) { _nss_XbyY_buf_free(buf); @@ -454,7 +442,7 @@ process_cstr(const char *instr, int instr_len, struct nss_groupsbymem *gbm) if (grp->gr_mem) { for (memp = grp->gr_mem; (memp) && ((mem = *memp) != 0); - memp++) { + memp++) { if (strcmp(mem, username) == 0) { gid_t gid = grp->gr_gid; gid_t *gidp = gbm->gid_array; @@ -464,7 +452,7 @@ process_cstr(const char *instr, int instr_len, struct nss_groupsbymem *gbm) _nss_XbyY_buf_free(buf); for (i = 0; i < numgids && *gidp != gid; i++, - gidp++) { + gidp++) { ; } if (i >= numgids) { diff --git a/usr/src/lib/libc/port/gen/gethostid.c b/usr/src/lib/libc/port/gen/gethostid.c index 7f22539f94..3cf2a3eeab 100644 --- a/usr/src/lib/libc/port/gen/gethostid.c +++ b/usr/src/lib/libc/port/gen/gethostid.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/systeminfo.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/gethostname.c b/usr/src/lib/libc/port/gen/gethostname.c index d16b21431c..6484d79afc 100644 --- a/usr/src/lib/libc/port/gen/gethostname.c +++ b/usr/src/lib/libc/port/gen/gethostname.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/systeminfo.h> diff --git a/usr/src/lib/libc/port/gen/gethz.c b/usr/src/lib/libc/port/gen/gethz.c index b44d282a4d..9579d5bcd3 100644 --- a/usr/src/lib/libc/port/gen/gethz.c +++ b/usr/src/lib/libc/port/gen/gethz.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 gethz = _gethz +#pragma weak _gethz = gethz -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <ctype.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/getisax.c b/usr/src/lib/libc/port/gen/getisax.c index 17d426d80e..db0d171412 100644 --- a/usr/src/lib/libc/port/gen/getisax.c +++ b/usr/src/lib/libc/port/gen/getisax.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,17 @@ * * 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" -/*LINTLIBRARY*/ - -#pragma weak getisax = _getisax -#include "synonyms.h" +#pragma weak _getisax = getisax +#include "lint.h" #include <sys/types.h> #include <sys/auxv.h> diff --git a/usr/src/lib/libc/port/gen/getloadavg.c b/usr/src/lib/libc/port/gen/getloadavg.c index cdba031256..a230e34c1e 100644 --- a/usr/src/lib/libc/port/gen/getloadavg.c +++ b/usr/src/lib/libc/port/gen/getloadavg.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,22 +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" -#pragma weak getloadavg = _getloadavg +#pragma weak _getloadavg = getloadavg -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/param.h> -#include <sys/syscall.h> #include <sys/loadavg.h> -#include <stdio.h> -#include <stdlib.h> /* * getloadavg -- get the time averaged run queues from the system @@ -42,6 +39,8 @@ int getloadavg(double loadavg[], int nelem) { + extern int __getloadavg(int *buf, int nelem); + int i, buf[LOADAVG_NSTATS]; if (nelem > LOADAVG_NSTATS) diff --git a/usr/src/lib/libc/port/gen/getlogin.c b/usr/src/lib/libc/port/gen/getlogin.c index 58c5b1f483..a3d7b4cf3b 100644 --- a/usr/src/lib/libc/port/gen/getlogin.c +++ b/usr/src/lib/libc/port/gen/getlogin.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,21 @@ * * 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 getlogin = _getlogin -#pragma weak getlogin_r = _getlogin_r +#pragma weak _getlogin = getlogin +#pragma weak _getlogin_r = getlogin_r -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> @@ -59,7 +58,7 @@ * It was implemented by Solaris 2.3. */ char * -_getlogin_r(char *answer, int namelen) +getlogin_r(char *answer, int namelen) { int uf; off64_t me; @@ -99,7 +98,7 @@ __posix_getlogin_r(char *name, int namelen) int oerrno = errno; errno = 0; - if (_getlogin_r(name, namelen) == NULL) { + if (getlogin_r(name, namelen) == NULL) { if (errno == 0) nerrno = EINVAL; else @@ -116,5 +115,5 @@ getlogin(void) if (answer == NULL) return (NULL); - return (_getlogin_r(answer, _POSIX_LOGIN_NAME_MAX)); + return (getlogin_r(answer, _POSIX_LOGIN_NAME_MAX)); } diff --git a/usr/src/lib/libc/port/gen/getmntent.c b/usr/src/lib/libc/port/gen/getmntent.c index eba9c4de10..94e2d0cc84 100644 --- a/usr/src/lib/libc/port/gen/getmntent.c +++ b/usr/src/lib/libc/port/gen/getmntent.c @@ -20,23 +20,16 @@ */ /* - * 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 getmntany = _getmntany -#pragma weak getmntent = _getmntent -#pragma weak getextmntent = _getextmntent -#pragma weak resetmnttab = _resetmnttab -#pragma weak hasmntopt = _hasmntopt - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <stdio.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/getnetgrent.c b/usr/src/lib/libc/port/gen/getnetgrent.c index 8a8e7373c2..f201250de6 100644 --- a/usr/src/lib/libc/port/gen/getnetgrent.c +++ b/usr/src/lib/libc/port/gen/getnetgrent.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -47,7 +47,7 @@ * count of zero. */ -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <synch.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libc/port/gen/getopt.c b/usr/src/lib/libc/port/gen/getopt.c index e2cb47c5d2..5e3e3e23eb 100644 --- a/usr/src/lib/libc/port/gen/getopt.c +++ b/usr/src/lib/libc/port/gen/getopt.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,15 +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" /* * See getopt(3C) and SUS/XPG getopt() for function definition and @@ -39,9 +39,9 @@ * alnum characters ([a-z][A-Z][0-9]). */ -#pragma weak getopt = _getopt +#pragma weak _getopt = getopt -#include "synonyms.h" +#include "lint.h" #include "_libc_gettext.h" #include <unistd.h> @@ -149,10 +149,10 @@ parselong(const char *optstring, const char *opt, char **longoptarg) if (match && *ip == ')' && (*op == '\0' || *op == '=')) { if ((*op) == '=') { - /* may be an empty string - OK */ - (*longoptarg) = op + 1; + /* may be an empty string - OK */ + (*longoptarg) = op + 1; } else { - (*longoptarg) = NULL; + (*longoptarg) = NULL; } return (cp); } @@ -166,7 +166,7 @@ parselong(const char *optstring, const char *opt, char **longoptarg) * required argument. */ while ((cp > optstring) && ((*cp) == ':')) { - --cp; + --cp; } } while (*cp != '\0'); return (NULL); @@ -230,7 +230,6 @@ getopt(int argc, char *const *argv, const char *optstring) if (!(longopt ? ((cp = parselong(optstring, argv[optind]+2, &longoptarg)) != NULL) : ((cp = parseshort(optstring, c)) != NULL))) { - /* LINTED: variable format specifier */ ERR(_libc_gettext("%s: illegal option -- %s\n"), c, (longopt ? optind : 0)); /* @@ -281,7 +280,6 @@ getopt(int argc, char *const *argv, const char *optstring) optind++; optarg = longoptarg; } else if (++optind >= argc) { - /* LINTED: variable format specifier */ ERR(_libc_gettext("%s: option requires an argument" \ " -- %s\n"), c, (longopt ? optind - 1 : 0)); _sp = 1; @@ -293,13 +291,12 @@ getopt(int argc, char *const *argv, const char *optstring) } else { /* The option does NOT take an argument */ if (longopt && (longoptarg != NULL)) { - /* User supplied an arg to an option that takes none */ - /* LINTED: variable format specifier */ - ERR(_libc_gettext( - "%s: option doesn't take an argument -- %s\n"), - 0, (longopt ? optind : 0)); - optarg = longoptarg = NULL; - c = '?'; + /* User supplied an arg to an option that takes none */ + ERR(_libc_gettext( + "%s: option doesn't take an argument -- %s\n"), + 0, (longopt ? optind : 0)); + optarg = longoptarg = NULL; + c = '?'; } if (longopt || argv[optind][++_sp] == '\0') { diff --git a/usr/src/lib/libc/port/gen/getopt_long.c b/usr/src/lib/libc/port/gen/getopt_long.c index 1db2f1f150..ca55a7870b 100644 --- a/usr/src/lib/libc/port/gen/getopt_long.c +++ b/usr/src/lib/libc/port/gen/getopt_long.c @@ -1,10 +1,8 @@ /* - * 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) 2002 Todd C. Miller <Todd.Miller@courtesan.com> * All rights reserved. @@ -67,18 +65,19 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#pragma weak getopt_clip = _getopt_clip -#pragma weak getopt_long = _getopt_long -#pragma weak getopt_long_only = _getopt_long_only +#pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#pragma weak _getopt_clip = getopt_clip +#pragma weak _getopt_long = getopt_long +#pragma weak _getopt_long_only = getopt_long_only + +#include "lint.h" #include <getopt.h> #include <stdio.h> #include <errno.h> #include <unistd.h> #include <stdlib.h> #include <string.h> - #include "_libc_gettext.h" static int optreset = 0; /* keep track of first entry to getopt() */ diff --git a/usr/src/lib/libc/port/gen/getpagesize.c b/usr/src/lib/libc/port/gen/getpagesize.c index ffc9c01f2f..c63ffc663b 100644 --- a/usr/src/lib/libc/port/gen/getpagesize.c +++ b/usr/src/lib/libc/port/gen/getpagesize.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,10 +18,13 @@ * * 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. - * + */ + +/* * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T * All Rights Reserved * @@ -33,7 +35,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <unistd.h> /* diff --git a/usr/src/lib/libc/port/gen/getpw.c b/usr/src/lib/libc/port/gen/getpw.c index 9155894497..629312f91e 100644 --- a/usr/src/lib/libc/port/gen/getpw.c +++ b/usr/src/lib/libc/port/gen/getpw.c @@ -18,21 +18,18 @@ * * 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" -/* 3.0 SID # 1.2 */ -#pragma weak getpw = _getpw - -#include "synonyms.h" +#include "lint.h" #include "file64.h" #include <sys/types.h> #include <mtlib.h> diff --git a/usr/src/lib/libc/port/gen/getpwnam.c b/usr/src/lib/libc/port/gen/getpwnam.c index 7a3b8c4b37..d04d63190a 100644 --- a/usr/src/lib/libc/port/gen/getpwnam.c +++ b/usr/src/lib/libc/port/gen/getpwnam.c @@ -18,23 +18,21 @@ * * 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" -#pragma weak getpwnam = _getpwnam -#pragma weak getpwuid = _getpwuid -#pragma weak getpwent = _getpwent -#pragma weak fgetpwent = _fgetpwent +#pragma weak _getpwnam = getpwnam +#pragma weak _getpwuid = getpwuid -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <pwd.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libc/port/gen/getpwnam_r.c b/usr/src/lib/libc/port/gen/getpwnam_r.c index 21d1c3c7e5..7ff4d21f0d 100644 --- a/usr/src/lib/libc/port/gen/getpwnam_r.c +++ b/usr/src/lib/libc/port/gen/getpwnam_r.c @@ -18,21 +18,15 @@ * * 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" -#pragma weak endpwent = _endpwent -#pragma weak setpwent = _setpwent -#pragma weak getpwnam_r = _getpwnam_r -#pragma weak getpwuid_r = _getpwuid_r -#pragma weak getpwent_r = _getpwent_r -#pragma weak fgetpwent_r = _fgetpwent_r - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <pwd.h> #include <nss_dbdefs.h> @@ -71,7 +65,7 @@ _uncached_getpwnam_r(const char *name, struct passwd *result, char *buffer, * It was implemented by Solaris 2.3. */ struct passwd * -_getpwnam_r(const char *name, struct passwd *result, char *buffer, int buflen) +getpwnam_r(const char *name, struct passwd *result, char *buffer, int buflen) { nss_XbyY_args_t arg; @@ -82,7 +76,7 @@ _getpwnam_r(const char *name, struct passwd *result, char *buffer, int buflen) NSS_XbyY_INIT(&arg, result, buffer, buflen, str2passwd); arg.key.name = name; (void) nss_search(&db_root, _nss_initf_passwd, NSS_DBOP_PASSWD_BYNAME, - &arg); + &arg); return ((struct passwd *)NSS_XbyY_FINI(&arg)); } @@ -91,14 +85,14 @@ _getpwnam_r(const char *name, struct passwd *result, char *buffer, int buflen) * It was implemented by Solaris 2.3. */ struct passwd * -_getpwuid_r(uid_t uid, struct passwd *result, char *buffer, int buflen) +getpwuid_r(uid_t uid, struct passwd *result, char *buffer, int buflen) { nss_XbyY_args_t arg; NSS_XbyY_INIT(&arg, result, buffer, buflen, str2passwd); arg.key.uid = uid; (void) nss_search(&db_root, _nss_initf_passwd, NSS_DBOP_PASSWD_BYUID, - &arg); + &arg); return ((struct passwd *)NSS_XbyY_FINI(&arg)); } @@ -112,7 +106,7 @@ _uncached_getpwuid_r(uid_t uid, struct passwd *result, char *buffer, NSS_XbyY_INIT(&arg, result, buffer, buflen, str2passwd); arg.key.uid = uid; (void) nss_search(&db_root, _nss_initf_passwd, NSS_DBOP_PASSWD_BYUID, - &arg); + &arg); return ((struct passwd *)NSS_XbyY_FINI(&arg)); } @@ -129,8 +123,8 @@ __posix_getpwuid_r(uid_t uid, struct passwd *pwd, char *buffer, int oerrno = errno; errno = 0; - if ((*result = _getpwuid_r(uid, pwd, buffer, (uintptr_t)bufsize)) - == NULL) { + if ((*result = getpwuid_r(uid, pwd, buffer, (uintptr_t)bufsize)) + == NULL) { nerrno = errno; } errno = oerrno; @@ -146,7 +140,7 @@ _uncached_getpwnam_r(const char *name, struct passwd *result, char *buffer, NSS_XbyY_INIT(&arg, result, buffer, buflen, str2passwd); arg.key.name = name; (void) nss_search(&db_root, _nss_initf_passwd, NSS_DBOP_PASSWD_BYNAME, - &arg); + &arg); return ((struct passwd *)NSS_XbyY_FINI(&arg)); } @@ -162,8 +156,8 @@ __posix_getpwnam_r(const char *name, struct passwd *pwd, char *buffer, int oerrno = errno; errno = 0; - if ((*result = _getpwnam_r(name, pwd, buffer, (uintptr_t)bufsize)) - == NULL) { + if ((*result = getpwnam_r(name, pwd, buffer, (uintptr_t)bufsize)) + == NULL) { nerrno = errno; } errno = oerrno; @@ -197,7 +191,7 @@ getpwent_r(struct passwd *result, char *buffer, int buflen) (void) nss_getent(&db_root, _nss_initf_passwd, &context, &arg); } while (arg.returnval != 0 && (nam = ((struct passwd *)arg.returnval)->pw_name) != 0 && - (*nam == '+' || *nam == '-')); + (*nam == '+' || *nam == '-')); return ((struct passwd *)NSS_XbyY_FINI(&arg)); } diff --git a/usr/src/lib/libc/port/gen/getrusage.c b/usr/src/lib/libc/port/gen/getrusage.c index efeaf0be24..cb0fb3f695 100644 --- a/usr/src/lib/libc/port/gen/getrusage.c +++ b/usr/src/lib/libc/port/gen/getrusage.c @@ -18,8 +18,9 @@ * * 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. */ @@ -33,14 +34,13 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - /* * Compatibility lib for BSD's getrusgae(). Only the * CPU time usage is supported for RUSAGE_CHILDREN, and hence does not * fully support BSD's rusage semantics. */ +#include "lint.h" #include <sys/types.h> #include <sys/time.h> #include <sys/times.h> diff --git a/usr/src/lib/libc/port/gen/getspent.c b/usr/src/lib/libc/port/gen/getspent.c index cb1472dce1..044c19b9c9 100644 --- a/usr/src/lib/libc/port/gen/getspent.c +++ b/usr/src/lib/libc/port/gen/getspent.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,23 +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 getspent = _getspent -#pragma weak getspnam = _getspnam -#pragma weak fgetspent = _fgetspent - /* putspent() has been moved to putspent.c */ - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <shadow.h> #include <nss_dbdefs.h> diff --git a/usr/src/lib/libc/port/gen/getspent_r.c b/usr/src/lib/libc/port/gen/getspent_r.c index 78c42b7b62..d1edf7e9be 100644 --- a/usr/src/lib/libc/port/gen/getspent_r.c +++ b/usr/src/lib/libc/port/gen/getspent_r.c @@ -18,20 +18,15 @@ * * 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" -#pragma weak setspent = _setspent -#pragma weak endspent = _endspent -#pragma weak getspnam_r = _getspnam_r -#pragma weak getspent_r = _getspent_r -#pragma weak fgetspent_r = _fgetspent_r - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <shadow.h> @@ -62,8 +57,8 @@ getspnam_r(const char *name, struct spwd *result, char *buffer, int buflen) NSS_XbyY_INIT(&arg, result, buffer, buflen, str2spwd); arg.key.name = name; - (void) nss_search(&db_root, _nss_initf_shadow, \ - NSS_DBOP_SHADOW_BYNAME, &arg); + (void) nss_search(&db_root, _nss_initf_shadow, + NSS_DBOP_SHADOW_BYNAME, &arg); return ((struct spwd *)NSS_XbyY_FINI(&arg)); } @@ -93,8 +88,8 @@ getspent_r(struct spwd *result, char *buffer, int buflen) /* No key to fill in */ (void) nss_getent(&db_root, _nss_initf_shadow, &context, &arg); } while (arg.returnval != 0 && - (nam = ((struct spwd *)arg.returnval)->sp_namp) != 0 && - (*nam == '+' || *nam == '-')); + (nam = ((struct spwd *)arg.returnval)->sp_namp) != 0 && + (*nam == '+' || *nam == '-')); return (struct spwd *)NSS_XbyY_FINI(&arg); } @@ -192,8 +187,8 @@ str2spwd(const char *instr, int lenstr, void *ent, char *buffer, int buflen) limit = p + lenstr; if ((p = memchr(instr, ':', lenstr)) == 0 || - ++p >= limit || - (p = memchr(p, ':', limit - p)) == 0) { + ++p >= limit || + (p = memchr(p, ':', limit - p)) == 0) { lencopy = (size_t)lenstr; p = 0; } else { diff --git a/usr/src/lib/libc/port/gen/getsubopt.c b/usr/src/lib/libc/port/gen/getsubopt.c index e1516b7de0..466319b718 100644 --- a/usr/src/lib/libc/port/gen/getsubopt.c +++ b/usr/src/lib/libc/port/gen/getsubopt.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. */ @@ -32,9 +32,9 @@ /* * getsubopt - parse suboptions from a flag argument. */ -#pragma weak getsubopt = _getsubopt +#pragma weak _getsubopt = getsubopt -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <string.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/gettxt.c b/usr/src/lib/libc/port/gen/gettxt.c index 2399f92f89..88e0b5b72c 100644 --- a/usr/src/lib/libc/port/gen/gettxt.c +++ b/usr/src/lib/libc/port/gen/gettxt.c @@ -20,19 +20,18 @@ */ /* - * 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 gettxt = _gettxt +#pragma weak _gettxt = gettxt -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <mtlib.h> #include <ctype.h> diff --git a/usr/src/lib/libc/port/gen/getusershell.c b/usr/src/lib/libc/port/gen/getusershell.c index a8fb5d97e5..368fa72a61 100644 --- a/usr/src/lib/libc/port/gen/getusershell.c +++ b/usr/src/lib/libc/port/gen/getusershell.c @@ -1,21 +1,20 @@ /* - * 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) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. */ -#include "synonyms.h" +#pragma ident "%Z%%M% %I% %E% SMI" + +#include "lint.h" #include <sys/types.h> #include <sys/param.h> #include <sys/stat.h> diff --git a/usr/src/lib/libc/port/gen/getut.c b/usr/src/lib/libc/port/gen/getut.c index e60a041b23..798e6d69d0 100644 --- a/usr/src/lib/libc/port/gen/getut.c +++ b/usr/src/lib/libc/port/gen/getut.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" /* * Compatibility routines to read and write alternate @@ -40,7 +40,7 @@ * equivalent function operating on utmpx-like files. */ -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <sys/param.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/getutx.c b/usr/src/lib/libc/port/gen/getutx.c index fe0da52342..c755b12266 100644 --- a/usr/src/lib/libc/port/gen/getutx.c +++ b/usr/src/lib/libc/port/gen/getutx.c @@ -45,30 +45,7 @@ * on systems with MAXPID <= SHRT_MAX. */ -#pragma weak getutxent = _getutxent -#pragma weak getutent = _getutent -#pragma weak getutxid = _getutxid -#pragma weak getutid = _getutid -#pragma weak getutxline = _getutxline -#pragma weak getutline = _getutline -#pragma weak getutmpx = _getutmpx -#pragma weak getutmp = _getutmp -#pragma weak makeutx = _makeutx -#pragma weak makeut = _makeut -#pragma weak modutx = _modutx -#pragma weak modut = _modut -#pragma weak pututxline = _pututxline -#pragma weak pututline = _pututline -#pragma weak setutxent = _setutxent -#pragma weak setutent = _setutent -#pragma weak endutxent = _endutxent -#pragma weak endutent = _endutent -#pragma weak utmpxname = _utmpxname -#pragma weak utmpname = _utmpname -#pragma weak updwtmpx = _updwtmpx -#pragma weak updwtmp = _updwtmp - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdio.h> #include <sys/param.h> diff --git a/usr/src/lib/libc/port/gen/getvfsent.c b/usr/src/lib/libc/port/gen/getvfsent.c index 4de8f7574d..bf6cf11c1a 100644 --- a/usr/src/lib/libc/port/gen/getvfsent.c +++ b/usr/src/lib/libc/port/gen/getvfsent.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,23 +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 getvfsspec = _getvfsspec -#pragma weak getvfsfile = _getvfsfile -#pragma weak getvfsany = _getvfsany -#pragma weak getvfsent = _getvfsent - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/getwd.c b/usr/src/lib/libc/port/gen/getwd.c index 9474e9a82f..6b6baf82c6 100644 --- a/usr/src/lib/libc/port/gen/getwd.c +++ b/usr/src/lib/libc/port/gen/getwd.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,15 +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 <sys/types.h> #include <sys/param.h> #include <errno.h> @@ -49,7 +48,7 @@ getwd(char *pathname) if ((c = getcwd(pathname, val)) == NULL) { if (errno == EACCES) (void) strcpy(pathname, - "getwd: a parent directory cannot be read"); + "getwd: a parent directory cannot be read"); else if (errno == ERANGE) (void) strcpy(pathname, "getwd: buffer too small"); else diff --git a/usr/src/lib/libc/port/gen/getwidth.c b/usr/src/lib/libc/port/gen/getwidth.c index 0e74f74fce..fe91801a5b 100644 --- a/usr/src/lib/libc/port/gen/getwidth.c +++ b/usr/src/lib/libc/port/gen/getwidth.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) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <ctype.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/getxby_door.c b/usr/src/lib/libc/port/gen/getxby_door.c index c30ad8c231..e98bf317ef 100644 --- a/usr/src/lib/libc/port/gen/getxby_door.c +++ b/usr/src/lib/libc/port/gen/getxby_door.c @@ -26,7 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/gtxt.c b/usr/src/lib/libc/port/gen/gtxt.c index 145743bdd8..80936415dc 100644 --- a/usr/src/lib/libc/port/gen/gtxt.c +++ b/usr/src/lib/libc/port/gen/gtxt.c @@ -18,22 +18,22 @@ * * 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" /* __gtxt(): Common part to gettxt() and pfmt() */ -#pragma weak setcat = _setcat +#pragma weak _setcat = setcat -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <mtlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/hsearch.c b/usr/src/lib/libc/port/gen/hsearch.c index 2773b48809..6a04ae0743 100644 --- a/usr/src/lib/libc/port/gen/hsearch.c +++ b/usr/src/lib/libc/port/gen/hsearch.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 */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * Compile time switches: @@ -46,11 +45,11 @@ * USCR - user supplied comparison routine. */ -#pragma weak hcreate = _hcreate -#pragma weak hdestroy = _hdestroy -#pragma weak hsearch = _hsearch +#pragma weak _hcreate = hcreate +#pragma weak _hdestroy = hdestroy +#pragma weak _hsearch = hsearch -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <limits.h> #include <stdio.h> @@ -172,29 +171,29 @@ start: #endif new = (ENTRY *) malloc(sizeof (ENTRY)); if (new == NULL) { - fprintf(stderr, "Out of core \n"); - exit(FAIL); - } else { - new->key = malloc((unsigned)strlen(line) + 1); - if (new->key == NULL) { fprintf(stderr, "Out of core \n"); exit(FAIL); - } - strcpy(new->key, line); - new->data = malloc(sizeof (int)); - if (new->data == NULL) { - fprintf(stderr, "Out of core \n"); - exit(FAIL); - } - *new->data = i++; + } else { + new->key = malloc((unsigned)strlen(line) + 1); + if (new->key == NULL) { + fprintf(stderr, "Out of core \n"); + exit(FAIL); + } + strcpy(new->key, line); + new->data = malloc(sizeof (int)); + if (new->data == NULL) { + fprintf(stderr, "Out of core \n"); + exit(FAIL); + } + *new->data = i++; } res = hsearch(*new, ENTER); printf("The number of probes required was %d\n", prcnt); if (res == (ENTRY *) 0) - printf("Table is full\n"); + printf("Table is full\n"); else { - printf("Success: "); - printf("Key = %s, Value = %d\n", res->key, *res->data); + printf("Success: "); + printf("Key = %s, Value = %d\n", res->key, *res->data); } } printf("Do you wish to start another hash table (yes/no?)"); @@ -556,19 +555,19 @@ hdump() /* Dumps loc, data, probe count, key */ hsearch(table[i], FIND); sum += prcnt; printf("%o.\t%d,\t%d,\t%s\n", i, - *table[i].data, prcnt, table[i].key); + *table[i].data, prcnt, table[i].key); prcnt = oldpr; } printf("Total probes = %d\n", sum); #else #ifdef CHAINED if (table[i] == NULL) - printf("%o.\t-,\t-,\t(NULL)\n", i); + printf("%o.\t-,\t-,\t(NULL)\n", i); else { - printf("%o.", i); - for (a = table[i]; a != NULL; a = a->next) - printf("\t%d,\t%#0.4x,\t%s\n", - *a->item.data, a, a->item.key); + printf("%o.", i); + for (a = table[i]; a != NULL; a = a->next) + printf("\t%d,\t%#0.4x,\t%s\n", + *a->item.data, a, a->item.key); } #endif #endif diff --git a/usr/src/lib/libc/port/gen/iconv.c b/usr/src/lib/libc/port/gen/iconv.c index d3fc6e9cfd..b9fc9ce598 100644 --- a/usr/src/lib/libc/port/gen/iconv.c +++ b/usr/src/lib/libc/port/gen/iconv.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,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" -#pragma weak iconv_open = _iconv_open -#pragma weak iconv_close = _iconv_close -#pragma weak iconv = _iconv - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/stat.h> #include <sys/mman.h> @@ -63,7 +59,7 @@ static iconv_p iconv_search_alias(const char *, const char *, char *); */ iconv_t -_iconv_open(const char *tocode, const char *fromcode) +iconv_open(const char *tocode, const char *fromcode) { iconv_t cd; char *ipath; @@ -124,13 +120,13 @@ search_alias(char **paddr, size_t size, const char *variant) } /* skip leading spaces */ while ((q > p) && - ((*p == ' ') || (*p == '\t'))) + ((*p == ' ') || (*p == '\t'))) p++; if (q <= p) break; sp = p; while ((q > p) && (*p != ' ') && - (*p != '\t') && (*p != '\n')) + (*p != '\t') && (*p != '\n')) p++; if (q <= p) { /* invalid entry */ @@ -143,8 +139,8 @@ search_alias(char **paddr, size_t size, const char *variant) } if (((p - sp) != var_len) || - ((strncmp(sp, variant, var_len) != 0) && - (strncasecmp(sp, variant, var_len) != 0))) { + ((strncmp(sp, variant, var_len) != 0) && + (strncasecmp(sp, variant, var_len) != 0))) { /* * didn't match */ @@ -160,13 +156,13 @@ search_alias(char **paddr, size_t size, const char *variant) /* skip spaces */ while ((q > p) && - ((*p == ' ') || (*p == '\t'))) + ((*p == ' ') || (*p == '\t'))) p++; if (q <= p) break; sp = p; while ((q > p) && (*p != ' ') && - (*p != '\t') && (*p != '\n')) + (*p != '\t') && (*p != '\n')) p++; can_len = p - sp; if (can_len == 0) { @@ -304,7 +300,7 @@ iconv_open_private(const char *lib, const char *tbl) /* gets address of _icv_open */ if ((fptr = (iconv_t(*)(const char *))dlsym(cdpath->_icv_handle, - "_icv_open")) == NULL) { + "_icv_open")) == NULL) { (void) dlclose(cdpath->_icv_handle); free(cdpath); /* dlsym does not define errno */ @@ -318,8 +314,8 @@ iconv_open_private(const char *lib, const char *tbl) */ if ((cdpath->_icv_iconv = (size_t(*)(iconv_t, const char **, - size_t *, char **, size_t *))dlsym(cdpath->_icv_handle, - "_icv_iconv")) == NULL) { + size_t *, char **, size_t *))dlsym(cdpath->_icv_handle, + "_icv_iconv")) == NULL) { (void) dlclose(cdpath->_icv_handle); free(cdpath); /* dlsym does not define errno */ @@ -332,7 +328,7 @@ iconv_open_private(const char *lib, const char *tbl) * and stores it in cd->_icv_close */ if ((cdpath->_icv_close = (void(*)(iconv_t))dlsym(cdpath->_icv_handle, - "_icv_close")) == NULL) { + "_icv_close")) == NULL) { (void) dlclose(cdpath->_icv_handle); free(cdpath); /* dlsym does not define errno */ @@ -343,7 +339,7 @@ iconv_open_private(const char *lib, const char *tbl) /* * initialize the state of the actual _icv_iconv conversion routine * For the normal iconv module, NULL will be passed as an argument - * although the _iconv_open() of the module won't use that. + * although the iconv_open() of the module won't use that. */ cdpath->_icv_state = (void *)(*fptr)(tbl); @@ -359,7 +355,7 @@ iconv_open_private(const char *lib, const char *tbl) } int -_iconv_close(iconv_t cd) +iconv_close(iconv_t cd) { if (cd == NULL) { errno = EBADF; @@ -373,7 +369,7 @@ _iconv_close(iconv_t cd) } size_t -_iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, +iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) { /* check if cd is valid */ @@ -384,5 +380,5 @@ _iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, /* direct conversion */ return ((*(cd->_conv)->_icv_iconv)(cd->_conv->_icv_state, - inbuf, inbytesleft, outbuf, outbytesleft)); + inbuf, inbytesleft, outbuf, outbytesleft)); } diff --git a/usr/src/lib/libc/port/gen/imaxabs.c b/usr/src/lib/libc/port/gen/imaxabs.c index 6beaca4796..9652f1aa27 100644 --- a/usr/src/lib/libc/port/gen/imaxabs.c +++ b/usr/src/lib/libc/port/gen/imaxabs.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,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 <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/index.c b/usr/src/lib/libc/port/gen/index.c index 3a21c1eb7b..d8ab6a79f6 100644 --- a/usr/src/lib/libc/port/gen/index.c +++ b/usr/src/lib/libc/port/gen/index.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. */ @@ -39,7 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/initgroups.c b/usr/src/lib/libc/port/gen/initgroups.c index 82be7bb739..29e63e6e53 100644 --- a/usr/src/lib/libc/port/gen/initgroups.c +++ b/usr/src/lib/libc/port/gen/initgroups.c @@ -18,20 +18,20 @@ * * 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 initgroups = _initgroups +#pragma weak _initgroups = initgroups -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> #include <errno.h> #include <grp.h> @@ -68,7 +68,7 @@ initgroups(const char *uname, gid_t agroup) groups[0] = agroup; ngroups = _getgroupsbymember(uname, groups, (int)ngroups_max, - (agroup <= MAXUID) ? 1 : 0); + (agroup <= MAXUID) ? 1 : 0); if (ngroups < 0) { /* XXX -- man page does not define a value for errno in */ /* this case. Should be looked into sometime. */ diff --git a/usr/src/lib/libc/port/gen/insque.c b/usr/src/lib/libc/port/gen/insque.c index f42c4e0fb9..586faf4274 100644 --- a/usr/src/lib/libc/port/gen/insque.c +++ b/usr/src/lib/libc/port/gen/insque.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" /* * insque() and remque() insert or remove an element from a queue. @@ -38,10 +37,10 @@ * of the structure points to the previous element in the queue. */ -#pragma weak insque = _insque -#pragma weak remque = _remque +#pragma weak _insque = insque +#pragma weak _remque = remque -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdlib.h> #include <search.h> @@ -81,8 +80,8 @@ remque(void *elem) ((struct qelem *)elem)->q_back->q_forw = NULL; } else { /* The middle element is removed. */ ((struct qelem *)elem)->q_back->q_forw = - ((struct qelem *)elem)->q_forw; + ((struct qelem *)elem)->q_forw; ((struct qelem *)elem)->q_forw->q_back = - ((struct qelem *)elem)->q_back; + ((struct qelem *)elem)->q_back; } } diff --git a/usr/src/lib/libc/port/gen/isaexec.c b/usr/src/lib/libc/port/gen/isaexec.c index 3f34dadf17..9939b695f6 100644 --- a/usr/src/lib/libc/port/gen/isaexec.c +++ b/usr/src/lib/libc/port/gen/isaexec.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,17 @@ * * 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" -#pragma weak isaexec = _isaexec -#include "synonyms.h" +#pragma weak _isaexec = isaexec +#include "lint.h" #include <sys/types.h> #include <sys/systeminfo.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/isastream.c b/usr/src/lib/libc/port/gen/isastream.c index 3402224896..34c9d390d7 100644 --- a/usr/src/lib/libc/port/gen/isastream.c +++ b/usr/src/lib/libc/port/gen/isastream.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" /* * Check to see if a file descriptor is that of a stream. @@ -38,9 +37,9 @@ * */ -#pragma weak isastream = _isastream +#pragma weak _isastream = isastream -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdio.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/isatty.c b/usr/src/lib/libc/port/gen/isatty.c index fdd4d1ae58..b54bc29077 100644 --- a/usr/src/lib/libc/port/gen/isatty.c +++ b/usr/src/lib/libc/port/gen/isatty.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 isatty = _isatty +#pragma weak _isatty = isatty -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termio.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/killpg.c b/usr/src/lib/libc/port/gen/killpg.c index 414c660c0c..493dfe7012 100644 --- a/usr/src/lib/libc/port/gen/killpg.c +++ b/usr/src/lib/libc/port/gen/killpg.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/klpdlib.c b/usr/src/lib/libc/port/gen/klpdlib.c index db0403c950..4b1042bcc3 100644 --- a/usr/src/lib/libc/port/gen/klpdlib.c +++ b/usr/src/lib/libc/port/gen/klpdlib.c @@ -26,12 +26,10 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "lint.h" #include "priv_private.h" #include "mtlib.h" #include "libc.h" - #include <door.h> #include <errno.h> #include <priv.h> diff --git a/usr/src/lib/libc/port/gen/l3.c b/usr/src/lib/libc/port/gen/l3.c index df5219a5d8..05a43717cc 100644 --- a/usr/src/lib/libc/port/gen/l3.c +++ b/usr/src/lib/libc/port/gen/l3.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" /* * Convert longs to and from 3-byte disk addresses */ -#pragma weak l3tol = _l3tol -#pragma weak ltol3 = _ltol3 +#pragma weak _l3tol = l3tol +#pragma weak _ltol3 = ltol3 -#include "synonyms.h" +#include "lint.h" void ltol3(char *cp, const long *lp, int n) diff --git a/usr/src/lib/libc/port/gen/l64a.c b/usr/src/lib/libc/port/gen/l64a.c index 2a1da592e7..140cee8ad3 100644 --- a/usr/src/lib/libc/port/gen/l64a.c +++ b/usr/src/lib/libc/port/gen/l64a.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" /* * convert long int to base 64 ascii @@ -38,9 +37,7 @@ * */ -#pragma weak l64a = _l64a - -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include "libc.h" #include <values.h> @@ -80,7 +77,7 @@ l64a(long value) /* fill high-order CHAR if negative */ /* but suppress sign propagation */ lg = ((lg < 0) ? (lg >> BITSPERCHAR) | SIGN : - lg >> BITSPERCHAR) & WORDMASK; + lg >> BITSPERCHAR) & WORDMASK; } *s = '\0'; return (buf); diff --git a/usr/src/lib/libc/port/gen/lckpwdf.c b/usr/src/lib/libc/port/gen/lckpwdf.c index ae1682c0b8..030660d107 100644 --- a/usr/src/lib/libc/port/gen/lckpwdf.c +++ b/usr/src/lib/libc/port/gen/lckpwdf.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 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 lckpwdf = _lckpwdf -#pragma weak ulckpwdf = _ulckpwdf - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdio.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/lconstants.c b/usr/src/lib/libc/port/gen/lconstants.c index 21fe9f7a39..a08d0c0da8 100644 --- a/usr/src/lib/libc/port/gen/lconstants.c +++ b/usr/src/lib/libc/port/gen/lconstants.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" -#pragma weak lzero = _lzero -#pragma weak lone = _lone -#pragma weak lten = _lten +#pragma weak _lzero = lzero +#pragma weak _lone = lone +#pragma weak _lten = lten -#include "synonyms.h" -#include <sys/types.h> -#include <sys/dl.h> +#include "lint.h" +#include <sys/types.h> +#include <sys/dl.h> dl_t lzero = {0, 0}; dl_t lone = {0, 1}; diff --git a/usr/src/lib/libc/port/gen/ldivide.c b/usr/src/lib/libc/port/gen/ldivide.c index e7bbef1d9d..bf6c3d0146 100644 --- a/usr/src/lib/libc/port/gen/ldivide.c +++ b/usr/src/lib/libc/port/gen/ldivide.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,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 ldivide = _ldivide -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/dl.h> #include "libc.h" diff --git a/usr/src/lib/libc/port/gen/lexp10.c b/usr/src/lib/libc/port/gen/lexp10.c new file mode 100644 index 0000000000..d394c11b66 --- /dev/null +++ b/usr/src/lib/libc/port/gen/lexp10.c @@ -0,0 +1,49 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * 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 "lint.h" +#include <sys/types.h> +#include <sys/dl.h> + +dl_t +lexp10(dl_t exp) +{ + dl_t result; + + result = lone; + + while (exp.dl_hop != 0 || exp.dl_lop != 0) { + result = lmul(result, lten); + exp = lsub(exp, lone); + } + + return (result); +} diff --git a/usr/src/lib/libc/port/gen/lfind.c b/usr/src/lib/libc/port/gen/lfind.c index a449ff6ebc..699f4a3441 100644 --- a/usr/src/lib/libc/port/gen/lfind.c +++ b/usr/src/lib/libc/port/gen/lfind.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" /* * Linear search algorithm, generalized from Knuth (6.1) Algorithm Q. @@ -42,9 +41,9 @@ * Actually, it has now reverted to Algorithm S, which is "simpler." */ -#pragma weak lfind = _lfind +#pragma weak _lfind = lfind -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> #include <mtlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/lfmt.c b/usr/src/lib/libc/port/gen/lfmt.c index 51faa67105..87bebe6c6e 100644 --- a/usr/src/lib/libc/port/gen/lfmt.c +++ b/usr/src/lib/libc/port/gen/lfmt.c @@ -18,22 +18,22 @@ * * 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" /* lfmt() - format, print and log */ -#pragma weak lfmt = _lfmt +#pragma weak _lfmt = lfmt -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include "mtlib.h" #include <pfmt.h> diff --git a/usr/src/lib/libc/port/gen/lfmt_log.c b/usr/src/lib/libc/port/gen/lfmt_log.c index 6d73e4366b..e08162ee0d 100644 --- a/usr/src/lib/libc/port/gen/lfmt_log.c +++ b/usr/src/lib/libc/port/gen/lfmt_log.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,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" /* lfmt_log() - log info */ -#include "synonyms.h" + +#include "lint.h" #include <mtlib.h> #include <pfmt.h> #include <stdio.h> @@ -91,8 +91,8 @@ __lfmt_log(const char *text, const char *sev, va_list args, long flag, int ret) msg.buf[msg_offset++] = '\0'; if (fd == -1 && - ((fd = open(LOGNAME, O_WRONLY)) == -1 || - fcntl(fd, F_SETFD, 1) == -1)) + ((fd = open(LOGNAME, O_WRONLY)) == -1 || + fcntl(fd, F_SETFD, 1) == -1)) return (-2); dat.maxlen = MAXMSG; @@ -124,7 +124,7 @@ __lfmt_log(const char *text, const char *sev, va_list args, long flag, int ret) *p = ':'; (void) write(fdd, buf, strlen(buf)); (void) write(fdd, msg.buf + sizeof (long), - msg_offset - sizeof (long)); + msg_offset - sizeof (long)); (void) write(fdd, "\n", 1); } else return (-2); diff --git a/usr/src/lib/libc/port/gen/llabs.c b/usr/src/lib/libc/port/gen/llabs.c index 0fb831508f..75dd92c863 100644 --- a/usr/src/lib/libc/port/gen/llabs.c +++ b/usr/src/lib/libc/port/gen/llabs.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 llabs = _llabs - -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/lldiv.c b/usr/src/lib/libc/port/gen/lldiv.c index c6f2e1564a..c9dc80eff0 100644 --- a/usr/src/lib/libc/port/gen/lldiv.c +++ b/usr/src/lib/libc/port/gen/lldiv.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,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 lldiv = _lldiv -#pragma weak __imax_lldiv = _lldiv +#pragma weak __imax_lldiv = lldiv -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/llog10.c b/usr/src/lib/libc/port/gen/llog10.c new file mode 100644 index 0000000000..f06ad17546 --- /dev/null +++ b/usr/src/lib/libc/port/gen/llog10.c @@ -0,0 +1,50 @@ +/* + * CDDL HEADER START + * + * The contents of this file are subject to the terms of the + * 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. + * See the License for the specific language governing permissions + * and limitations under the License. + * + * When distributing Covered Code, include this CDDL HEADER in each + * file and include the License file at usr/src/OPENSOLARIS.LICENSE. + * If applicable, add the following below this CDDL HEADER, with the + * fields enclosed by brackets "[]" replaced with your own identifying + * information: Portions Copyright [yyyy] [name of copyright owner] + * + * CDDL HEADER END + */ + +/* + * 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 "lint.h" +#include <sys/types.h> +#include <sys/dl.h> + +dl_t +llog10(dl_t val) +{ + dl_t result; + + result = lzero; + val = ldivide(val, lten); + + while (val.dl_hop != 0 || val.dl_lop != 0) { + val = ldivide(val, lten); + result = ladd(result, lone); + } + + return (result); +} diff --git a/usr/src/lib/libc/port/gen/lltostr.c b/usr/src/lib/libc/port/gen/lltostr.c index d522cb6231..ea81d603f0 100644 --- a/usr/src/lib/libc/port/gen/lltostr.c +++ b/usr/src/lib/libc/port/gen/lltostr.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" /* * lltostr -- convert long long to decimal string @@ -49,10 +48,10 @@ * zero digit is produced if "value" is zero. */ -#pragma weak lltostr = _lltostr -#pragma weak ulltostr = _ulltostr +#pragma weak _lltostr = lltostr +#pragma weak _ulltostr = ulltostr -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/lmath.c b/usr/src/lib/libc/port/gen/lmath.c index cb657ac7a8..64d1313c47 100644 --- a/usr/src/lib/libc/port/gen/lmath.c +++ b/usr/src/lib/libc/port/gen/lmath.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" /* * This set of routines used to be implemented mostly in assembler. @@ -38,13 +37,7 @@ * a C implementation seems quite adequate and much more maintainable. */ -#pragma weak ladd = _ladd -#pragma weak lsub = _lsub -#pragma weak lshiftl = _lshiftl -#pragma weak lsign = _lsign -#pragma weak lmul = _lmul - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/dl.h> diff --git a/usr/src/lib/libc/port/gen/localtime.c b/usr/src/lib/libc/port/gen/localtime.c index 6ebeaf6ad5..9d406227cb 100644 --- a/usr/src/lib/libc/port/gen/localtime.c +++ b/usr/src/lib/libc/port/gen/localtime.c @@ -20,22 +20,21 @@ */ /* - * 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 */ - /* * A part of this file comes from public domain source, so * clarified as of June 5, 1996 by Arthur David Olson * (arthur_david_olson@nih.gov). */ +#pragma ident "%Z%%M% %I% %E% SMI" + /* * localtime.c * @@ -87,11 +86,9 @@ * Functions that are common to ctime(3C) and cftime(3C) */ -#pragma weak tzset = _tzset -#pragma weak localtime_r = _localtime_r -#pragma weak gmtime_r = _gmtime_r +#pragma weak _tzset = tzset -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include "tsd.h" #include <stdarg.h> @@ -462,7 +459,7 @@ difftime(time_t time1, time_t time0) * See ctime(3C) */ struct tm * -_gmtime_r(const time_t *timep, struct tm *p_tm) +gmtime_r(const time_t *timep, struct tm *p_tm) { return (offtime_u((time_t)*timep, 0L, p_tm)); } @@ -486,7 +483,7 @@ gmtime(const time_t *timep) if (p_tm == NULL) /* memory allocation failure */ p_tm = &tm; /* use static buffer and hope for the best */ - return (_gmtime_r(timep, p_tm)); + return (gmtime_r(timep, p_tm)); } /* @@ -585,7 +582,7 @@ find_zone(const char *zonename, state_t ***link_prev, state_t **link_next) * See ctime(3C) */ struct tm * -_localtime_r(const time_t *timep, struct tm *p_tm) +localtime_r(const time_t *timep, struct tm *p_tm) { long offset; struct tm *rt; @@ -637,7 +634,7 @@ localtime(const time_t *timep) if (p_tm == NULL) /* memory allocation failure */ p_tm = &tm; /* use static buffer and hope for the best */ - return (_localtime_r(timep, p_tm)); + return (localtime_r(timep, p_tm)); } /* @@ -787,7 +784,7 @@ mktime(struct tm *tmptr) * are updated. See ctime(3C) manpage. */ void -_tzset(void) +tzset(void) { systemtz_t stz; systemtz_t *tzp; diff --git a/usr/src/lib/libc/port/gen/lsearch.c b/usr/src/lib/libc/port/gen/lsearch.c index c780ae5231..7347f6c008 100644 --- a/usr/src/lib/libc/port/gen/lsearch.c +++ b/usr/src/lib/libc/port/gen/lsearch.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" /* * Linear search algorithm, generalized from Knuth (6.1) Algorithm Q. @@ -42,9 +41,9 @@ * Actually, it has now reverted to Algorithm S, which is "simpler." */ -#pragma weak lsearch = _lsearch +#pragma weak _lsearch = lsearch -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <stddef.h> diff --git a/usr/src/lib/libc/port/gen/madvise.c b/usr/src/lib/libc/port/gen/madvise.c index 4e03d21fd9..240c750ab6 100644 --- a/usr/src/lib/libc/port/gen/madvise.c +++ b/usr/src/lib/libc/port/gen/madvise.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,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" -#pragma weak madvise = _madvise - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/malloc.c b/usr/src/lib/libc/port/gen/malloc.c index 14592dd468..4973aed792 100644 --- a/usr/src/lib/libc/port/gen/malloc.c +++ b/usr/src/lib/libc/port/gen/malloc.c @@ -24,11 +24,11 @@ * 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" + /* * Memory management: malloc(), realloc(), free(). * @@ -60,7 +60,7 @@ * Otherwise, it is always 0. */ -#include "synonyms.h" +#include "lint.h" #include "mallint.h" #include "mtlib.h" diff --git a/usr/src/lib/libc/port/gen/memalign.c b/usr/src/lib/libc/port/gen/memalign.c index 91519da222..a54a10868f 100644 --- a/usr/src/lib/libc/port/gen/memalign.c +++ b/usr/src/lib/libc/port/gen/memalign.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 "mallint.h" #include "mtlib.h" diff --git a/usr/src/lib/libc/port/gen/mkdev.c b/usr/src/lib/libc/port/gen/mkdev.c index 018ab1a3b8..fe804e49f3 100644 --- a/usr/src/lib/libc/port/gen/mkdev.c +++ b/usr/src/lib/libc/port/gen/mkdev.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 <sys/types.h> #include <sys/mkdev.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/mkdtemp.c b/usr/src/lib/libc/port/gen/mkdtemp.c index 9f6abff070..37e60c2b96 100644 --- a/usr/src/lib/libc/port/gen/mkdtemp.c +++ b/usr/src/lib/libc/port/gen/mkdtemp.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. */ @@ -30,10 +30,7 @@ * mkdtemp(3C) - create a directory with a unique name. */ -#pragma weak mkdtemp = _mkdtemp - -#include "synonyms.h" - +#include "lint.h" #include <alloca.h> #include <errno.h> #include <stdlib.h> @@ -48,7 +45,7 @@ mkdtemp(char *template) /* Save template */ (void) strcpy(t, template); - for (; ; ) { + for (;;) { r = mktemp(template); if (*r == '\0') diff --git a/usr/src/lib/libc/port/gen/mkfifo.c b/usr/src/lib/libc/port/gen/mkfifo.c index a11e085968..eb73e03184 100644 --- a/usr/src/lib/libc/port/gen/mkfifo.c +++ b/usr/src/lib/libc/port/gen/mkfifo.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" /* * mkfifo(3c) - create a named pipe (FIFO). This code provides @@ -36,9 +35,9 @@ * */ -#pragma weak mkfifo = _mkfifo +#pragma weak _mkfifo = mkfifo -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/stat.h> diff --git a/usr/src/lib/libc/port/gen/mkstemp.c b/usr/src/lib/libc/port/gen/mkstemp.c index 368319201b..72c79ac47f 100644 --- a/usr/src/lib/libc/port/gen/mkstemp.c +++ b/usr/src/lib/libc/port/gen/mkstemp.c @@ -18,10 +18,13 @@ * * 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. - * + */ + +/* * Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T * All Rights Reserved * @@ -35,17 +38,15 @@ #include <sys/feature_tests.h> #if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak mkstemp64 = _mkstemp64 -#pragma weak mkstemps64 = _mkstemps64 -#define _mkstemp _mkstemp64 -#define _mkstemps _mkstemps64 +#define mkstemp mkstemp64 +#define mkstemps mkstemps64 #define libc_mkstemps libc_mkstemps64 /* prefer unique statics */ +#pragma weak _mkstemp64 = mkstemp64 #else -#pragma weak mkstemp = _mkstemp -#pragma weak mkstemps = _mkstemps +#pragma weak _mkstemp = mkstemp #endif -#include "synonyms.h" +#include "lint.h" #include <sys/fcntl.h> #include <stdlib.h> #include <string.h> @@ -82,7 +83,7 @@ libc_mkstemps(char *as, int slen) * name is used then keep trying until you find a free filename. */ - for (; ; ) { + for (;;) { if (*str == 'X') { /* If no trailing X's don't call mktemp. */ mkret = libc_mktemps(as, slen); if (*mkret == '\0') { @@ -113,13 +114,13 @@ libc_mkstemps(char *as, int slen) } int -_mkstemp(char *as) +mkstemp(char *as) { return (libc_mkstemps(as, 0)); } int -_mkstemps(char *as, int slen) +mkstemps(char *as, int slen) { return (libc_mkstemps(as, slen)); } diff --git a/usr/src/lib/libc/port/gen/mktemp.c b/usr/src/lib/libc/port/gen/mktemp.c index ff6c5b6be8..e8e7105d39 100644 --- a/usr/src/lib/libc/port/gen/mktemp.c +++ b/usr/src/lib/libc/port/gen/mktemp.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" /* * mktemp() expects a string with up to six trailing 'X's. @@ -67,10 +67,11 @@ * sequence number is randomized using the current time. */ +#pragma weak _mktemp = mktemp + #define XCNT 6 -#pragma weak mktemp = _mktemp -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <sys/types.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/mlock.c b/usr/src/lib/libc/port/gen/mlock.c index 6c7d2272e5..10f641dd9d 100644 --- a/usr/src/lib/libc/port/gen/mlock.c +++ b/usr/src/lib/libc/port/gen/mlock.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 mlock = _mlock +#pragma weak _mlock = mlock -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/mlockall.c b/usr/src/lib/libc/port/gen/mlockall.c index ea4ba6db4e..56a4f8ba54 100644 --- a/usr/src/lib/libc/port/gen/mlockall.c +++ b/usr/src/lib/libc/port/gen/mlockall.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 mlockall = _mlockall - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/mman.h> @@ -43,6 +40,5 @@ int mlockall(int flags) { - return (memcntl(0, 0, MC_LOCKAS, (caddr_t)(uintptr_t)flags, 0, 0)); } diff --git a/usr/src/lib/libc/port/gen/mon.c b/usr/src/lib/libc/port/gen/mon.c index 04046133c5..010fc3f1e0 100644 --- a/usr/src/lib/libc/port/gen/mon.c +++ b/usr/src/lib/libc/port/gen/mon.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. */ @@ -48,7 +48,7 @@ * * * Routines: - * (global) _monitor init, cleanup for prof(1)iling + * (global) monitor init, cleanup for prof(1)iling * (global) _mcount function call counter * (global) _mcount_newent call count entry manager * (static) _mnewblock call count block allocator @@ -123,9 +123,9 @@ * */ -#pragma weak monitor = _monitor +#pragma weak _monitor = monitor -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include "libc.h" #include <sys/types.h> @@ -158,7 +158,7 @@ char **___Argv = NULL; /* initialized to argv array by mcrt0 (if loaded) */ * countbase/countlimit are now STATIC! */ static char *countbase; /* addr of next pc,count cell to use in block */ -static char *_countlimit; /* addr lim for cells (addr after last cell) */ +static char *countlimit; /* addr lim for cells (addr after last cell) */ typedef struct anchor ANCHOR; @@ -275,7 +275,7 @@ monitor(int (*alowpc)(void), int (*ahighpc)(void), WORD *buffer, for (; ; n /= 10) { *name++ = pid/n + '0'; if (n == 1) - break; + break; pid %= n; } *name++ = '.'; @@ -316,11 +316,11 @@ monitor(int (*alowpc)(void), int (*ahighpc)(void), WORD *buffer, /* got it - enable use by mcount() */ countbase = (char *)buffer + sizeof (struct hdr); - _countlimit = countbase + (nfunc * sizeof (struct cnt)); + countlimit = countbase + (nfunc * sizeof (struct cnt)); /* (set size of region 3) */ newanchp->histSize = (int) - (bufsize * sizeof (WORD) - (_countlimit - (char *)buffer)); + (bufsize * sizeof (WORD) - (countlimit - (char *)buffer)); /* done w/regions 1 + 2: setup 3 to activate profil processing. */ @@ -474,7 +474,7 @@ _mnewblock(void) /* got it - enable use by mcount() */ countbase = (char *)hdrp + sizeof (struct hdr); - _countlimit = countbase + (THISMANYFCNS * sizeof (struct cnt)); + countlimit = countbase + (THISMANYFCNS * sizeof (struct cnt)); newanchp->histSize = 0; /* (set size of region 3.. to 0) */ @@ -486,7 +486,7 @@ _mnewblock(void) * mcount_newent() -- call to get a new mcount call count entry. * * this function is called by _mcount to get a new call count entry - * (struct cnt, in the region allocated by _monitor()), or to return + * (struct cnt, in the region allocated by monitor()), or to return * zero if profiling is off. * * This function acts as a funnel, an access function to make sure @@ -543,7 +543,7 @@ _mcount_newent(void) if (countbase == 0) return (NULL); - if (countbase >= _countlimit) + if (countbase >= countlimit) _mnewblock(); /* get a new block; set countbase */ if (countbase != 0) { diff --git a/usr/src/lib/libc/port/gen/msync.c b/usr/src/lib/libc/port/gen/msync.c index cf1e29031c..7a174b951c 100644 --- a/usr/src/lib/libc/port/gen/msync.c +++ b/usr/src/lib/libc/port/gen/msync.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 <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/munlock.c b/usr/src/lib/libc/port/gen/munlock.c index 440f0b8ae8..9757df0e41 100644 --- a/usr/src/lib/libc/port/gen/munlock.c +++ b/usr/src/lib/libc/port/gen/munlock.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 munlock = _munlock +#pragma weak _munlock = munlock -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/munlockall.c b/usr/src/lib/libc/port/gen/munlockall.c index 00e484e9d2..55f6a61a77 100644 --- a/usr/src/lib/libc/port/gen/munlockall.c +++ b/usr/src/lib/libc/port/gen/munlockall.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 munlockall = _munlockall - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/ndbm.c b/usr/src/lib/libc/port/gen/ndbm.c index 70a8e5e275..f16af50dee 100644 --- a/usr/src/lib/libc/port/gen/ndbm.c +++ b/usr/src/lib/libc/port/gen/ndbm.c @@ -39,7 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/usr/src/lib/libc/port/gen/nftw.c b/usr/src/lib/libc/port/gen/nftw.c index f4247c2ed2..2deff1dbd4 100644 --- a/usr/src/lib/libc/port/gen/nftw.c +++ b/usr/src/lib/libc/port/gen/nftw.c @@ -20,15 +20,14 @@ */ /* - * 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" /* * nftw - new file tree walk @@ -96,41 +95,6 @@ * */ -#include <sys/feature_tests.h> - -#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak nftw64 = _nftw64 -#define _nftw _nftw64 -#define fstat64 _fstat64 -#define fstatat64 _fstatat64 -#define lstat64 _lstat64 -#define openat64 _openat64 -#define readdir64 _readdir64 -#define stat64 _stat64 -#else -#pragma weak nftw = _nftw -#define fstat _fstat -#define fstatat _fstatat -#define lstat _lstat -#define openat _openat -#define readdir _readdir -#define stat _stat -#endif /* !_LP64 && _FILE_OFFSET_BITS == 64 */ - -#define chdir _chdir -#define close _close -#define closedir _closedir -#define fchdir _fchdir -#define fdopendir _fdopendir -#define fprintf _fprintf -#define getcwd _getcwd -#define opendir _opendir -#define seekdir _seekdir -#define strdup _strdup -#define strerror _strerror -#define strtok_r _strtok_r -#define telldir _telldir - #include "lint.h" #include <mtlib.h> #include <sys/types.h> @@ -148,6 +112,16 @@ #include <strings.h> #include <fcntl.h> +#if !defined(_LP64) && _FILE_OFFSET_BITS == 64 +#define nftw nftw64 +#define stat stat64 +#define fstat fstat64 +#define fstatat fstatat64 +#pragma weak _nftw64 = nftw64 +#else +#pragma weak _nftw = nftw +#endif /* !_LP64 && _FILE_OFFSET_BITS == 64 */ + #ifndef PATH_MAX #define PATH_MAX 1023 #endif @@ -518,7 +492,7 @@ quit: } int -_nftw(const char *path, +nftw(const char *path, int (*fn)(const char *, const struct stat *, int, struct FTW *), int depth, int flags) { diff --git a/usr/src/lib/libc/port/gen/nlspath_checks.c b/usr/src/lib/libc/port/gen/nlspath_checks.c index 5261031af0..94d998693c 100644 --- a/usr/src/lib/libc/port/gen/nlspath_checks.c +++ b/usr/src/lib/libc/port/gen/nlspath_checks.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 "mtlib.h" #include <string.h> #include <syslog.h> @@ -149,7 +149,7 @@ nls_safe_open(const char *path, struct stat64 *statbuf, int *trust, int safe) */ if ((statbuf->st_mode & (S_IWOTH)) == 0 && ((statbuf->st_mode & (S_IWGRP)) == 0 || - (statbuf->st_gid < 4 && statbuf->st_gid != 1))) { + (statbuf->st_gid < 4 && statbuf->st_gid != 1))) { trust_group = 1; } @@ -464,7 +464,7 @@ done: } #ifdef DEBUG for (t = 0; t < maxarg * FORMAT_SIZE; t += FORMAT_SIZE) { - printf("%c(%d)", norm[t], norm[t+1]); + printf("%c(%d)", norm[t], norm[t+1]); } putchar('\n'); #endif @@ -610,6 +610,11 @@ clean_env(void) { const char **p; + if (environ == NULL) { /* can't happen? */ + nlspath_safe = 1; + return; + } + /* Find the first NLSPATH occurrence */ for (p = environ; *p; p++) if (**p == 'N' && nvmatch("NLSPATH", *p) != NULL) diff --git a/usr/src/lib/libc/port/gen/nsparse.c b/usr/src/lib/libc/port/gen/nsparse.c index 6af1f25278..57c07a7841 100644 --- a/usr/src/lib/libc/port/gen/nsparse.c +++ b/usr/src/lib/libc/port/gen/nsparse.c @@ -18,14 +18,15 @@ * * 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" -#include "synonyms.h" +#include "lint.h" #include "file64.h" #include "mtlib.h" #include "libc.h" @@ -121,8 +122,7 @@ static void set_dns_default_lkp(struct __nsw_lookup_v1 *lkp) { if (strcasecmp(lkp->service_name, "dns") == 0) { - lkp->actions[__NSW_TRYAGAIN] = - __NSW_TRYAGAIN_NTIMES; + lkp->actions[__NSW_TRYAGAIN] = __NSW_TRYAGAIN_NTIMES; lkp->max_retries = dns_tryagain_retry; } } diff --git a/usr/src/lib/libc/port/gen/nss_common.c b/usr/src/lib/libc/port/gen/nss_common.c index 6f24fac496..c4d033a141 100644 --- a/usr/src/lib/libc/port/gen/nss_common.c +++ b/usr/src/lib/libc/port/gen/nss_common.c @@ -30,13 +30,7 @@ * Shared code used by the name-service-switch frontends (e.g. getpwnam_r()) */ -#pragma weak nss_delete = _nss_delete -#pragma weak nss_endent = _nss_endent -#pragma weak nss_getent = _nss_getent -#pragma weak nss_search = _nss_search -#pragma weak nss_setent = _nss_setent - -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <dlfcn.h> #include <atomic.h> diff --git a/usr/src/lib/libc/port/gen/nss_dbdefs.c b/usr/src/lib/libc/port/gen/nss_dbdefs.c index b77b507fe0..9dd9193fc9 100644 --- a/usr/src/lib/libc/port/gen/nss_dbdefs.c +++ b/usr/src/lib/libc/port/gen/nss_dbdefs.c @@ -26,7 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <ctype.h> #include <stdio.h> diff --git a/usr/src/lib/libc/port/gen/nss_deffinder.c b/usr/src/lib/libc/port/gen/nss_deffinder.c index 7620512646..8ba91e9592 100644 --- a/usr/src/lib/libc/port/gen/nss_deffinder.c +++ b/usr/src/lib/libc/port/gen/nss_deffinder.c @@ -18,8 +18,9 @@ * * 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. */ @@ -35,9 +36,9 @@ /* Allow our finder(s) to be overridden by user-supplied ones */ -#pragma weak nss_default_finders = _nss_default_finders +#pragma weak _nss_default_finders = nss_default_finders -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <nss_common.h> #include <dlfcn.h> @@ -98,4 +99,4 @@ static nss_backend_finder_t SO_per_src = { 0 }; -nss_backend_finder_t *_nss_default_finders = &SO_per_src; +nss_backend_finder_t *nss_default_finders = &SO_per_src; diff --git a/usr/src/lib/libc/port/gen/opendir.c b/usr/src/lib/libc/port/gen/opendir.c index ca5b93b3ac..402fa76d62 100644 --- a/usr/src/lib/libc/port/gen/opendir.c +++ b/usr/src/lib/libc/port/gen/opendir.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * opendir -- C library extension routine * @@ -37,9 +37,9 @@ * while holding internal libc locks. */ -#pragma weak opendir = _opendir +#pragma weak _opendir = opendir -#include "synonyms.h" +#include "lint.h" #include <dirent.h> #include <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/opt_data.c b/usr/src/lib/libc/port/gen/opt_data.c index 54359fd957..09fc5c4a39 100644 --- a/usr/src/lib/libc/port/gen/opt_data.c +++ b/usr/src/lib/libc/port/gen/opt_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,23 +18,23 @@ * * 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" /* * Global variables * used in getopt */ -#include "synonyms.h" +#include "lint.h" int opterr = 1; int optind = 1; diff --git a/usr/src/lib/libc/port/gen/perror.c b/usr/src/lib/libc/port/gen/perror.c index 933bdc18cb..7f120935c8 100644 --- a/usr/src/lib/libc/port/gen/perror.c +++ b/usr/src/lib/libc/port/gen/perror.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 "_libc_gettext.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/pfmt.c b/usr/src/lib/libc/port/gen/pfmt.c index 51866bac20..a89e6739ec 100644 --- a/usr/src/lib/libc/port/gen/pfmt.c +++ b/usr/src/lib/libc/port/gen/pfmt.c @@ -18,19 +18,20 @@ * * 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 weak pfmt = _pfmt +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _pfmt = pfmt -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <pfmt.h> #include <stdio.h> diff --git a/usr/src/lib/libc/port/gen/pfmt_print.c b/usr/src/lib/libc/port/gen/pfmt_print.c index 3b8d3e4280..342346cf3b 100644 --- a/usr/src/lib/libc/port/gen/pfmt_print.c +++ b/usr/src/lib/libc/port/gen/pfmt_print.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,21 @@ * * 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" /* * pfmt_print() - format and print */ -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <pfmt.h> #include <stdio.h> @@ -74,7 +73,7 @@ __pfmt_print(FILE *stream, long flag, const char *format, char c; ptr = format; for (i = 0; i < DB_NAME_LEN - 1 && (c = *ptr++) && c != ':'; - i++) + i++) catbuf[i] = c; /* Extract the message number */ if (i != DB_NAME_LEN - 1 && c) { diff --git a/usr/src/lib/libc/port/gen/plock.c b/usr/src/lib/libc/port/gen/plock.c index 92d2144422..1fb0367f1f 100644 --- a/usr/src/lib/libc/port/gen/plock.c +++ b/usr/src/lib/libc/port/gen/plock.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. */ @@ -32,9 +32,8 @@ * Supports SVID-compatible plock, taking into account dynamically linked * objects (such as shared libraries). */ -#pragma weak plock = _plock -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/poll.c b/usr/src/lib/libc/port/gen/poll.c index 0f18d7fddf..e186a30b12 100644 --- a/usr/src/lib/libc/port/gen/poll.c +++ b/usr/src/lib/libc/port/gen/poll.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,17 @@ * * 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" -#pragma weak poll = _poll +#pragma weak _poll = poll -#include "synonyms.h" +#include "lint.h" #include <sys/time.h> #include <sys/poll.h> #include "libc.h" diff --git a/usr/src/lib/libc/port/gen/priocntl.c b/usr/src/lib/libc/port/gen/priocntl.c index 2f76e857f1..71bf943b40 100644 --- a/usr/src/lib/libc/port/gen/priocntl.c +++ b/usr/src/lib/libc/port/gen/priocntl.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 <sys/types.h> #include <sys/procset.h> #include <sys/priocntl.h> diff --git a/usr/src/lib/libc/port/gen/priv_str_xlate.c b/usr/src/lib/libc/port/gen/priv_str_xlate.c index 36f7a7d7e5..763665c492 100644 --- a/usr/src/lib/libc/port/gen/priv_str_xlate.c +++ b/usr/src/lib/libc/port/gen/priv_str_xlate.c @@ -18,8 +18,9 @@ * * 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. */ @@ -29,11 +30,11 @@ * priv_str_xlate.c - Privilege translation routines. */ -#pragma weak priv_str_to_set = _priv_str_to_set -#pragma weak priv_set_to_str = _priv_set_to_str -#pragma weak priv_gettext = _priv_gettext +#pragma weak _priv_str_to_set = priv_str_to_set +#pragma weak _priv_set_to_str = priv_set_to_str +#pragma weak _priv_gettext = priv_gettext -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <stdlib.h> #include <ctype.h> @@ -400,7 +401,7 @@ do_priv_gettext(const char *priv, const char *file) /* Remove leading white space */ tstart = lp; while (*tstart != '\0' && - isspace((unsigned char)*tstart)) { + isspace((unsigned char)*tstart)) { tstart++; } diff --git a/usr/src/lib/libc/port/gen/privlib.c b/usr/src/lib/libc/port/gen/privlib.c index 57218876bc..911df6e1af 100644 --- a/usr/src/lib/libc/port/gen/privlib.c +++ b/usr/src/lib/libc/port/gen/privlib.c @@ -20,36 +20,36 @@ */ /* - * 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" /* TSOL 8 */ - -#pragma weak getprivimplinfo = _getprivimplinfo -#pragma weak priv_addset = _priv_addset -#pragma weak priv_allocset = _priv_allocset -#pragma weak priv_copyset = _priv_copyset -#pragma weak priv_delset = _priv_delset -#pragma weak priv_emptyset = _priv_emptyset -#pragma weak priv_fillset = _priv_fillset -#pragma weak priv_freeset = _priv_freeset -#pragma weak priv_getbyname = _priv_getbyname -#pragma weak priv_getbynum = _priv_getbynum -#pragma weak priv_getsetbyname = _priv_getsetbyname -#pragma weak priv_getsetbynum = _priv_getsetbynum -#pragma weak priv_ineffect = _priv_ineffect -#pragma weak priv_intersect = _priv_intersect -#pragma weak priv_inverse = _priv_inverse -#pragma weak priv_isemptyset = _priv_isemptyset -#pragma weak priv_isequalset = _priv_isequalset -#pragma weak priv_isfullset = _priv_isfullset -#pragma weak priv_ismember = _priv_ismember -#pragma weak priv_issubset = _priv_issubset -#pragma weak priv_set = _priv_set -#pragma weak priv_union = _priv_union - -#include "synonyms.h" +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _getprivimplinfo = getprivimplinfo +#pragma weak _priv_addset = priv_addset +#pragma weak _priv_allocset = priv_allocset +#pragma weak _priv_copyset = priv_copyset +#pragma weak _priv_delset = priv_delset +#pragma weak _priv_emptyset = priv_emptyset +#pragma weak _priv_fillset = priv_fillset +#pragma weak _priv_freeset = priv_freeset +#pragma weak _priv_getbyname = priv_getbyname +#pragma weak _priv_getbynum = priv_getbynum +#pragma weak _priv_getsetbyname = priv_getsetbyname +#pragma weak _priv_getsetbynum = priv_getsetbynum +#pragma weak _priv_ineffect = priv_ineffect +#pragma weak _priv_intersect = priv_intersect +#pragma weak _priv_inverse = priv_inverse +#pragma weak _priv_isemptyset = priv_isemptyset +#pragma weak _priv_isequalset = priv_isequalset +#pragma weak _priv_isfullset = priv_isfullset +#pragma weak _priv_ismember = priv_ismember +#pragma weak _priv_issubset = priv_issubset +#pragma weak _priv_set = priv_set +#pragma weak _priv_union = priv_union + +#include "lint.h" #define _STRUCTURED_PROC 1 @@ -193,7 +193,7 @@ __priv_parse_info(priv_impl_info_t *ip) tmparr[i].name = tmp->pd_privnames[i]; } qsort(tmparr, tmp->pd_nprivs, sizeof (struct strint), - strintcmp); + strintcmp); for (i = 0; i < tmp->pd_nprivs; i++) tmp->pd_setsort[i] = tmparr[i].rank; libc_free(tmparr); @@ -272,8 +272,8 @@ refresh_data(void) /* copy the extra information to the old datastructure */ (void) memcpy((char *)privdata->pd_pinfo + sizeof (priv_impl_info_t), - (char *)ip + sizeof (priv_impl_info_t), - PRIV_IMPL_INFO_SIZE(ip) - sizeof (priv_impl_info_t)); + (char *)ip + sizeof (priv_impl_info_t), + PRIV_IMPL_INFO_SIZE(ip) - sizeof (priv_impl_info_t)); /* Copy the first oldn pointers */ (void) memcpy(tmp->pd_privnames, privdata->pd_privnames, @@ -369,7 +369,7 @@ out: } const priv_impl_info_t * -_getprivimplinfo(void) +getprivimplinfo(void) { priv_data_t *d; @@ -430,7 +430,7 @@ priv_set(priv_op_t op, priv_ptype_t setname, ...) for (set = 0; set < d->pd_nsets; set++) if ((ret = syscall(SYS_privsys, PRIVSYS_SETPPRIV, op, - set, (void *)pset, d->pd_setsize)) != 0) + set, (void *)pset, d->pd_setsize)) != 0) break; } else { ret = setppriv(op, setname, pset); @@ -932,7 +932,7 @@ boolean_t __priv_issubset(priv_data_t *d, const priv_set_t *a, const priv_set_t *b) { PRIV_TEST_BODY_D(d, (((priv_chunk_t *)a)[i] | ((priv_chunk_t *)b)[i]) == - ((priv_chunk_t *)b)[i]); + ((priv_chunk_t *)b)[i]); } boolean_t diff --git a/usr/src/lib/libc/port/gen/psiginfo.c b/usr/src/lib/libc/port/gen/psiginfo.c index 316b5ea7b5..1675db36ee 100644 --- a/usr/src/lib/libc/port/gen/psiginfo.c +++ b/usr/src/lib/libc/port/gen/psiginfo.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,32 +18,30 @@ * * 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" /* * Print the name of the siginfo indicated by "sig", along with the * supplied message */ -#pragma weak psiginfo = _psiginfo - -#include "synonyms.h" -#include "_libc_gettext.h" -#include <sys/types.h> -#include <stdio.h> -#include <unistd.h> -#include <string.h> -#include <signal.h> -#include <siginfo.h> +#include "lint.h" +#include "_libc_gettext.h" +#include <sys/types.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <siginfo.h> #define strsignal(i) (_libc_gettext(_sys_siglistp[i])) @@ -60,10 +57,9 @@ psiginfo(siginfo_t *sip, char *s) if (sip->si_code <= 0) { - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), - _libc_gettext("%s : %s ( from process %d )\n"), - s, strsignal(sip->si_signo), sip->si_pid); + _libc_gettext("%s : %s ( from process %d )\n"), + s, strsignal(sip->si_signo), sip->si_pid); } else if (((listp = &_sys_siginfolist[sip->si_signo-1]) != NULL) && sip->si_code <= listp->nsiginfo) { c = _libc_gettext(listp->vsiginfo[sip->si_code-1]); @@ -72,24 +68,21 @@ psiginfo(siginfo_t *sip, char *s) case SIGBUS: case SIGILL: case SIGFPE: - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), - _libc_gettext("%s : %s ( [%p] %s)\n"), - s, strsignal(sip->si_signo), - sip->si_addr, c); + _libc_gettext("%s : %s ( [%p] %s)\n"), + s, strsignal(sip->si_signo), + sip->si_addr, c); break; default: - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), - _libc_gettext("%s : %s (%s)\n"), - s, strsignal(sip->si_signo), c); + _libc_gettext("%s : %s (%s)\n"), + s, strsignal(sip->si_signo), c); break; } } else { - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), - _libc_gettext("%s : %s\n"), - s, strsignal(sip->si_signo)); + _libc_gettext("%s : %s\n"), + s, strsignal(sip->si_signo)); } (void) write(2, buf, strlen(buf)); } diff --git a/usr/src/lib/libc/port/gen/psignal.c b/usr/src/lib/libc/port/gen/psignal.c index 8682b210d2..201beaacd7 100644 --- a/usr/src/lib/libc/port/gen/psignal.c +++ b/usr/src/lib/libc/port/gen/psignal.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. */ @@ -44,16 +44,16 @@ * supplied message */ -#pragma weak psignal = _psignal +#pragma weak _psignal = psignal -#include "synonyms.h" -#include "_libc_gettext.h" -#include <sys/types.h> -#include <stdio.h> -#include <unistd.h> -#include <string.h> -#include <signal.h> -#include <siginfo.h> +#include "lint.h" +#include "_libc_gettext.h" +#include <sys/types.h> +#include <stdio.h> +#include <unistd.h> +#include <string.h> +#include <signal.h> +#include <siginfo.h> #define strsignal(i) (_libc_gettext(_sys_siglistp[i])) diff --git a/usr/src/lib/libc/port/gen/pt.c b/usr/src/lib/libc/port/gen/pt.c index f3ba9ee922..26dd4dd376 100644 --- a/usr/src/lib/libc/port/gen/pt.c +++ b/usr/src/lib/libc/port/gen/pt.c @@ -20,21 +20,20 @@ */ /* - * 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 weak ptsname = _ptsname -#pragma weak grantpt = _grantpt -#pragma weak unlockpt = _unlockpt -#pragma weak posix_openpt = _posix_openpt +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _ptsname = ptsname +#pragma weak _grantpt = grantpt +#pragma weak _unlockpt = unlockpt -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include "mtlib.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/putpwent.c b/usr/src/lib/libc/port/gen/putpwent.c index 805daefce6..efc482c7f4 100644 --- a/usr/src/lib/libc/port/gen/putpwent.c +++ b/usr/src/lib/libc/port/gen/putpwent.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,22 +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" /* * format a password file entry */ -#pragma weak putpwent = _putpwent -#include "synonyms.h" + +#include "lint.h" #include <sys/types.h> #include <stdio.h> #include <pwd.h> @@ -52,16 +51,16 @@ putpwent(const struct passwd *p, FILE *f) /* leading "+/-" taken from getpwnam_r.c */ if (black_magic) { (void) fprintf(f, ":::%s:%s:%s", - p->pw_gecos ? p->pw_gecos : "", - p->pw_dir ? p->pw_dir : "", - p->pw_shell ? p->pw_shell : ""); + p->pw_gecos ? p->pw_gecos : "", + p->pw_dir ? p->pw_dir : "", + p->pw_shell ? p->pw_shell : ""); } else { /* "normal case" */ (void) fprintf(f, ":%d:%d:%s:%s:%s", - p->pw_uid, - p->pw_gid, - p->pw_gecos, - p->pw_dir, - p->pw_shell); + p->pw_uid, + p->pw_gid, + p->pw_gecos, + p->pw_dir, + p->pw_shell); } (void) putc('\n', f); (void) fflush(f); diff --git a/usr/src/lib/libc/port/gen/putspent.c b/usr/src/lib/libc/port/gen/putspent.c index 9a49c7a773..fded4a495a 100644 --- a/usr/src/lib/libc/port/gen/putspent.c +++ b/usr/src/lib/libc/port/gen/putspent.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" /* * format a shadow file entry @@ -36,9 +35,7 @@ * This code used to live in getspent.c */ -#pragma weak putspent = _putspent - -#include "synonyms.h" +#include "lint.h" #include <stdio.h> #include <shadow.h> @@ -46,7 +43,7 @@ int putspent(const struct spwd *p, FILE *f) { (void) fprintf(f, "%s:%s:", p->sp_namp, - p->sp_pwdp ? p->sp_pwdp : ""); + p->sp_pwdp ? p->sp_pwdp : ""); /* pwdp could be null for +/- entries */ if (p->sp_lstchg >= 0) (void) fprintf(f, "%d:", p->sp_lstchg); diff --git a/usr/src/lib/libc/port/gen/raise.c b/usr/src/lib/libc/port/gen/raise.c index 2fe8ab6806..524664a555 100644 --- a/usr/src/lib/libc/port/gen/raise.c +++ b/usr/src/lib/libc/port/gen/raise.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 <sys/types.h> #include <signal.h> #include <unistd.h> @@ -44,7 +43,7 @@ raise(int sig) { int error; - if ((error = _thr_kill(_thr_self(), sig)) != 0) { + if ((error = thr_kill(thr_self(), sig)) != 0) { errno = error; return (-1); } diff --git a/usr/src/lib/libc/port/gen/rand.c b/usr/src/lib/libc/port/gen/rand.c index 2ffa592b36..041f5d86e4 100644 --- a/usr/src/lib/libc/port/gen/rand.c +++ b/usr/src/lib/libc/port/gen/rand.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 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -39,9 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak rand_r = _rand_r - -#include "synonyms.h" +#include "lint.h" #include "thr_uberdata.h" #include <stdlib.h> #include <atomic.h> diff --git a/usr/src/lib/libc/port/gen/random.c b/usr/src/lib/libc/port/gen/random.c index 9dd74e5e38..a0fe8c4fe3 100644 --- a/usr/src/lib/libc/port/gen/random.c +++ b/usr/src/lib/libc/port/gen/random.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 2005 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 <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/rctlops.c b/usr/src/lib/libc/port/gen/rctlops.c index f8d67e2f4b..c61eb8ec41 100644 --- a/usr/src/lib/libc/port/gen/rctlops.c +++ b/usr/src/lib/libc/port/gen/rctlops.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,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 <sys/rctl_impl.h> #include <stdlib.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/readdir.c b/usr/src/lib/libc/port/gen/readdir.c index 9b392e6c89..faa863380e 100644 --- a/usr/src/lib/libc/port/gen/readdir.c +++ b/usr/src/lib/libc/port/gen/readdir.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -46,11 +46,11 @@ #include <sys/feature_tests.h> #if !defined(_LP64) -#pragma weak readdir64 = _readdir64 +#pragma weak _readdir64 = readdir64 #endif -#pragma weak readdir = _readdir +#pragma weak _readdir = readdir -#include "synonyms.h" +#include "lint.h" #include <dirent.h> #include <limits.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/readdir_r.c b/usr/src/lib/libc/port/gen/readdir_r.c index 8b4f3758c4..b95bac475c 100644 --- a/usr/src/lib/libc/port/gen/readdir_r.c +++ b/usr/src/lib/libc/port/gen/readdir_r.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * readdir_r -- C library extension routine */ @@ -36,11 +36,10 @@ #include <sys/feature_tests.h> #if !defined(_LP64) -#pragma weak readdir64_r = _readdir64_r +#pragma weak _readdir64_r = readdir64_r #endif -#pragma weak readdir_r = _readdir_r -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <mtlib.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/realpath.c b/usr/src/lib/libc/port/gen/realpath.c index 4da4d7a557..08223f8f5c 100644 --- a/usr/src/lib/libc/port/gen/realpath.c +++ b/usr/src/lib/libc/port/gen/realpath.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 realpath = _realpath - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <dirent.h> #include <sys/param.h> diff --git a/usr/src/lib/libc/port/gen/reboot.c b/usr/src/lib/libc/port/gen/reboot.c index 77402fa502..fd63668559 100644 --- a/usr/src/lib/libc/port/gen/reboot.c +++ b/usr/src/lib/libc/port/gen/reboot.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 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) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -/* Portions Copyright(c) 1988, Sun Microsystems Inc. */ -/* All Rights Reserved */ - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/uadmin.h> #include <sys/reboot.h> diff --git a/usr/src/lib/libc/port/gen/regexpr.c b/usr/src/lib/libc/port/gen/regexpr.c index 44afcdc9e0..efa3c2e0f0 100644 --- a/usr/src/lib/libc/port/gen/regexpr.c +++ b/usr/src/lib/libc/port/gen/regexpr.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) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * routines to do regular expression matching @@ -95,7 +94,7 @@ * regular expression encountered. */ -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> #include <re_comp.h> @@ -303,10 +302,10 @@ re_exec(const char *p1) /* * regular algorithm */ - do + do { if (rv = advance(p1, p2)) return (rv); - while (*p1++); + } while (*p1++); return (0); } diff --git a/usr/src/lib/libc/port/gen/remove.c b/usr/src/lib/libc/port/gen/remove.c index bf76e3824b..db18a89e24 100644 --- a/usr/src/lib/libc/port/gen/remove.c +++ b/usr/src/lib/libc/port/gen/remove.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 <sys/types.h> #include <sys/stat.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/rewinddir.c b/usr/src/lib/libc/port/gen/rewinddir.c index e87634f140..e8964049e5 100644 --- a/usr/src/lib/libc/port/gen/rewinddir.c +++ b/usr/src/lib/libc/port/gen/rewinddir.c @@ -20,26 +20,27 @@ */ /* - * 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" + /* * rewinddir -- C library extension routine */ -#pragma weak rewinddir = _rewinddir +#pragma weak _rewinddir = rewinddir -#include "synonyms.h" +#include "lint.h" #include <dirent.h> +#undef rewinddir void -_rewinddir(DIR *dirp) +rewinddir(DIR *dirp) { (void) seekdir(dirp, 0L); } diff --git a/usr/src/lib/libc/port/gen/rindex.c b/usr/src/lib/libc/port/gen/rindex.c index 2057823dc6..05947571ef 100644 --- a/usr/src/lib/libc/port/gen/rindex.c +++ b/usr/src/lib/libc/port/gen/rindex.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. */ @@ -39,7 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <string.h> diff --git a/usr/src/lib/libc/port/gen/scandir.c b/usr/src/lib/libc/port/gen/scandir.c index 87ad989bcd..ec425e0466 100644 --- a/usr/src/lib/libc/port/gen/scandir.c +++ b/usr/src/lib/libc/port/gen/scandir.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. */ @@ -52,14 +52,14 @@ #include <sys/feature_tests.h> -#pragma weak scandir = _scandir -#pragma weak alphasort = _alphasort +#pragma weak _scandir = scandir +#pragma weak _alphasort = alphasort #if !defined(_LP64) -#pragma weak scandir64 = _scandir64 -#pragma weak alphasort64 = _alphasort64 +#pragma weak _scandir64 = scandir64 +#pragma weak _alphasort64 = alphasort64 #endif -#include "synonyms.h" +#include "lint.h" #include <dirent.h> #include <errno.h> #include <sys/types.h> @@ -138,7 +138,7 @@ scandir64(const char *dirname, struct dirent64 *(*namelist[]), (void) closedir(dirp); if (nitems && dcomp != NULL) qsort(names, nitems, sizeof (struct dirent64 *), - (int(*)(const void *, const void *))dcomp); + (int(*)(const void *, const void *))dcomp); *namelist = names; return ((int)nitems); @@ -211,7 +211,7 @@ scandir(const char *dirname, struct dirent *(*namelist[]), } arraysz += 512; /* no science here */ tmp = realloc(names, - arraysz * sizeof (struct dirent *)); + arraysz * sizeof (struct dirent *)); if (tmp == NULL) { free(p); goto fail; @@ -223,7 +223,7 @@ scandir(const char *dirname, struct dirent *(*namelist[]), (void) closedir(dirp); if (nitems && dcomp != NULL) qsort(names, nitems, sizeof (struct dirent *), - (int(*)(const void *, const void *))dcomp); + (int(*)(const void *, const void *))dcomp); *namelist = names; return ((int)nitems); diff --git a/usr/src/lib/libc/port/gen/seekdir.c b/usr/src/lib/libc/port/gen/seekdir.c index 96f550f86d..c10700d759 100644 --- a/usr/src/lib/libc/port/gen/seekdir.c +++ b/usr/src/lib/libc/port/gen/seekdir.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * seekdir -- C library extension routine */ @@ -36,11 +36,11 @@ #include <sys/feature_tests.h> #if !defined(_LP64) -#pragma weak seekdir64 = _seekdir64 +#pragma weak _seekdir64 = seekdir64 #endif -#pragma weak seekdir = _seekdir +#pragma weak _seekdir = seekdir -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <mtlib.h> #include <dirent.h> diff --git a/usr/src/lib/libc/port/gen/select.c b/usr/src/lib/libc/port/gen/select.c index d01908d0a0..ed39ba9efb 100644 --- a/usr/src/lib/libc/port/gen/select.c +++ b/usr/src/lib/libc/port/gen/select.c @@ -24,11 +24,11 @@ * 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" + /* * Emulation of select() system call using poll() system call. * @@ -39,13 +39,11 @@ * Note that is it not feasible to emulate all error conditions, * in particular conditions that would return EFAULT are far too * difficult to check for in a library routine. - * */ -#pragma weak pselect = _pselect -#pragma weak select = _select +#pragma weak _select = select -#include "synonyms.h" +#include "lint.h" #include <values.h> #include <pthread.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/select_large_fdset.c b/usr/src/lib/libc/port/gen/select_large_fdset.c index 364b25d365..4411d38d58 100644 --- a/usr/src/lib/libc/port/gen/select_large_fdset.c +++ b/usr/src/lib/libc/port/gen/select_large_fdset.c @@ -24,11 +24,11 @@ * 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" + /* * Emulation of select() system call using _pollsys() system call. * @@ -52,15 +52,7 @@ #endif #define FD_SETSIZE 65536 -/* - * We do not #redefine the name since the only users of this - * are external to the libraries and commands. - * - * #pragma weak pselect_large_fdset = _pselect_large_fdset - * #pragma weak select_large_fdset = _select_large_fdset - */ - -#include "synonyms.h" +#include "lint.h" #include <values.h> #include <stdlib.h> #include <string.h> @@ -170,7 +162,7 @@ pselect_large_fdset(int nfds, fd_set *in0, fd_set *out0, fd_set *ex0, &nfds_on_list, &pfd_list, pfd)) == NULL) { if (pfd_list != pfd) - (void) free(pfd_list); + free(pfd_list); pthread_testcancel(); return (-1); } @@ -193,7 +185,7 @@ done: if (rv < 0) { /* no need to set bit masks */ if (pfd_list != pfd) - (void) free(pfd_list); + free(pfd_list); return (rv); } else if (rv == 0) { /* @@ -217,7 +209,7 @@ done: *ex++ = 0; } if (pfd_list != pfd) - (void) free(pfd_list); + free(pfd_list); return (0); } @@ -237,7 +229,7 @@ done: if (p->revents & POLLNVAL) { errno = EBADF; if (pfd_list != pfd) - (void) free(pfd_list); + free(pfd_list); return (-1); } /* @@ -336,7 +328,7 @@ done: } } if (pfd_list != pfd) - (void) free(pfd_list); + free(pfd_list); return (rv); } @@ -391,7 +383,7 @@ realloc_fds(int *num, struct pollfd **list_head, struct pollfd *orig) (void) memset(b, 0, (size_t)nta); (void) memcpy(b, *list_head, nta / 2); if (*list_head != orig) - (void) free(*list_head); + free(*list_head); *list_head = b; b += *num; *num = n2; diff --git a/usr/src/lib/libc/port/gen/setlabel.c b/usr/src/lib/libc/port/gen/setlabel.c index f1b310bfa8..927f7aa28d 100644 --- a/usr/src/lib/libc/port/gen/setlabel.c +++ b/usr/src/lib/libc/port/gen/setlabel.c @@ -18,19 +18,20 @@ * * 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 weak setlabel = _setlabel +#pragma ident "%Z%%M% %I% %E% SMI" + +#pragma weak _setlabel = setlabel -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <pfmt.h> #include <thread.h> diff --git a/usr/src/lib/libc/port/gen/setpriority.c b/usr/src/lib/libc/port/gen/setpriority.c index d737c2ca19..a26d28771f 100644 --- a/usr/src/lib/libc/port/gen/setpriority.c +++ b/usr/src/lib/libc/port/gen/setpriority.c @@ -39,8 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" - +#include "lint.h" #include <string.h> #include <limits.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/settimeofday.c b/usr/src/lib/libc/port/gen/settimeofday.c index 9df93a47bd..466933d7cc 100644 --- a/usr/src/lib/libc/port/gen/settimeofday.c +++ b/usr/src/lib/libc/port/gen/settimeofday.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 settimeofday = _settimeofday - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/time.h> #include <stdio.h> @@ -53,8 +50,7 @@ settimeofday(struct timeval *tp, void *tzp) if (tp == NULL) return (0); - if (tp->tv_sec < 0 || tp->tv_usec < 0 || - tp->tv_usec >= MICROSEC) { + if (tp->tv_sec < 0 || tp->tv_usec < 0 || tp->tv_usec >= MICROSEC) { errno = EINVAL; return (-1); } diff --git a/usr/src/lib/libc/port/gen/sh_locks.c b/usr/src/lib/libc/port/gen/sh_locks.c index b086da6530..6583efbc9c 100644 --- a/usr/src/lib/libc/port/gen/sh_locks.c +++ b/usr/src/lib/libc/port/gen/sh_locks.c @@ -26,7 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <synch.h> diff --git a/usr/src/lib/libc/port/gen/sigflag.c b/usr/src/lib/libc/port/gen/sigflag.c index b11f055dca..b0f05f477e 100644 --- a/usr/src/lib/libc/port/gen/sigflag.c +++ b/usr/src/lib/libc/port/gen/sigflag.c @@ -20,20 +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 */ -/* change state of signal flag */ +#pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak sigflag = _sigflag +/* change state of signal flag */ -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/siglist.c b/usr/src/lib/libc/port/gen/siglist.c index f2608da362..b75381a145 100644 --- a/usr/src/lib/libc/port/gen/siglist.c +++ b/usr/src/lib/libc/port/gen/siglist.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. */ @@ -39,7 +39,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/sigsend.c b/usr/src/lib/libc/port/gen/sigsend.c index e23ee0c5fe..3a781e91ca 100644 --- a/usr/src/lib/libc/port/gen/sigsend.c +++ b/usr/src/lib/libc/port/gen/sigsend.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 sigsend = _sigsend +#pragma weak _sigsend = sigsend -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/procset.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/sigsetops.c b/usr/src/lib/libc/port/gen/sigsetops.c index 6b273de06e..b9862220fb 100644 --- a/usr/src/lib/libc/port/gen/sigsetops.c +++ b/usr/src/lib/libc/port/gen/sigsetops.c @@ -24,25 +24,24 @@ * 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" + /* * POSIX signal manipulation functions. */ -#pragma weak sigfillset = _sigfillset -#pragma weak sigemptyset = _sigemptyset -#pragma weak sigaddset = _sigaddset -#pragma weak sigdelset = _sigdelset -#pragma weak sigismember = _sigismember +#pragma weak _sigfillset = sigfillset +#pragma weak _sigemptyset = sigemptyset +#pragma weak _sigaddset = sigaddset +#pragma weak _sigdelset = sigdelset +#pragma weak _sigismember = sigismember -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdio.h> #include <sys/param.h> -#include <sys/errno.h> #include <sys/signal.h> #include <errno.h> #include "libc.h" diff --git a/usr/src/lib/libc/port/gen/ssignal.c b/usr/src/lib/libc/port/gen/ssignal.c index e00e556169..6030626b17 100644 --- a/usr/src/lib/libc/port/gen/ssignal.c +++ b/usr/src/lib/libc/port/gen/ssignal.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" /* * ssignal, gsignal: software signals */ -#pragma weak gsignal = _gsignal -#pragma weak ssignal = _ssignal -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/stack.c b/usr/src/lib/libc/port/gen/stack.c index 6b1e314e8a..317c926b1e 100644 --- a/usr/src/lib/libc/port/gen/stack.c +++ b/usr/src/lib/libc/port/gen/stack.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,20 +31,20 @@ /* * Initialization of the main stack is performed in libc_init(). - * Initialization of thread stacks is performed in _thr_setup(). + * Initialization of thread stacks is performed in _thrp_setup(). */ -#pragma weak stack_getbounds = _stack_getbounds +#pragma weak _stack_getbounds = stack_getbounds int -_stack_getbounds(stack_t *sp) +stack_getbounds(stack_t *sp) { *sp = curthread->ul_ustack; return (0); } -#pragma weak stack_setbounds = _stack_setbounds +#pragma weak _stack_setbounds = stack_setbounds int -_stack_setbounds(const stack_t *sp) +stack_setbounds(const stack_t *sp) { ulwp_t *self = curthread; @@ -69,9 +69,9 @@ _stack_setbounds(const stack_t *sp) * 0 addr is outside of the bounds of the current stack * Note that addr is an unbiased value. */ -#pragma weak stack_inbounds = _stack_inbounds +#pragma weak _stack_inbounds = stack_inbounds int -_stack_inbounds(void *addr) +stack_inbounds(void *addr) { stack_t *ustackp = &curthread->ul_ustack; uintptr_t base = (uintptr_t)ustackp->ss_sp; @@ -80,9 +80,9 @@ _stack_inbounds(void *addr) return ((uintptr_t)addr >= base && (uintptr_t)addr < base + size); } -#pragma weak stack_violation = _stack_violation +#pragma weak _stack_violation = stack_violation int -_stack_violation(int sig, const siginfo_t *sip, const ucontext_t *ucp) +stack_violation(int sig, const siginfo_t *sip, const ucontext_t *ucp) { uintptr_t addr; uintptr_t base; diff --git a/usr/src/lib/libc/port/gen/str2sig.c b/usr/src/lib/libc/port/gen/str2sig.c index f9283ab6e3..f899f1395e 100644 --- a/usr/src/lib/libc/port/gen/str2sig.c +++ b/usr/src/lib/libc/port/gen/str2sig.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,23 +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 str2sig = _str2sig -#pragma weak sig2str = _sig2str - -#include "synonyms.h" - +#include "lint.h" #include <string.h> #include <stdlib.h> #include <signal.h> diff --git a/usr/src/lib/libc/port/gen/strcase_charmap.c b/usr/src/lib/libc/port/gen/strcase_charmap.c index 8921606fd2..5e88e34afa 100644 --- a/usr/src/lib/libc/port/gen/strcase_charmap.c +++ b/usr/src/lib/libc/port/gen/strcase_charmap.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <strings.h> diff --git a/usr/src/lib/libc/port/gen/strcasecmp.c b/usr/src/lib/libc/port/gen/strcasecmp.c index b24e3d0f2b..c8e7ba62ac 100644 --- a/usr/src/lib/libc/port/gen/strcasecmp.c +++ b/usr/src/lib/libc/port/gen/strcasecmp.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <strings.h> diff --git a/usr/src/lib/libc/port/gen/strcat.c b/usr/src/lib/libc/port/gen/strcat.c index 99f56425fc..b127c96186 100644 --- a/usr/src/lib/libc/port/gen/strcat.c +++ b/usr/src/lib/libc/port/gen/strcat.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,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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strchr.c b/usr/src/lib/libc/port/gen/strchr.c index 520e7e8842..acf3d1c07d 100644 --- a/usr/src/lib/libc/port/gen/strchr.c +++ b/usr/src/lib/libc/port/gen/strchr.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 <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strcmp.c b/usr/src/lib/libc/port/gen/strcmp.c index 7e613be218..675b01f0db 100644 --- a/usr/src/lib/libc/port/gen/strcmp.c +++ b/usr/src/lib/libc/port/gen/strcmp.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strcpy.c b/usr/src/lib/libc/port/gen/strcpy.c index 6dd19f49ea..bcc5829560 100644 --- a/usr/src/lib/libc/port/gen/strcpy.c +++ b/usr/src/lib/libc/port/gen/strcpy.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strcspn.c b/usr/src/lib/libc/port/gen/strcspn.c index 4dc847cb11..03188550d1 100644 --- a/usr/src/lib/libc/port/gen/strcspn.c +++ b/usr/src/lib/libc/port/gen/strcspn.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strdup.c b/usr/src/lib/libc/port/gen/strdup.c index 4fa0ae1450..162c16241c 100644 --- a/usr/src/lib/libc/port/gen/strdup.c +++ b/usr/src/lib/libc/port/gen/strdup.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 strdup = _strdup +#pragma weak _strdup = strdup -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <stdlib.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strerror.c b/usr/src/lib/libc/port/gen/strerror.c index bc60768d85..213d964cf3 100644 --- a/usr/src/lib/libc/port/gen/strerror.c +++ b/usr/src/lib/libc/port/gen/strerror.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 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 strerror = _strerror -#pragma weak strerror_r = _strerror_r - -#include "synonyms.h" +#include "lint.h" #include "_libc_gettext.h" #include <string.h> #include <sys/types.h> @@ -44,7 +40,7 @@ extern const int _sys_index[]; extern int _sys_num_err; char * -_strerror(int errnum) +strerror(int errnum) { if (errnum < _sys_num_err && errnum >= 0) return (_libc_gettext((char *)&_sys_errs[_sys_index[errnum]])); @@ -57,7 +53,7 @@ _strerror(int errnum) * Implemented strerror_r in Solaris 10 to comply with SUSv3 2001. */ int -_strerror_r(int errnum, char *strerrbuf, size_t buflen) +strerror_r(int errnum, char *strerrbuf, size_t buflen) { char *buf; int ret = 0; diff --git a/usr/src/lib/libc/port/gen/strlcat.c b/usr/src/lib/libc/port/gen/strlcat.c index 17700ccdb2..07d1403dde 100644 --- a/usr/src/lib/libc/port/gen/strlcat.c +++ b/usr/src/lib/libc/port/gen/strlcat.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strlcpy.c b/usr/src/lib/libc/port/gen/strlcpy.c index 84e11a7120..7a8009b893 100644 --- a/usr/src/lib/libc/port/gen/strlcpy.c +++ b/usr/src/lib/libc/port/gen/strlcpy.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strlen.c b/usr/src/lib/libc/port/gen/strlen.c index 06cd9eb868..5c5fd67d14 100644 --- a/usr/src/lib/libc/port/gen/strlen.c +++ b/usr/src/lib/libc/port/gen/strlen.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,23 +18,23 @@ * * 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" /* * Returns the number of * non-NULL bytes in string argument. */ -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strncasecmp.c b/usr/src/lib/libc/port/gen/strncasecmp.c index 6868a7d00e..d06b7ac9c4 100644 --- a/usr/src/lib/libc/port/gen/strncasecmp.c +++ b/usr/src/lib/libc/port/gen/strncasecmp.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. */ @@ -34,7 +34,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <strings.h> diff --git a/usr/src/lib/libc/port/gen/strncat.c b/usr/src/lib/libc/port/gen/strncat.c index 27d708760e..11e385e5e2 100644 --- a/usr/src/lib/libc/port/gen/strncat.c +++ b/usr/src/lib/libc/port/gen/strncat.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strncmp.c b/usr/src/lib/libc/port/gen/strncmp.c index b54e5078bb..ca734c51d5 100644 --- a/usr/src/lib/libc/port/gen/strncmp.c +++ b/usr/src/lib/libc/port/gen/strncmp.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strncpy.c b/usr/src/lib/libc/port/gen/strncpy.c index 489dd81f5e..7df39ad138 100644 --- a/usr/src/lib/libc/port/gen/strncpy.c +++ b/usr/src/lib/libc/port/gen/strncpy.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strnlen.c b/usr/src/lib/libc/port/gen/strnlen.c index 01b554e17a..605245b6bb 100644 --- a/usr/src/lib/libc/port/gen/strnlen.c +++ b/usr/src/lib/libc/port/gen/strnlen.c @@ -20,15 +20,13 @@ */ /* - * Copyright 2006 Sun Microsystems, Inc. + * Copyright 2008 Sun Microsystems, Inc. * All rights reserved. Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak strnlen = _strnlen - -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strpbrk.c b/usr/src/lib/libc/port/gen/strpbrk.c index 92dc18ffca..3b4af6fa01 100644 --- a/usr/src/lib/libc/port/gen/strpbrk.c +++ b/usr/src/lib/libc/port/gen/strpbrk.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 <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strrchr.c b/usr/src/lib/libc/port/gen/strrchr.c index 0e948ad560..ae3457c667 100644 --- a/usr/src/lib/libc/port/gen/strrchr.c +++ b/usr/src/lib/libc/port/gen/strrchr.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 <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strsignal.c b/usr/src/lib/libc/port/gen/strsignal.c index 5295a4197b..db148c881d 100644 --- a/usr/src/lib/libc/port/gen/strsignal.c +++ b/usr/src/lib/libc/port/gen/strsignal.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,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" -#pragma weak strsignal = _strsignal - -#include "synonyms.h" +#include "lint.h" #include "_libc_gettext.h" #include <string.h> #include <stddef.h> @@ -38,7 +36,7 @@ extern const char **_sys_siglistp; extern const int _sys_siglistn; char * -_strsignal(int signum) +strsignal(int signum) { if (signum < _sys_siglistn && signum >= 0) return (_libc_gettext((char *)_sys_siglistp[signum])); diff --git a/usr/src/lib/libc/port/gen/strspn.c b/usr/src/lib/libc/port/gen/strspn.c index f6ca1bad7f..266abb172a 100644 --- a/usr/src/lib/libc/port/gen/strspn.c +++ b/usr/src/lib/libc/port/gen/strspn.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 <string.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strstr.c b/usr/src/lib/libc/port/gen/strstr.c index 0c600832c1..a8d8d655af 100644 --- a/usr/src/lib/libc/port/gen/strstr.c +++ b/usr/src/lib/libc/port/gen/strstr.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 <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strtod.c b/usr/src/lib/libc/port/gen/strtod.c index c19cdca8c1..5731fa9ef4 100644 --- a/usr/src/lib/libc/port/gen/strtod.c +++ b/usr/src/lib/libc/port/gen/strtod.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 <errno.h> #include <stdio.h> #include <values.h> diff --git a/usr/src/lib/libc/port/gen/strtoimax.c b/usr/src/lib/libc/port/gen/strtoimax.c index 35b9d48155..9466563ec5 100644 --- a/usr/src/lib/libc/port/gen/strtoimax.c +++ b/usr/src/lib/libc/port/gen/strtoimax.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,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 <inttypes.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/strtok.c b/usr/src/lib/libc/port/gen/strtok.c index 68d712fe8b..c0393ffe15 100644 --- a/usr/src/lib/libc/port/gen/strtok.c +++ b/usr/src/lib/libc/port/gen/strtok.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 <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strtok_r.c b/usr/src/lib/libc/port/gen/strtok_r.c index 9eb622ae74..31cb290504 100644 --- a/usr/src/lib/libc/port/gen/strtok_r.c +++ b/usr/src/lib/libc/port/gen/strtok_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 strtok_r = _strtok_r - -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <stddef.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/strtoll.c b/usr/src/lib/libc/port/gen/strtoll.c index cafc2925c6..d594cd9053 100644 --- a/usr/src/lib/libc/port/gen/strtoll.c +++ b/usr/src/lib/libc/port/gen/strtoll.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 strtoll = _strtoll - -#include "synonyms.h" +#include "lint.h" #include <errno.h> #include <ctype.h> #include <limits.h> @@ -99,7 +96,7 @@ strtoll(const char *str, char **nptr, int base) if (!lisalnum(c) || (xx = DIGIT(c)) >= base) return (0); /* no number formed */ if (base == 16 && c == '0' && (ustr[1] == 'x' || ustr[1] == 'X') && - isxdigit(ustr[2])) + isxdigit(ustr[2])) c = *(ustr += 2); /* skip over leading "0x" or "0X" */ /* this code assumes that abs(llong_min) >= abs(llong_max) */ diff --git a/usr/src/lib/libc/port/gen/strtoull.c b/usr/src/lib/libc/port/gen/strtoull.c index 393056a459..6d474eded6 100644 --- a/usr/src/lib/libc/port/gen/strtoull.c +++ b/usr/src/lib/libc/port/gen/strtoull.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 strtoull = _strtoull - -#include "synonyms.h" +#include "lint.h" #include <errno.h> #include <ctype.h> #include <limits.h> @@ -100,7 +97,7 @@ strtoull(const char *str, char **nptr, int base) if (!lisalnum(c) || (xx = DIGIT(c)) >= base) return (0); /* no number formed */ if (base == 16 && c == '0' && (ustr[1] == 'x' || ustr[1] == 'X') && - isxdigit(ustr[2])) + isxdigit(ustr[2])) c = *(ustr += 2); /* skip over leading "0x" or "0X" */ multmax = ullong_max / (u_longlong_t)base; diff --git a/usr/src/lib/libc/port/gen/strtoumax.c b/usr/src/lib/libc/port/gen/strtoumax.c index 2fb3f144e4..ac39c6caf4 100644 --- a/usr/src/lib/libc/port/gen/strtoumax.c +++ b/usr/src/lib/libc/port/gen/strtoumax.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,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 <inttypes.h> #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/swab.c b/usr/src/lib/libc/port/gen/swab.c index ebbde7fcee..6dafc38507 100644 --- a/usr/src/lib/libc/port/gen/swab.c +++ b/usr/src/lib/libc/port/gen/swab.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" /* * Swab bytes */ -#pragma weak swab = _swab +#pragma weak _swab = swab -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <stdlib.h> diff --git a/usr/src/lib/libc/port/gen/swapctl.c b/usr/src/lib/libc/port/gen/swapctl.c index 7b8c6d1db8..e49d743ac6 100644 --- a/usr/src/lib/libc/port/gen/swapctl.c +++ b/usr/src/lib/libc/port/gen/swapctl.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 swapctl = _swapctl - -#include "synonyms.h" +#include "lint.h" #include "sys/uadmin.h" #include <sys/types.h> #include <sys/swap.h> diff --git a/usr/src/lib/libc/port/gen/sysconf.c b/usr/src/lib/libc/port/gen/sysconf.c index 4b06010170..2599bfa4d0 100644 --- a/usr/src/lib/libc/port/gen/sysconf.c +++ b/usr/src/lib/libc/port/gen/sysconf.c @@ -18,27 +18,26 @@ * * CDDL HEADER END */ + /* * 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" /* sysconf(3C) - returns system configuration information */ -#pragma weak sysconf = _sysconf +#pragma weak _sysconf = sysconf -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <unistd.h> #include <sys/sysconfig.h> -#include <sys/errno.h> #include <limits.h> #include <time.h> #include <errno.h> @@ -378,7 +377,7 @@ sysconf(int name) return (-1L); case _SC_THREAD_STACK_MIN: - return ((long)_thr_min_stack()); + return ((long)thr_min_stack()); case _SC_THREAD_THREADS_MAX: return (-1L); diff --git a/usr/src/lib/libc/port/gen/syslog.c b/usr/src/lib/libc/port/gen/syslog.c index 487da876e0..aa535a1edf 100644 --- a/usr/src/lib/libc/port/gen/syslog.c +++ b/usr/src/lib/libc/port/gen/syslog.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. */ @@ -53,13 +53,9 @@ * The output of this routine is intended to be read by /etc/syslogd. */ -#pragma weak syslog = _syslog -#pragma weak vsyslog = _vsyslog -#pragma weak openlog = _openlog -#pragma weak closelog = _closelog -#pragma weak setlogmask = _setlogmask +#pragma weak _syslog = syslog -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/types32.h> #include <sys/mman.h> diff --git a/usr/src/lib/libc/port/gen/tcdrain.c b/usr/src/lib/libc/port/gen/tcdrain.c index 78190fe231..3f26ede375 100644 --- a/usr/src/lib/libc/port/gen/tcdrain.c +++ b/usr/src/lib/libc/port/gen/tcdrain.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 <sys/termios.h> #include <unistd.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/tcflow.c b/usr/src/lib/libc/port/gen/tcflow.c index 842b68eed4..0f25d36920 100644 --- a/usr/src/lib/libc/port/gen/tcflow.c +++ b/usr/src/lib/libc/port/gen/tcflow.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 tcflow = _tcflow +#pragma weak _tcflow = tcflow -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tcflush.c b/usr/src/lib/libc/port/gen/tcflush.c index f496d5e1db..6bfe406198 100644 --- a/usr/src/lib/libc/port/gen/tcflush.c +++ b/usr/src/lib/libc/port/gen/tcflush.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 tcflush = _tcflush +#pragma weak _tcflush = tcflush -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tcgetattr.c b/usr/src/lib/libc/port/gen/tcgetattr.c index ec1f8955a9..aa469e892c 100644 --- a/usr/src/lib/libc/port/gen/tcgetattr.c +++ b/usr/src/lib/libc/port/gen/tcgetattr.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 tcgetattr = _tcgetattr +#pragma weak _tcgetattr = tcgetattr -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tcgetpgrp.c b/usr/src/lib/libc/port/gen/tcgetpgrp.c index ac3bf745ca..ed4e452cb2 100644 --- a/usr/src/lib/libc/port/gen/tcgetpgrp.c +++ b/usr/src/lib/libc/port/gen/tcgetpgrp.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 tcgetpgrp = _tcgetpgrp +#pragma weak _tcgetpgrp = tcgetpgrp -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tcgetsid.c b/usr/src/lib/libc/port/gen/tcgetsid.c index 92511edc27..7152f592fb 100644 --- a/usr/src/lib/libc/port/gen/tcgetsid.c +++ b/usr/src/lib/libc/port/gen/tcgetsid.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 tcgetsid = _tcgetsid +#pragma weak _tcgetsid = tcgetsid -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/tcsendbreak.c b/usr/src/lib/libc/port/gen/tcsendbreak.c index 465b17b0ea..16f7e81bf6 100644 --- a/usr/src/lib/libc/port/gen/tcsendbreak.c +++ b/usr/src/lib/libc/port/gen/tcsendbreak.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 tcsendbreak = _tcsendbreak +#pragma weak _tcsendbreak = tcsendbreak -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tcsetattr.c b/usr/src/lib/libc/port/gen/tcsetattr.c index 2644d50f43..f36de46e82 100644 --- a/usr/src/lib/libc/port/gen/tcsetattr.c +++ b/usr/src/lib/libc/port/gen/tcsetattr.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 tcsetattr = _tcsetattr +#pragma weak _tcsetattr = tcsetattr -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <sys/termios.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/tcsetpgrp.c b/usr/src/lib/libc/port/gen/tcsetpgrp.c index b6e6b9db3a..1470d1439b 100644 --- a/usr/src/lib/libc/port/gen/tcsetpgrp.c +++ b/usr/src/lib/libc/port/gen/tcsetpgrp.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 tcsetpgrp = _tcsetpgrp +#pragma weak _tcsetpgrp = tcsetpgrp -#include "synonyms.h" +#include "lint.h" #include <sys/termios.h> #include <sys/types.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/tell.c b/usr/src/lib/libc/port/gen/tell.c index 2391cd4da5..4cd1e24fa4 100644 --- a/usr/src/lib/libc/port/gen/tell.c +++ b/usr/src/lib/libc/port/gen/tell.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 offset in file. @@ -37,12 +36,12 @@ #include <sys/feature_tests.h> #if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak tell64 = _tell64 +#pragma weak _tell64 = tell64 #else -#pragma weak tell = _tell +#pragma weak _tell = tell #endif -#include "synonyms.h" +#include "lint.h" #include <fcntl.h> #include <stdio.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/telldir.c b/usr/src/lib/libc/port/gen/telldir.c index ea8f70f9a8..86721d077a 100644 --- a/usr/src/lib/libc/port/gen/telldir.c +++ b/usr/src/lib/libc/port/gen/telldir.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * telldir -- C library extension routine */ @@ -36,11 +36,11 @@ #include <sys/isa_defs.h> #if !defined(_LP64) -#pragma weak telldir64 = _telldir64 +#pragma weak _telldir64 = telldir64 #endif -#pragma weak telldir = _telldir +#pragma weak _telldir = telldir -#include "synonyms.h" +#include "lint.h" #include "libc.h" #include <mtlib.h> #include <dirent.h> diff --git a/usr/src/lib/libc/port/gen/tfind.c b/usr/src/lib/libc/port/gen/tfind.c index 6fccc089c7..f34d477674 100644 --- a/usr/src/lib/libc/port/gen/tfind.c +++ b/usr/src/lib/libc/port/gen/tfind.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" /* * Tree search algorithm, generalized from Knuth (6.2.2) Algorithm T. @@ -37,9 +36,9 @@ * because the definition of NODE isn't available to the user. */ -#pragma weak tfind = _tfind +#pragma weak _tfind = tfind -#include "synonyms.h" +#include "lint.h" #include <mtlib.h> #include <sys/types.h> #include <search.h> diff --git a/usr/src/lib/libc/port/gen/time_data.c b/usr/src/lib/libc/port/gen/time_data.c index 3226079bb8..7593e5f842 100644 --- a/usr/src/lib/libc/port/gen/time_data.c +++ b/usr/src/lib/libc/port/gen/time_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,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 <time.h> #include <tzfile.h> /* diff --git a/usr/src/lib/libc/port/gen/time_gdata.c b/usr/src/lib/libc/port/gen/time_gdata.c index d94bdbae23..d23e096738 100644 --- a/usr/src/lib/libc/port/gen/time_gdata.c +++ b/usr/src/lib/libc/port/gen/time_gdata.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,26 +18,26 @@ * * 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 altzone = _altzone -#pragma weak daylight = _daylight -#pragma weak timezone = _timezone -#pragma weak tzname = _tzname +#pragma weak _altzone = altzone +#pragma weak _daylight = daylight +#pragma weak _timezone = timezone +#pragma weak _tzname = tzname -#include "synonyms.h" -#include <mtlib.h> +#include "lint.h" +#include <mtlib.h> #include <sys/types.h> -#include <time.h> +#include <time.h> #include <synch.h> long int timezone = 0; /* XPG4 version 2 */ diff --git a/usr/src/lib/libc/port/gen/truncate.c b/usr/src/lib/libc/port/gen/truncate.c index eff577845f..d3db2cb28e 100644 --- a/usr/src/lib/libc/port/gen/truncate.c +++ b/usr/src/lib/libc/port/gen/truncate.c @@ -24,11 +24,10 @@ * 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" /* * ftruncate() and truncate() set a file to a specified @@ -41,16 +40,13 @@ #include <sys/feature_tests.h> #if !defined(_LP64) && _FILE_OFFSET_BITS == 64 -#pragma weak ftruncate64 = _ftruncate64 -#pragma weak truncate64 = _truncate64 -#define _ftruncate _ftruncate64 -#define _truncate _truncate64 -#else /* !_LP64 && _FILE_OFFSET_BITS == 64 */ -#pragma weak ftruncate = _ftruncate -#pragma weak truncate = _truncate +#pragma weak _ftruncate64 = ftruncate64 +#pragma weak _truncate64 = truncate64 +#define ftruncate ftruncate64 +#define truncate truncate64 #endif /* !_LP64 && _FILE_OFFSET_BITS == 64 */ -#include "synonyms.h" +#include "lint.h" #include <unistd.h> #include <stdio.h> #include <fcntl.h> @@ -58,7 +54,7 @@ #include <sys/types.h> int -_ftruncate(int fildes, off_t len) +ftruncate(int fildes, off_t len) { struct flock lck; @@ -74,7 +70,7 @@ _ftruncate(int fildes, off_t len) } int -_truncate(const char *path, off_t len) +truncate(const char *path, off_t len) { int rval = 0; diff --git a/usr/src/lib/libc/port/gen/tsdalloc.c b/usr/src/lib/libc/port/gen/tsdalloc.c index 1da9dc01e2..db04a23c01 100644 --- a/usr/src/lib/libc/port/gen/tsdalloc.c +++ b/usr/src/lib/libc/port/gen/tsdalloc.c @@ -20,14 +20,15 @@ */ /* - * 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" -#include "synonyms.h" +#include "lint.h" #include <stdlib.h> +#include <pthread.h> #include <errno.h> #include "mtlib.h" #include "libc.h" @@ -75,12 +76,12 @@ tsdalloc(__tsd_item_t n, size_t size, pfrv_t destructor) return (NULL); } - if ((error = _thr_keycreate_once(&key, _free_tsdbuf)) != 0) { + if ((error = thr_keycreate_once(&key, _free_tsdbuf)) != 0) { errno = error; return (NULL); } - if ((loc = _pthread_getspecific(key)) != NULL) { + if ((loc = pthread_getspecific(key)) != NULL) { if ((p = loc[n].buf) != NULL) return (p); } else { @@ -88,7 +89,7 @@ tsdalloc(__tsd_item_t n, size_t size, pfrv_t destructor) loc = lmalloc(_T_NUM_ENTRIES * sizeof (tsdent_t)); if (loc == NULL) return (NULL); - if ((error = _thr_setspecific(key, loc)) != 0) { + if ((error = thr_setspecific(key, loc)) != 0) { lfree(loc, _T_NUM_ENTRIES * sizeof (tsdent_t)); errno = error; return (NULL); diff --git a/usr/src/lib/libc/port/gen/tsearch.c b/usr/src/lib/libc/port/gen/tsearch.c index d7d3388398..f6a92acc85 100644 --- a/usr/src/lib/libc/port/gen/tsearch.c +++ b/usr/src/lib/libc/port/gen/tsearch.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" /* * Tree search algorithm, generalized from Knuth (6.2.2) Algorithm T. @@ -38,11 +37,11 @@ * because the definition of NODE isn't available to the user. */ -#pragma weak tdelete = _tdelete -#pragma weak tsearch = _tsearch -#pragma weak twalk = _twalk +#pragma weak _tdelete = tdelete +#pragma weak _tsearch = tsearch +#pragma weak _twalk = twalk -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include "libc.h" #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/ttyname.c b/usr/src/lib/libc/port/gen/ttyname.c index 7de2085691..df2d4aefb0 100644 --- a/usr/src/lib/libc/port/gen/ttyname.c +++ b/usr/src/lib/libc/port/gen/ttyname.c @@ -20,15 +20,15 @@ */ /* - * 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" + /* * ttyname(f): return "/dev/X" (where X is a relative pathname * under /dev/), which is the name of the tty character special @@ -64,10 +64,9 @@ * device numbers. */ -#pragma weak ttyname = _ttyname -#pragma weak ttyname_r = _ttyname_r +#pragma weak _ttyname = ttyname -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include "libc.h" #include "_libc_gettext.h" @@ -173,7 +172,7 @@ _ttyname_dev(dev_t rdev, char *buffer, size_t buflen) * It was implemented by Solaris 2.3. */ char * -_ttyname_r(int f, char *buffer, int buflen) +ttyname_r(int f, char *buffer, int buflen) { struct stat64 fsb; /* what we are searching for */ /* @@ -342,7 +341,7 @@ __posix_ttyname_r(int fildes, char *name, size_t namesize) else namelen = (int)namesize; - if (_ttyname_r(fildes, name, namelen) == NULL) { + if (ttyname_r(fildes, name, namelen) == NULL) { if (errno == 0) nerrno = EINVAL; else @@ -734,7 +733,6 @@ get_pri_dirs(void) int tfd = open("/dev/console", O_WRONLY); if (tfd >= 0) { char buf[256]; - /* LINTED variable format specifier */ (void) snprintf(buf, sizeof (buf), _libc_gettext( "ERROR: Entry '%s' in /etc/ttysrch ignored.\n"), vec->name); @@ -772,5 +770,5 @@ ttyname(int f) if (ans == NULL) return (NULL); - return (_ttyname_r(f, ans, MAX_DEV_PATH)); + return (ttyname_r(f, ans, MAX_DEV_PATH)); } diff --git a/usr/src/lib/libc/port/gen/ttyslot.c b/usr/src/lib/libc/port/gen/ttyslot.c index 56ad069576..d9b6b88839 100644 --- a/usr/src/lib/libc/port/gen/ttyslot.c +++ b/usr/src/lib/libc/port/gen/ttyslot.c @@ -24,20 +24,18 @@ * 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 the number of the slot in the utmp file * corresponding to the current user: try for file 0, 1, 2. * Returns -1 if slot not found. */ -#pragma weak ttyslot = _ttyslot - -#include "synonyms.h" +#include "lint.h" #include <string.h> #include <stdio.h> #include <sys/types.h> diff --git a/usr/src/lib/libc/port/gen/ualarm.c b/usr/src/lib/libc/port/gen/ualarm.c index 6d65f5c092..b75114a499 100644 --- a/usr/src/lib/libc/port/gen/ualarm.c +++ b/usr/src/lib/libc/port/gen/ualarm.c @@ -1,21 +1,20 @@ /* - * 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) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* * Copyright (c) 1985 Regents of the University of California. * All rights reserved. The Berkeley software License Agreement * specifies the terms and conditions for redistribution. */ -#include "synonyms.h" +#pragma ident "%Z%%M% %I% %E% SMI" + +#include "lint.h" #include <sys/types.h> #include <sys/time.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/ucred.c b/usr/src/lib/libc/port/gen/ucred.c index 03b6fa325f..f56e7caf63 100644 --- a/usr/src/lib/libc/port/gen/ucred.c +++ b/usr/src/lib/libc/port/gen/ucred.c @@ -18,35 +18,36 @@ * * 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" -#pragma weak ucred_free = _ucred_free -#pragma weak ucred_get = _ucred_get -#pragma weak ucred_getegid = _ucred_getegid -#pragma weak ucred_geteuid = _ucred_geteuid -#pragma weak ucred_getgroups = _ucred_getgroups -#pragma weak ucred_getpflags = _ucred_getpflags -#pragma weak ucred_getpid = _ucred_getpid -#pragma weak ucred_getzoneid = _ucred_getzoneid -#pragma weak ucred_getprojid = _ucred_getprojid -#pragma weak ucred_getprivset = _ucred_getprivset -#pragma weak ucred_getrgid = _ucred_getrgid -#pragma weak ucred_getruid = _ucred_getruid -#pragma weak ucred_getsgid = _ucred_getsgid -#pragma weak ucred_getsuid = _ucred_getsuid -#pragma weak ucred_getauid = _ucred_getauid -#pragma weak ucred_getasid = _ucred_getasid -#pragma weak ucred_getatid = _ucred_getatid -#pragma weak ucred_getlabel = _ucred_getlabel -#pragma weak ucred_getamask = _ucred_getamask -#pragma weak ucred_size = _ucred_size - -#include "synonyms.h" +#pragma weak _ucred_free = ucred_free +#pragma weak _ucred_get = ucred_get +#pragma weak _ucred_getegid = ucred_getegid +#pragma weak _ucred_geteuid = ucred_geteuid +#pragma weak _ucred_getgroups = ucred_getgroups +#pragma weak _ucred_getpflags = ucred_getpflags +#pragma weak _ucred_getpid = ucred_getpid +#pragma weak _ucred_getzoneid = ucred_getzoneid +#pragma weak _ucred_getprojid = ucred_getprojid +#pragma weak _ucred_getprivset = ucred_getprivset +#pragma weak _ucred_getrgid = ucred_getrgid +#pragma weak _ucred_getruid = ucred_getruid +#pragma weak _ucred_getsgid = ucred_getsgid +#pragma weak _ucred_getsuid = ucred_getsuid +#pragma weak _ucred_getauid = ucred_getauid +#pragma weak _ucred_getasid = ucred_getasid +#pragma weak _ucred_getatid = ucred_getatid +#pragma weak _ucred_getlabel = ucred_getlabel +#pragma weak _ucred_getamask = ucred_getamask +#pragma weak _ucred_size = ucred_size + +#include "lint.h" #define _STRUCTURED_PROC 1 diff --git a/usr/src/lib/libc/port/gen/valloc.c b/usr/src/lib/libc/port/gen/valloc.c index a3986f8310..e20ef38fd6 100644 --- a/usr/src/lib/libc/port/gen/valloc.c +++ b/usr/src/lib/libc/port/gen/valloc.c @@ -20,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 <stdlib.h> #include <unistd.h> diff --git a/usr/src/lib/libc/port/gen/vlfmt.c b/usr/src/lib/libc/port/gen/vlfmt.c index 6403087f0b..26275de166 100644 --- a/usr/src/lib/libc/port/gen/vlfmt.c +++ b/usr/src/lib/libc/port/gen/vlfmt.c @@ -18,22 +18,22 @@ * * 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" /* vlfmt() - format, print and log (variable arguments) */ -#pragma weak vlfmt = _vlfmt +#pragma weak _vlfmt = vlfmt -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <sys/types.h> #include <pfmt.h> diff --git a/usr/src/lib/libc/port/gen/vpfmt.c b/usr/src/lib/libc/port/gen/vpfmt.c index dbe5499882..081627256b 100644 --- a/usr/src/lib/libc/port/gen/vpfmt.c +++ b/usr/src/lib/libc/port/gen/vpfmt.c @@ -18,24 +18,24 @@ * * 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" /* * vpfmt() - format and print (variable argument list) */ -#pragma weak vpfmt = _vpfmt +#pragma weak _vpfmt = vpfmt -#include "synonyms.h" +#include "lint.h" #include "mtlib.h" #include <sys/types.h> #include <pfmt.h> diff --git a/usr/src/lib/libc/port/gen/waitpid.c b/usr/src/lib/libc/port/gen/waitpid.c index 3a7d66330e..8f67f2dd40 100644 --- a/usr/src/lib/libc/port/gen/waitpid.c +++ b/usr/src/lib/libc/port/gen/waitpid.c @@ -24,20 +24,18 @@ * 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" + /* - * All of these functions are cancellation points. + * All of the wait*() functions are cancellation points. */ -#pragma weak waitpid = _waitpid -#pragma weak wait = _wait -#pragma weak wait4 = _wait4 -#pragma weak wait3 = _wait3 +#pragma weak _waitpid = waitpid +#pragma weak _wait = wait -#include "synonyms.h" +#include "lint.h" #include <unistd.h> #include <string.h> #include <errno.h> diff --git a/usr/src/lib/libc/port/gen/walkstack.c b/usr/src/lib/libc/port/gen/walkstack.c index 9e2d0fcd5f..a4bcef258e 100644 --- a/usr/src/lib/libc/port/gen/walkstack.c +++ b/usr/src/lib/libc/port/gen/walkstack.c @@ -18,7 +18,7 @@ * * 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. */ @@ -76,7 +76,7 @@ * The bottom-most struct frame is actually constructed by the kernel by * copying the previous stack frame, allowing naive backtrace code to simply * skip over the interrupted frame. The copied frame is never really used, - * since it is presumed the libc or libthread signal handler wrapper function + * since it is presumed the signal handler wrapper function * will explicitly setcontext(2) to the interrupted context if the user * program's handler returns. If we detect a signal handler frame, we simply * read the interrupted context structure from the stack, use its embedded @@ -96,18 +96,11 @@ * Since we want to provide the signal number that generated a signal stack * frame and on sparc this information isn't written to the stack by the kernel * the way it's done on i386, we're forced to read the signo from the stack as - * one of the arguments to the signal handler. What we hope is that no one has - * used __sigaction directly; if we're not linked with libthread - * (_thr_sighndlrinfo is NULL) then we attempt to read the signo directly from - * the register window. Otherwise we use the _thr_sighndlrinfo interface to find - * the correct frame. - * + * one of the arguments to the signal handler. We use the thr_sighndlrinfo + * interface to find the correct frame. */ -#pragma weak walkcontext = _walkcontext -#pragma weak printstack = _printstack - -#include "synonyms.h" +#include "lint.h" #include <assert.h> #include <dlfcn.h> #include <fcntl.h> @@ -221,11 +214,9 @@ walkcontext(const ucontext_t *uptr, int (*operate_func)(uintptr_t, int, void *), /* * Since we don't write signo to the stack on sparc, we need - * to extract signo from the stack frames. This is problematic - * in the case of libthread (libc has deterministic behavior) - * since we're not sure where we can do that safely. An awkward - * interface was provided for this purpose in libthread: - * _thr_sighndlrinfo; this is documented in + * to extract signo from the stack frames. + * An awkward interface is provided for this purpose: + * thr_sighndlrinfo; this is documented in * /shared/sac/PSARC/1999/024. When called, this function * returns the PC of a special function (and its size) that * will be present in the stack frame if a signal was @@ -235,20 +226,15 @@ walkcontext(const ucontext_t *uptr, int (*operate_func)(uintptr_t, int, void *), * Since this function is written in assembler and doesn't * perturb its registers, we can then read sig out of arg0 * when the saved pc is inside this function. - * */ #if defined(__sparc) uintptr_t special_pc = NULL; int special_size = 0; - extern void _thr_sighndlrinfo(void (**func)(), int *funcsize); - -#pragma weak _thr_sighndlrinfo + extern void thr_sighndlrinfo(void (**func)(), int *funcsize); - if (_thr_sighndlrinfo != NULL) { - _thr_sighndlrinfo((void (**)())&special_pc, &special_size); - } + thr_sighndlrinfo((void (**)())&special_pc, &special_size); #endif /* sparc */ @@ -290,24 +276,14 @@ walkcontext(const ucontext_t *uptr, int (*operate_func)(uintptr_t, int, void *), #if defined(__sparc) /* - * with sparc we need to handle - * single and multi-threaded cases - * separately - * If we're single threaded, the trampoline - * in libc will have the signo as the first - * argumment; we can snag that directly. * In the case of threads, since there are multiple * complex routines between kernel and user handler, * we need to figure out where we can read signal from - * using _thr_sighndlrinfo - which we've already done + * using thr_sighndlrinfo - which we've already done * for this signal, since it appeared on the stack * before the signal frame.... sigh. */ - - if (_thr_sighndlrinfo == NULL) /* single threaded */ - sig = fp->fr_arg[0]; - else - sig = signo; /* already read - see below */ + sig = signo; /* already read - see below */ #endif /* * this is the special signal frame, so cons up @@ -328,8 +304,7 @@ walkcontext(const ucontext_t *uptr, int (*operate_func)(uintptr_t, int, void *), * lookahead code to find right spot to read signo from... */ - if (_thr_sighndlrinfo && - savepc >= special_pc && savepc < + if (savepc >= special_pc && savepc < (special_pc + special_size)) signo = fp->fr_arg[0]; #endif @@ -389,7 +364,7 @@ display_stack_info(uintptr_t pc, int signo, void *arg) (void) sig2str(signo, sigbuf); async_filenoprintf(filenum, "%s [Signal %d (%s)]\n", - buffer, (ulong_t)signo, sigbuf); + buffer, (ulong_t)signo, sigbuf); } else async_filenoprintf(filenum, "%s\n", buffer); diff --git a/usr/src/lib/libc/port/gen/wdata.c b/usr/src/lib/libc/port/gen/wdata.c index b0505387f5..d0e65e2ea3 100644 --- a/usr/src/lib/libc/port/gen/wdata.c +++ b/usr/src/lib/libc/port/gen/wdata.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) 1986 AT&T */ /* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -/* This module is created for NLS on Sep.03.86 */ - -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <euc.h> diff --git a/usr/src/lib/libc/port/gen/xgetwidth.c b/usr/src/lib/libc/port/gen/xgetwidth.c index 01334b33dc..b4aa18649d 100644 --- a/usr/src/lib/libc/port/gen/xgetwidth.c +++ b/usr/src/lib/libc/port/gen/xgetwidth.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,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) 1986 AT&T */ /* All Rights Reserved */ - -/* This module is created for NLS on Sep.03.86 */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * _Xgetwidth calls _getwidth to get the values of environment variables @@ -39,7 +36,7 @@ */ /* #include "shlib.h" */ -#include "synonyms.h" +#include "lint.h" #include <sys/types.h> #include <euc.h> #include <getwidth.h> |