diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-05 13:19:55 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2017-12-05 13:19:55 +0000 |
| commit | 0b09cc7f111e83b149f3c0cf5812e84c9943f667 (patch) | |
| tree | 915365a8e83f0e93ada78bc5280633c66fd1a784 /usr/src | |
| parent | 758ae53701bec2fed98db901e5af051af2ac0c6d (diff) | |
| parent | fb4cdc19f4c1650a26fa4b7f4faf5a036225c7d4 (diff) | |
| download | illumos-joyent-0b09cc7f111e83b149f3c0cf5812e84c9943f667.tar.gz | |
[illumos-gate merge]
commit fb4cdc19f4c1650a26fa4b7f4faf5a036225c7d4
8828 udapl: value computed is not used
commit 4432e6b4ec7a3cb1a2915b65a8daae5faa278ba0
8853 libsocket: variable 'addr' set but not used
commit 9c88ac3ab4edaa5e8c0130ed1b4b376ea57c545a
8852 libcurses: local unused types
commit 712a34becd0c378dd87ef9106ed5275739e2521a
8844 libdns_sd: variable set but not used
commit e8dc66e7692c9d61c165fa302f0d05e86ffaced9
8841 smhba: variable 'status' set but not used
commit 6cfe4330282a218c2e13a305e7fecc048518aad1
8833 libcmd: variable 'ep' set but not used
commit f362c74cdda7b4819bb5d3360149ac0fae9ea013
8774 kadmin/dbutil: variable 'crflags' set but not used
commit 96b6509c49b81cb0d89ec222d92d421d946caa0c
8735 libld: variable '_vdp' set but not used
commit 1f0c5e612d8dfd7d1a8f4487cef753357b9909f5
8702 PCI addresses with physaddr > 0xffffffff can't be mapped in
8703 pci/npe DDI_CTLOPS_REGSIZE should be 64-bit aware
8704 want OFF_MAX in the kernel
8705 unsupported 64-bit prefetch memory on pci-pci bridge
commit 458f44a49dc56cd17a39815122214e7a1b4793e3
8849 libresolv2: remove rcsid
commit 6c6e04f2699a6755d7a29e6fc1679b292600616c
8875 loader.efi: efipart should exclude iPXE stub block protocol
commit 862246c1516ca78c11bef09650987f3d7171b2c9
8854 libm: variable set but not used
commit e34d2eb7802a6af2e2219818b08b2c2ac88a1c81
8839 madv: error: variable 'rc' set but not used
commit 13ddffeef026c03c1ddee21119335c00d6b7f3ae
8827 libldap5: variable set but not used
Conflicts:
usr/src/uts/i86pc/io/rootnex.c
Diffstat (limited to 'usr/src')
134 files changed, 150 insertions, 579 deletions
diff --git a/usr/src/boot/sys/boot/efi/libefi/efipart.c b/usr/src/boot/sys/boot/efi/libefi/efipart.c index 347c14f68a..2640201698 100644 --- a/usr/src/boot/sys/boot/efi/libefi/efipart.c +++ b/usr/src/boot/sys/boot/efi/libefi/efipart.c @@ -239,6 +239,16 @@ efipart_hdd(EFI_DEVICE_PATH *dp) !blkio->Media->MediaPresent) { return (false); } + + /* + * We assume the block size 512 or greater power of 2. + * iPXE is known to insert stub BLOCK IO device with + * BlockSize 1. + */ + if (blkio->Media->BlockSize < 512 || + !powerof2(blkio->Media->BlockSize)) { + return (false); + } } return (true); } diff --git a/usr/src/cmd/krb5/kadmin/dbutil/dump.c b/usr/src/cmd/krb5/kadmin/dbutil/dump.c index 3f6b3b8f54..11e6a49836 100644 --- a/usr/src/cmd/krb5/kadmin/dbutil/dump.c +++ b/usr/src/cmd/krb5/kadmin/dbutil/dump.c @@ -2574,7 +2574,6 @@ load_db(argc, argv) char buf[BUFSIZ]; dump_version *load; int update, verbose; - krb5_int32 crflags; int aindex; bool_t add_update = TRUE; char iheader[MAX_HEADER]; @@ -2596,7 +2595,6 @@ load_db(argc, argv) load = NULL; update = 0; verbose = 0; - crflags = KRB5_KDB_CREATE_BTREE; exit_status = 0; dbname_tmp = (char *) NULL; log_ctx = util_context->kdblog_context; diff --git a/usr/src/cmd/sgs/libld/common/version.c b/usr/src/cmd/sgs/libld/common/version.c index 62fae710f9..7f2ca139ef 100644 --- a/usr/src/cmd/sgs/libld/common/version.c +++ b/usr/src/cmd/sgs/libld/common/version.c @@ -192,7 +192,7 @@ ld_vers_check_defs(Ofl_desc *ofl) Sym_desc *sdp; const char *name = vdp->vd_name; uchar_t bind; - Ver_desc *_vdp; + Ver_desc *_vdp __unused; avl_index_t where; Aliste idx2; diff --git a/usr/src/lib/libcmd/common/cut.c b/usr/src/lib/libcmd/common/cut.c index abafdc5070..6b6cabe60e 100644 --- a/usr/src/lib/libcmd/common/cut.c +++ b/usr/src/lib/libcmd/common/cut.c @@ -260,7 +260,6 @@ cutcols(Cut_t* cut, Sfio_t* fdin, Sfio_t* fdout) register char* bp; register int skip; /* non-zero for don't copy */ int must; - char* ep; const char* xx; for (;;) @@ -272,7 +271,6 @@ cutcols(Cut_t* cut, Sfio_t* fdin, Sfio_t* fdout) if (!bp && !(bp = sfgetr(fdin, 0, SF_LASTR))) break; len = sfvalue(fdin); - ep = bp + len; xx = 0; if (!(ncol = skip = *(lp = cut->list))) ncol = *++lp; diff --git a/usr/src/lib/libcurses/screen/tgetch.c b/usr/src/lib/libcurses/screen/tgetch.c index 20f6995a6b..61b293cce9 100644 --- a/usr/src/lib/libcurses/screen/tgetch.c +++ b/usr/src/lib/libcurses/screen/tgetch.c @@ -41,6 +41,9 @@ #include "curses_inc.h" #include <signal.h> #include <unistd.h> +#ifndef FIONREAD +#include <fcntl.h> +#endif /* FIONREAD */ #ifdef DEBUG #include <ctype.h> #endif /* DEBUG */ @@ -533,7 +536,6 @@ _fpk(void) if (cur_term->_check_fd != -1) rc = read(cur_term->_check_fd, (char *)&c, 1); else { -#include <fcntl.h> int fcflags = fcntl(infd, F_GETFL, 0); (void) fcntl(infd, F_SETFL, fcflags | O_NDELAY); diff --git a/usr/src/lib/libcurses/screen/typeahead.c b/usr/src/lib/libcurses/screen/typeahead.c index 0d343b7539..5353b14638 100644 --- a/usr/src/lib/libcurses/screen/typeahead.c +++ b/usr/src/lib/libcurses/screen/typeahead.c @@ -37,13 +37,14 @@ * contributors. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /*LINTLIBRARY*/ #include <unistd.h> #include <sys/types.h> #include "curses_inc.h" +#ifdef SYSV +#include <fcntl.h> +#endif /* SYSV */ /* * Set the file descriptor for typeahead checks to fd. fd can be -1 @@ -62,7 +63,6 @@ typeahead(int fd) * 9.2% of the time in fcntl(). */ -#include <fcntl.h> int savefd = cur_term->_check_fd; /* Close the previous duped file descriptor. */ diff --git a/usr/src/lib/libdns_sd/Makefile.com b/usr/src/lib/libdns_sd/Makefile.com index 5775bdb1e7..944a538b25 100644 --- a/usr/src/lib/libdns_sd/Makefile.com +++ b/usr/src/lib/libdns_sd/Makefile.com @@ -40,6 +40,8 @@ C99MODE = $(C99_ENABLE) CPPFLAGS += -I$(SRCDIR) -DNOT_HAVE_SA_LEN -D_XPG4_2 -D__EXTENSIONS__ CPPFLAGS += -DMDNS_VERSIONSTR_NODTS +pics/dnssd_clientstub.o := CERRWARN += -_gcc=-Wno-unused-but-set-variable + .PARALLEL = $(OBJECTS) .KEEP_STATE: diff --git a/usr/src/lib/libldap5/sources/ldap/common/tmplout.c b/usr/src/lib/libldap5/sources/ldap/common/tmplout.c index 91b2c7ef4a..0e4e9a5336 100644 --- a/usr/src/lib/libldap5/sources/ldap/common/tmplout.c +++ b/usr/src/lib/libldap5/sources/ldap/common/tmplout.c @@ -3,8 +3,6 @@ * All rights reserved. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * The contents of this file are subject to the Netscape Public * License Version 1.1 (the "License"); you may not use this file @@ -448,7 +446,7 @@ do_entry2text_search( char *urlprefix ) { - int err, freedn, html; + int err, freedn; char *buf, **fetchattrs, **vals; LDAPMessage *ldmp; struct ldap_disptmpl *tmpl; @@ -464,8 +462,6 @@ do_entry2text_search( return( err ); } - html = ( urlprefix != NULL ); - timeout.tv_sec = SEARCH_TIMEOUT_SECS; timeout.tv_usec = 0; @@ -1039,7 +1035,7 @@ searchaction( LDAP *ld, char *buf, char *base, LDAPMessage *entry, char *dn, { int err = LDAP_SUCCESS, lderr, i, count, html; char **vals, **members; - char *value, *filtpattern, *attr, *selectname; + char *value, *filtpattern, *attr; char *retattrs[2], filter[ 256 ]; LDAPMessage *ldmp; struct timeval timeout; @@ -1056,7 +1052,6 @@ searchaction( LDAP *ld, char *buf, char *base, LDAPMessage *entry, char *dn, filtpattern = tip->ti_args[ 1 ]; retattrs[ 0 ] = tip->ti_args[ 2 ]; retattrs[ 1 ] = NULL; - selectname = tip->ti_args[ 3 ]; vals = NULL; if ( attr == NULL ) { diff --git a/usr/src/lib/libm/common/C/atan2.c b/usr/src/lib/libm/common/C/atan2.c index df4c762469..f18a9b6ef6 100644 --- a/usr/src/lib/libm/common/C/atan2.c +++ b/usr/src/lib/libm/common/C/atan2.c @@ -410,7 +410,7 @@ atan2(double oy, double ox) { double ah, al, t, xh, x, y, z; int i, k, hx, hy, sx, sy; #ifndef lint - volatile int inexact; + volatile int inexact __unused; #endif hy = ((int *)&oy)[HIWORD]; diff --git a/usr/src/lib/libm/common/C/exp.c b/usr/src/lib/libm/common/C/exp.c index ff30798acf..c406bdf82c 100644 --- a/usr/src/lib/libm/common/C/exp.c +++ b/usr/src/lib/libm/common/C/exp.c @@ -293,7 +293,7 @@ exp(double x) { if (hx < 0x3ff0a2b2) { /* |x| < 3/2 ln 2 */ if (hx < 0x3f862e42) { /* |x| < 1/64 ln 2 */ if (hx < 0x3ed00000) { /* |x| < 2^-18 */ - volatile int dummy; + volatile int dummy __unused; dummy = (int)x; /* raise inexact if x != 0 */ #ifdef lint diff --git a/usr/src/lib/libm/common/C/ilogb.c b/usr/src/lib/libm/common/C/ilogb.c index 93423a812d..2c06b61207 100644 --- a/usr/src/lib/libm/common/C/ilogb.c +++ b/usr/src/lib/libm/common/C/ilogb.c @@ -62,7 +62,7 @@ raise_invalid(int v) { /* SUSv3 requires ilogb(0,+/-Inf,NaN) raise invalid */ #ifndef lint if ((__xpg6 & _C99SUSv3_ilogb_0InfNaN_raises_invalid) != 0) { static const double zero = 0.0; - volatile double dummy; + volatile double dummy __unused; dummy = zero / zero; } diff --git a/usr/src/lib/libm/common/C/nextafter.c b/usr/src/lib/libm/common/C/nextafter.c index e17b40286b..0b98d3f523 100644 --- a/usr/src/lib/libm/common/C/nextafter.c +++ b/usr/src/lib/libm/common/C/nextafter.c @@ -37,7 +37,7 @@ nextafter(double x, double y) { int hx, hy, k; double ans; unsigned lx; - volatile double dummy; + volatile double dummy __unused; hx = ((int *)&x)[HIWORD]; lx = ((int *)&x)[LOWORD]; diff --git a/usr/src/lib/libm/common/C/tanh.c b/usr/src/lib/libm/common/C/tanh.c index 3b2c2cc708..2c3d5f6deb 100644 --- a/usr/src/lib/libm/common/C/tanh.c +++ b/usr/src/lib/libm/common/C/tanh.c @@ -70,7 +70,7 @@ double tanh(double x) { double t, y, z; int signx; - volatile double dummy; + volatile double dummy __unused; if (isnan(x)) return (x * x); /* + -> * for Cheetah */ diff --git a/usr/src/lib/libm/common/LD/asinhl.c b/usr/src/lib/libm/common/LD/asinhl.c index fd6ea48b84..6d248f3ae1 100644 --- a/usr/src/lib/libm/common/LD/asinhl.c +++ b/usr/src/lib/libm/common/LD/asinhl.c @@ -41,7 +41,7 @@ long double asinhl(long double x) { long double t, w; #ifndef lint - volatile long double dummy; + volatile long double dummy __unused; #endif w = fabsl(x); diff --git a/usr/src/lib/libm/common/LD/j0l.c b/usr/src/lib/libm/common/LD/j0l.c index a67def5e55..9dd5e11a1e 100644 --- a/usr/src/lib/libm/common/LD/j0l.c +++ b/usr/src/lib/libm/common/LD/j0l.c @@ -160,8 +160,10 @@ static GENERIC v0[8] = { }; GENERIC -y0l(x) GENERIC x; { - GENERIC z, d, s, c, ss, cc, u, v; +y0l(GENERIC x) +{ + GENERIC z, s, c, ss, cc, u, v; + GENERIC d __unused; int i; if (isnanl(x)) diff --git a/usr/src/lib/libm/common/LD/nextafterl.c b/usr/src/lib/libm/common/LD/nextafterl.c index 58c8a03d22..e2c669dd44 100644 --- a/usr/src/lib/libm/common/LD/nextafterl.c +++ b/usr/src/lib/libm/common/LD/nextafterl.c @@ -104,7 +104,7 @@ nextafterl(long double x, long double y) { } #ifndef lint { - volatile long double dummy; + volatile long double dummy __unused; int k = XBIASED_EXP(x); if (k == 0) diff --git a/usr/src/lib/libm/common/LD/tanhl.c b/usr/src/lib/libm/common/LD/tanhl.c index f5846d6bc3..5d6169c6e6 100644 --- a/usr/src/lib/libm/common/LD/tanhl.c +++ b/usr/src/lib/libm/common/LD/tanhl.c @@ -71,7 +71,7 @@ tanhl(long double x) { long double t, y, z; int signx; #ifndef lint - volatile long double dummy; + volatile long double dummy __unused; #endif if (isnanl(x)) diff --git a/usr/src/lib/libm/common/R/atanf.c b/usr/src/lib/libm/common/R/atanf.c index 4a2f7ca386..a6379e8949 100644 --- a/usr/src/lib/libm/common/R/atanf.c +++ b/usr/src/lib/libm/common/R/atanf.c @@ -104,7 +104,7 @@ static const float float atanf(float xx) { float x, y, z, r, p, s; - volatile double dummy; + volatile double dummy __unused; int ix, iy, sign, j; x = xx; diff --git a/usr/src/lib/libm/common/R/cosf.c b/usr/src/lib/libm/common/R/cosf.c index 046353fbe5..ad79ad7bfe 100644 --- a/usr/src/lib/libm/common/R/cosf.c +++ b/usr/src/lib/libm/common/R/cosf.c @@ -76,7 +76,7 @@ cosf(float x) double y, z, w; float f; int n, ix, hx, hy; - volatile int i; + volatile int i __unused; hx = *((int *)&x); ix = hx & 0x7fffffff; diff --git a/usr/src/lib/libm/common/R/floorf.c b/usr/src/lib/libm/common/R/floorf.c index 088e737ae9..f432e91a93 100644 --- a/usr/src/lib/libm/common/R/floorf.c +++ b/usr/src/lib/libm/common/R/floorf.c @@ -56,7 +56,7 @@ static const float xf[] = { float ceilf(float x) { - volatile float dummy; + volatile float dummy __unused; int hx, k, j, ix; hx = *(int *) &x; @@ -84,7 +84,7 @@ ceilf(float x) { float floorf(float x) { - volatile float dummy; + volatile float dummy __unused; int hx, k, j, ix; hx = *(int *) &x; diff --git a/usr/src/lib/libm/common/R/ilogbf.c b/usr/src/lib/libm/common/R/ilogbf.c index 7fec12a893..afd417415e 100644 --- a/usr/src/lib/libm/common/R/ilogbf.c +++ b/usr/src/lib/libm/common/R/ilogbf.c @@ -58,7 +58,7 @@ raise_invalid(int v) { /* SUSv3 requires ilogbf(0,+/-Inf,NaN) raise invalid */ #ifndef lint if ((__xpg6 & _C99SUSv3_ilogb_0InfNaN_raises_invalid) != 0) { static const double zero = 0.0; - volatile double dummy; + volatile double dummy __unused; dummy = zero / zero; } diff --git a/usr/src/lib/libm/common/R/rintf.c b/usr/src/lib/libm/common/R/rintf.c index b6f7a7b3ae..fae0049ae9 100644 --- a/usr/src/lib/libm/common/R/rintf.c +++ b/usr/src/lib/libm/common/R/rintf.c @@ -85,7 +85,7 @@ aintf(float x) { float anintf(float x) { - volatile float dummy; + volatile float dummy __unused; int hx, k, j, ix; hx = *(int *) &x; @@ -122,7 +122,7 @@ irintf(float x) { int nintf(float x) { int hx, ix, k, j, m; - volatile float dummy; + volatile float dummy __unused; hx = *(int *) &x; k = (hx & ~0x80000000) >> 23; diff --git a/usr/src/lib/libm/common/R/sincosf.c b/usr/src/lib/libm/common/R/sincosf.c index 6a9b6cffbb..9a36e5b28c 100644 --- a/usr/src/lib/libm/common/R/sincosf.c +++ b/usr/src/lib/libm/common/R/sincosf.c @@ -98,7 +98,7 @@ sincosf(float x, float *s, float *c) double y, z, w; float f, g; int n, ix, hx, hy; - volatile int i; + volatile int i __unused; hx = *((int *)&x); ix = hx & 0x7fffffff; diff --git a/usr/src/lib/libm/common/R/sinf.c b/usr/src/lib/libm/common/R/sinf.c index 1dce3f0f56..3e84a670b1 100644 --- a/usr/src/lib/libm/common/R/sinf.c +++ b/usr/src/lib/libm/common/R/sinf.c @@ -76,7 +76,7 @@ sinf(float x) double y, z, w; float f; int n, ix, hx, hy; - volatile int i; + volatile int i __unused; hx = *((int *)&x); ix = hx & 0x7fffffff; diff --git a/usr/src/lib/libm/common/R/tanf.c b/usr/src/lib/libm/common/R/tanf.c index 67c5af9883..b279be695f 100644 --- a/usr/src/lib/libm/common/R/tanf.c +++ b/usr/src/lib/libm/common/R/tanf.c @@ -76,7 +76,7 @@ tanf(float x) double y, z, w; float f; int n, ix, hx, hy; - volatile int i; + volatile int i __unused; hx = *((int *)&x); ix = hx & 0x7fffffff; diff --git a/usr/src/lib/libm/common/m9x/__fex_i386.c b/usr/src/lib/libm/common/m9x/__fex_i386.c index c6ffa593be..2936bf9271 100644 --- a/usr/src/lib/libm/common/m9x/__fex_i386.c +++ b/usr/src/lib/libm/common/m9x/__fex_i386.c @@ -572,7 +572,7 @@ __fex_get_op(siginfo_t *sip, ucontext_t *uap, fex_info_t *info) long double op2v, x; unsigned int cwsw, ex, sw, op; unsigned long ea; - volatile int c; + volatile int c __unused; /* get the exception type, status word, opcode, and data address */ ex = sip->si_code; diff --git a/usr/src/lib/libm/common/m9x/nexttowardl.c b/usr/src/lib/libm/common/m9x/nexttowardl.c index e91b88963c..9c30314b0f 100644 --- a/usr/src/lib/libm/common/m9x/nexttowardl.c +++ b/usr/src/lib/libm/common/m9x/nexttowardl.c @@ -104,7 +104,7 @@ nexttowardl(long double x, long double y) { } #ifndef lint { - volatile long double dummy; + volatile long double dummy __unused; int k = XBIASED_EXP(x); if (k == 0) diff --git a/usr/src/lib/libresolv2/common/bsd/ftruncate.c b/usr/src/lib/libresolv2/common/bsd/ftruncate.c index 5ac4ebac9b..744d205ce7 100644 --- a/usr/src/lib/libresolv2/common/bsd/ftruncate.c +++ b/usr/src/lib/libresolv2/common/bsd/ftruncate.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: ftruncate.c,v 1.3 2005/04/27 18:16:45 sra Exp $"; -#endif - /*! \file * \brief * ftruncate - set file size, BSD Style diff --git a/usr/src/lib/libresolv2/common/bsd/gettimeofday.c b/usr/src/lib/libresolv2/common/bsd/gettimeofday.c index 2926a3575e..f5ff8c54f5 100644 --- a/usr/src/lib/libresolv2/common/bsd/gettimeofday.c +++ b/usr/src/lib/libresolv2/common/bsd/gettimeofday.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: gettimeofday.c,v 1.4 2005/04/27 04:56:11 sra Exp $"; -#endif - #include "port_before.h" #include <stdio.h> #include <syslog.h> diff --git a/usr/src/lib/libresolv2/common/bsd/mktemp.c b/usr/src/lib/libresolv2/common/bsd/mktemp.c index 001b24b58f..2d41b9b0ee 100644 --- a/usr/src/lib/libresolv2/common/bsd/mktemp.c +++ b/usr/src/lib/libresolv2/common/bsd/mktemp.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)mktemp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: mktemp.c,v 1.2 2005/04/27 04:56:11 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/putenv.c b/usr/src/lib/libresolv2/common/bsd/putenv.c index 2dcbc57e6c..de1b070de6 100644 --- a/usr/src/lib/libresolv2/common/bsd/putenv.c +++ b/usr/src/lib/libresolv2/common/bsd/putenv.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: putenv.c,v 1.2 2005/04/27 04:56:11 sra Exp $"; -#endif - #include "port_before.h" #include "port_after.h" diff --git a/usr/src/lib/libresolv2/common/bsd/readv.c b/usr/src/lib/libresolv2/common/bsd/readv.c index 5fa691a92f..0a8ade0ec1 100644 --- a/usr/src/lib/libresolv2/common/bsd/readv.c +++ b/usr/src/lib/libresolv2/common/bsd/readv.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: readv.c,v 1.2 2005/04/27 04:56:11 sra Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/bsd/setenv.c b/usr/src/lib/libresolv2/common/bsd/setenv.c index baf00f6ff2..f9fdbb7be4 100644 --- a/usr/src/lib/libresolv2/common/bsd/setenv.c +++ b/usr/src/lib/libresolv2/common/bsd/setenv.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)setenv.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: setenv.c,v 1.2 2005/04/27 04:56:11 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/setitimer.c b/usr/src/lib/libresolv2/common/bsd/setitimer.c index 67881d7ca8..d336ac80d9 100644 --- a/usr/src/lib/libresolv2/common/bsd/setitimer.c +++ b/usr/src/lib/libresolv2/common/bsd/setitimer.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: setitimer.c,v 1.2 2005/04/27 04:56:12 sra Exp $"; -#endif - #include "port_before.h" #include <sys/time.h> diff --git a/usr/src/lib/libresolv2/common/bsd/strcasecmp.c b/usr/src/lib/libresolv2/common/bsd/strcasecmp.c index 0c9f0dccf0..adf76ae483 100644 --- a/usr/src/lib/libresolv2/common/bsd/strcasecmp.c +++ b/usr/src/lib/libresolv2/common/bsd/strcasecmp.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: strcasecmp.c,v 1.2 2005/04/27 04:56:12 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1987, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/strerror.c b/usr/src/lib/libresolv2/common/bsd/strerror.c index 5973e63d5b..107215c798 100644 --- a/usr/src/lib/libresolv2/common/bsd/strerror.c +++ b/usr/src/lib/libresolv2/common/bsd/strerror.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)strerror.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: strerror.c,v 1.6 2008/02/18 03:49:08 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1988, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/strpbrk.c b/usr/src/lib/libresolv2/common/bsd/strpbrk.c index 4c12d88e1c..01e08dd5f4 100644 --- a/usr/src/lib/libresolv2/common/bsd/strpbrk.c +++ b/usr/src/lib/libresolv2/common/bsd/strpbrk.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)strpbrk.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: strpbrk.c,v 1.2 2005/04/27 04:56:12 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1985, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/strsep.c b/usr/src/lib/libresolv2/common/bsd/strsep.c index c7969f0028..0470733543 100644 --- a/usr/src/lib/libresolv2/common/bsd/strsep.c +++ b/usr/src/lib/libresolv2/common/bsd/strsep.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "strsep.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: strsep.c,v 1.2 2005/04/27 04:56:12 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/strtoul.c b/usr/src/lib/libresolv2/common/bsd/strtoul.c index b37ff72729..bc199708b7 100644 --- a/usr/src/lib/libresolv2/common/bsd/strtoul.c +++ b/usr/src/lib/libresolv2/common/bsd/strtoul.c @@ -1,8 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)strtoul.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: strtoul.c,v 1.4 2008/02/18 03:49:08 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. diff --git a/usr/src/lib/libresolv2/common/bsd/writev.c b/usr/src/lib/libresolv2/common/bsd/writev.c index 65baa71cfc..086f93266b 100644 --- a/usr/src/lib/libresolv2/common/bsd/writev.c +++ b/usr/src/lib/libresolv2/common/bsd/writev.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: writev.c,v 1.3 2005/04/27 04:56:13 sra Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/dst/dst_api.c b/usr/src/lib/libresolv2/common/dst/dst_api.c index 931af41a88..8b611cc41e 100644 --- a/usr/src/lib/libresolv2/common/dst/dst_api.c +++ b/usr/src/lib/libresolv2/common/dst/dst_api.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Header: /proj/cvs/prod/libbind/dst/dst_api.c,v 1.17 2007/09/24 17:18:25 each Exp $"; -#endif - /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * diff --git a/usr/src/lib/libresolv2/common/dst/hmac_link.c b/usr/src/lib/libresolv2/common/dst/hmac_link.c index 071e8d2aad..db96f5992f 100644 --- a/usr/src/lib/libresolv2/common/dst/hmac_link.c +++ b/usr/src/lib/libresolv2/common/dst/hmac_link.c @@ -5,9 +5,6 @@ #ifdef HMAC_MD5 -#ifndef LINT -static const char rcsid[] = "$Header: /proj/cvs/prod/libbind/dst/hmac_link.c,v 1.8 2007/09/24 17:18:25 each Exp $"; -#endif /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * diff --git a/usr/src/lib/libresolv2/common/dst/support.c b/usr/src/lib/libresolv2/common/dst/support.c index 730397f4c0..8c8c7e3dfc 100644 --- a/usr/src/lib/libresolv2/common/dst/support.c +++ b/usr/src/lib/libresolv2/common/dst/support.c @@ -1,6 +1,3 @@ -static const char rcsid[] = "$Header: /proj/cvs/prod/libbind/dst/support.c,v 1.6 2005/10/11 00:10:13 marka Exp $"; - - /* * Portions Copyright (c) 1995-1998 by Trusted Information Systems, Inc. * diff --git a/usr/src/lib/libresolv2/common/irs/dns.c b/usr/src/lib/libresolv2/common/irs/dns.c index cbea94680e..043efe8b68 100644 --- a/usr/src/lib/libresolv2/common/irs/dns.c +++ b/usr/src/lib/libresolv2/common/irs/dns.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: dns.c,v 1.5 2006/03/09 23:57:56 marka Exp $"; -#endif - /*! \file * \brief * dns.c --- this is the top-level accessor function for the dns diff --git a/usr/src/lib/libresolv2/common/irs/dns_ho.c b/usr/src/lib/libresolv2/common/irs/dns_ho.c index d279b685a1..a02bc54cbe 100644 --- a/usr/src/lib/libresolv2/common/irs/dns_ho.c +++ b/usr/src/lib/libresolv2/common/irs/dns_ho.c @@ -51,10 +51,6 @@ /* from gethostnamadr.c 8.1 (Berkeley) 6/4/93 */ /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: dns_ho.c,v 1.23 2008/11/14 02:36:51 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports. */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/dns_nw.c b/usr/src/lib/libresolv2/common/irs/dns_nw.c index dc1e61739b..408663b67e 100644 --- a/usr/src/lib/libresolv2/common/irs/dns_nw.c +++ b/usr/src/lib/libresolv2/common/irs/dns_nw.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: dns_nw.c,v 1.12 2005/04/27 04:56:22 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports. */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/dns_pr.c b/usr/src/lib/libresolv2/common/irs/dns_pr.c index 137f306218..877e4bb3e5 100644 --- a/usr/src/lib/libresolv2/common/irs/dns_pr.c +++ b/usr/src/lib/libresolv2/common/irs/dns_pr.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: dns_pr.c,v 1.5 2005/04/27 04:56:22 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/dns_sv.c b/usr/src/lib/libresolv2/common/irs/dns_sv.c index c3294255b8..9b612cdae7 100644 --- a/usr/src/lib/libresolv2/common/irs/dns_sv.c +++ b/usr/src/lib/libresolv2/common/irs/dns_sv.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: dns_sv.c,v 1.5 2005/04/27 04:56:23 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gen.c b/usr/src/lib/libresolv2/common/irs/gen.c index 2bc125448b..2354044169 100644 --- a/usr/src/lib/libresolv2/common/irs/gen.c +++ b/usr/src/lib/libresolv2/common/irs/gen.c @@ -21,10 +21,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gen.c,v 1.7 2005/04/27 04:56:23 sra Exp $"; -#endif - /*! \file * \brief * this is the top level dispatcher diff --git a/usr/src/lib/libresolv2/common/irs/gen_ho.c b/usr/src/lib/libresolv2/common/irs/gen_ho.c index d38ea26b86..086c84ce38 100644 --- a/usr/src/lib/libresolv2/common/irs/gen_ho.c +++ b/usr/src/lib/libresolv2/common/irs/gen_ho.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: gen_ho.c,v 1.5 2006/03/09 23:57:56 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gen_ng.c b/usr/src/lib/libresolv2/common/irs/gen_ng.c index c617c7c9f5..f4da59728a 100644 --- a/usr/src/lib/libresolv2/common/irs/gen_ng.c +++ b/usr/src/lib/libresolv2/common/irs/gen_ng.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gen_ng.c,v 1.3 2005/04/27 04:56:23 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gen_nw.c b/usr/src/lib/libresolv2/common/irs/gen_nw.c index 480a435478..db3640b7ca 100644 --- a/usr/src/lib/libresolv2/common/irs/gen_nw.c +++ b/usr/src/lib/libresolv2/common/irs/gen_nw.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gen_nw.c,v 1.4 2005/04/27 04:56:23 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gen_pr.c b/usr/src/lib/libresolv2/common/irs/gen_pr.c index 93c0426c78..792cdd69a2 100644 --- a/usr/src/lib/libresolv2/common/irs/gen_pr.c +++ b/usr/src/lib/libresolv2/common/irs/gen_pr.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gen_pr.c,v 1.3 2005/04/27 04:56:24 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gen_sv.c b/usr/src/lib/libresolv2/common/irs/gen_sv.c index 4cad166d2f..e0e1ccbeb7 100644 --- a/usr/src/lib/libresolv2/common/irs/gen_sv.c +++ b/usr/src/lib/libresolv2/common/irs/gen_sv.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gen_sv.c,v 1.3 2005/04/27 04:56:24 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gethostent.c b/usr/src/lib/libresolv2/common/irs/gethostent.c index 57c9d24496..d25373c689 100644 --- a/usr/src/lib/libresolv2/common/irs/gethostent.c +++ b/usr/src/lib/libresolv2/common/irs/gethostent.c @@ -21,10 +21,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: gethostent.c,v 1.8 2006/01/10 05:06:00 marka Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/gethostent_r.c b/usr/src/lib/libresolv2/common/irs/gethostent_r.c index fdb7ee225c..97583ef74e 100644 --- a/usr/src/lib/libresolv2/common/irs/gethostent_r.c +++ b/usr/src/lib/libresolv2/common/irs/gethostent_r.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: gethostent_r.c,v 1.9 2005/09/03 12:41:37 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include <port_before.h> #if !defined(_REENTRANT) || !defined(DO_PTHREADS) static int gethostent_r_not_required = 0; diff --git a/usr/src/lib/libresolv2/common/irs/getnetent.c b/usr/src/lib/libresolv2/common/irs/getnetent.c index a6abe7175b..63a5454f58 100644 --- a/usr/src/lib/libresolv2/common/irs/getnetent.c +++ b/usr/src/lib/libresolv2/common/irs/getnetent.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: getnetent.c,v 1.7 2005/04/27 04:56:25 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/getnetent_r.c b/usr/src/lib/libresolv2/common/irs/getnetent_r.c index 9fb52bc394..df6831ff12 100644 --- a/usr/src/lib/libresolv2/common/irs/getnetent_r.c +++ b/usr/src/lib/libresolv2/common/irs/getnetent_r.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getnetent_r.c,v 1.6 2005/09/03 12:41:38 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include <port_before.h> #if !defined(_REENTRANT) || !defined(DO_PTHREADS) static int getnetent_r_not_required = 0; diff --git a/usr/src/lib/libresolv2/common/irs/getnetgrent.c b/usr/src/lib/libresolv2/common/irs/getnetgrent.c index 2a21772468..163c2bc43d 100644 --- a/usr/src/lib/libresolv2/common/irs/getnetgrent.c +++ b/usr/src/lib/libresolv2/common/irs/getnetgrent.c @@ -15,10 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getnetgrent.c,v 1.6 2008/11/14 02:36:51 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/getnetgrent_r.c b/usr/src/lib/libresolv2/common/irs/getnetgrent_r.c index aa8810320d..2cc697910e 100644 --- a/usr/src/lib/libresolv2/common/irs/getnetgrent_r.c +++ b/usr/src/lib/libresolv2/common/irs/getnetgrent_r.c @@ -15,10 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getnetgrent_r.c,v 1.14 2008/11/14 02:36:51 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include <port_before.h> #if !defined(_REENTRANT) || !defined(DO_PTHREADS) static int getnetgrent_r_not_required = 0; diff --git a/usr/src/lib/libresolv2/common/irs/getprotoent.c b/usr/src/lib/libresolv2/common/irs/getprotoent.c index 1e109f9659..0a9ceccfae 100644 --- a/usr/src/lib/libresolv2/common/irs/getprotoent.c +++ b/usr/src/lib/libresolv2/common/irs/getprotoent.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: getprotoent.c,v 1.4 2005/04/27 04:56:26 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/getprotoent_r.c b/usr/src/lib/libresolv2/common/irs/getprotoent_r.c index d5d9ae53b6..b9a2623bf1 100644 --- a/usr/src/lib/libresolv2/common/irs/getprotoent_r.c +++ b/usr/src/lib/libresolv2/common/irs/getprotoent_r.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getprotoent_r.c,v 1.6 2006/08/01 01:14:16 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include <port_before.h> #if !defined(_REENTRANT) || !defined(DO_PTHREADS) static int getprotoent_r_not_required = 0; diff --git a/usr/src/lib/libresolv2/common/irs/getservent.c b/usr/src/lib/libresolv2/common/irs/getservent.c index 8de0db3058..669badca0c 100644 --- a/usr/src/lib/libresolv2/common/irs/getservent.c +++ b/usr/src/lib/libresolv2/common/irs/getservent.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: getservent.c,v 1.4 2005/04/27 04:56:26 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/getservent_r.c b/usr/src/lib/libresolv2/common/irs/getservent_r.c index 42d1e46163..91cebcf480 100644 --- a/usr/src/lib/libresolv2/common/irs/getservent_r.c +++ b/usr/src/lib/libresolv2/common/irs/getservent_r.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: getservent_r.c,v 1.6 2006/08/01 01:14:16 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include <port_before.h> #if !defined(_REENTRANT) || !defined(DO_PTHREADS) static int getservent_r_not_required = 0; diff --git a/usr/src/lib/libresolv2/common/irs/hesiod.c b/usr/src/lib/libresolv2/common/irs/hesiod.c index 80d669dbe0..4cef8f52ac 100644 --- a/usr/src/lib/libresolv2/common/irs/hesiod.c +++ b/usr/src/lib/libresolv2/common/irs/hesiod.c @@ -1,7 +1,3 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: hesiod.c,v 1.7 2005/07/28 06:51:48 marka Exp $"; -#endif - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996,1999 by Internet Software Consortium. diff --git a/usr/src/lib/libresolv2/common/irs/irp.c b/usr/src/lib/libresolv2/common/irs/irp.c index ef10631c22..07659c49af 100644 --- a/usr/src/lib/libresolv2/common/irs/irp.c +++ b/usr/src/lib/libresolv2/common/irs/irp.c @@ -15,12 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: irp.c,v 1.12 2008/11/14 02:36:51 marka Exp $"; -#endif - -/* Imports */ - #include "port_before.h" #include <syslog.h> diff --git a/usr/src/lib/libresolv2/common/irs/irp_ho.c b/usr/src/lib/libresolv2/common/irs/irp_ho.c index d4ce5c3bbe..c6710c7e79 100644 --- a/usr/src/lib/libresolv2/common/irs/irp_ho.c +++ b/usr/src/lib/libresolv2/common/irs/irp_ho.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: irp_ho.c,v 1.3 2005/04/27 04:56:28 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports. */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/irp_ng.c b/usr/src/lib/libresolv2/common/irs/irp_ng.c index 1af862cab4..ef5e5db67c 100644 --- a/usr/src/lib/libresolv2/common/irs/irp_ng.c +++ b/usr/src/lib/libresolv2/common/irs/irp_ng.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: irp_ng.c,v 1.4 2006/12/07 04:46:27 marka Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/irp_nw.c b/usr/src/lib/libresolv2/common/irs/irp_nw.c index eb4654f9b9..beaae89a6a 100644 --- a/usr/src/lib/libresolv2/common/irs/irp_nw.c +++ b/usr/src/lib/libresolv2/common/irs/irp_nw.c @@ -15,14 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: irp_nw.c,v 1.4 2006/03/09 23:57:56 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - -#if 0 - -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/irp_pr.c b/usr/src/lib/libresolv2/common/irs/irp_pr.c index ea876e8281..a78f5b2b73 100644 --- a/usr/src/lib/libresolv2/common/irs/irp_pr.c +++ b/usr/src/lib/libresolv2/common/irs/irp_pr.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: irp_pr.c,v 1.3 2005/04/27 04:56:29 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - -/* extern */ - #include "port_before.h" #include <syslog.h> diff --git a/usr/src/lib/libresolv2/common/irs/irp_sv.c b/usr/src/lib/libresolv2/common/irs/irp_sv.c index 577e697fe6..5cd3e74032 100644 --- a/usr/src/lib/libresolv2/common/irs/irp_sv.c +++ b/usr/src/lib/libresolv2/common/irs/irp_sv.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: irp_sv.c,v 1.3 2005/04/27 04:56:29 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - -/* extern */ - #include "port_before.h" #include <syslog.h> diff --git a/usr/src/lib/libresolv2/common/irs/irpmarshall.c b/usr/src/lib/libresolv2/common/irs/irpmarshall.c index 85ffff1866..a33bb5bfbd 100644 --- a/usr/src/lib/libresolv2/common/irs/irpmarshall.c +++ b/usr/src/lib/libresolv2/common/irs/irpmarshall.c @@ -48,10 +48,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: irpmarshall.c,v 1.7 2006/03/09 23:57:56 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #if 0 Check values are in approrpriate endian order. diff --git a/usr/src/lib/libresolv2/common/irs/irs_data.c b/usr/src/lib/libresolv2/common/irs/irs_data.c index c4bd1d6913..3bf0e3ca2e 100644 --- a/usr/src/lib/libresolv2/common/irs/irs_data.c +++ b/usr/src/lib/libresolv2/common/irs/irs_data.c @@ -19,10 +19,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: irs_data.c,v 1.12 2007/08/27 03:32:26 marka Exp $"; -#endif - #include "port_before.h" #ifndef __BIND_NOSTATIC diff --git a/usr/src/lib/libresolv2/common/irs/lcl.c b/usr/src/lib/libresolv2/common/irs/lcl.c index ea78a258a6..9fc9893b9b 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl.c +++ b/usr/src/lib/libresolv2/common/irs/lcl.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: lcl.c,v 1.4 2005/04/27 04:56:30 sra Exp $"; -#endif - -/* Imports */ - #include "port_before.h" #include <stdlib.h> diff --git a/usr/src/lib/libresolv2/common/irs/lcl_ho.c b/usr/src/lib/libresolv2/common/irs/lcl_ho.c index 6c5246a5c4..85379e4f2f 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl_ho.c +++ b/usr/src/lib/libresolv2/common/irs/lcl_ho.c @@ -51,10 +51,6 @@ /* from gethostnamadr.c 8.1 (Berkeley) 6/4/93 */ /* BIND Id: gethnamaddr.c,v 8.15 1996/05/22 04:56:30 vixie Exp $ */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: lcl_ho.c,v 1.5 2006/03/09 23:57:56 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - /* Imports. */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/lcl_ng.c b/usr/src/lib/libresolv2/common/irs/lcl_ng.c index 70e0b4563f..817052b28e 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl_ng.c +++ b/usr/src/lib/libresolv2/common/irs/lcl_ng.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: lcl_ng.c,v 1.3 2005/04/27 04:56:31 sra Exp $"; -#endif - /* Imports */ #include "port_before.h" diff --git a/usr/src/lib/libresolv2/common/irs/lcl_nw.c b/usr/src/lib/libresolv2/common/irs/lcl_nw.c index 79b55a0c04..0301db07aa 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl_nw.c +++ b/usr/src/lib/libresolv2/common/irs/lcl_nw.c @@ -48,11 +48,8 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: lcl_nw.c,v 1.4 2005/04/27 04:56:31 sra Exp $"; /* from getgrent.c 8.2 (Berkeley) 3/21/94"; */ /* from BSDI Id: getgrent.c,v 2.8 1996/05/28 18:15:14 bostic Exp $ */ -#endif /* LIBC_SCCS and not lint */ /* Imports */ diff --git a/usr/src/lib/libresolv2/common/irs/lcl_pr.c b/usr/src/lib/libresolv2/common/irs/lcl_pr.c index 622158eb17..8a9487e6bc 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl_pr.c +++ b/usr/src/lib/libresolv2/common/irs/lcl_pr.c @@ -48,12 +48,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: lcl_pr.c,v 1.4 2006/03/09 23:57:56 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - -/* extern */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/irs/lcl_sv.c b/usr/src/lib/libresolv2/common/irs/lcl_sv.c index 8d0049bb46..db90bc1db3 100644 --- a/usr/src/lib/libresolv2/common/irs/lcl_sv.c +++ b/usr/src/lib/libresolv2/common/irs/lcl_sv.c @@ -48,12 +48,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: lcl_sv.c,v 1.4 2005/04/27 04:56:31 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - -/* extern */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/irs/nis.c b/usr/src/lib/libresolv2/common/irs/nis.c index 9abc47403a..48febc854f 100644 --- a/usr/src/lib/libresolv2/common/irs/nis.c +++ b/usr/src/lib/libresolv2/common/irs/nis.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: nis.c,v 1.3 2005/04/27 04:56:32 sra Exp $"; -#endif - -/* Imports */ - #include "port_before.h" #ifdef WANT_IRS_NIS diff --git a/usr/src/lib/libresolv2/common/irs/nul_ng.c b/usr/src/lib/libresolv2/common/irs/nul_ng.c index e5811b563c..8f85c9682a 100644 --- a/usr/src/lib/libresolv2/common/irs/nul_ng.c +++ b/usr/src/lib/libresolv2/common/irs/nul_ng.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: nul_ng.c,v 1.3 2005/04/27 04:56:34 sra Exp $"; -#endif - /*! \file * \brief * nul_ng.c - the netgroup accessor null map diff --git a/usr/src/lib/libresolv2/common/irs/util.c b/usr/src/lib/libresolv2/common/irs/util.c index 794c10b107..ff4095a9a5 100644 --- a/usr/src/lib/libresolv2/common/irs/util.c +++ b/usr/src/lib/libresolv2/common/irs/util.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: util.c,v 1.3 2005/04/27 04:56:34 sra Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/isc/assertions.c b/usr/src/lib/libresolv2/common/isc/assertions.c index b71e5a32d3..6516d66cc8 100644 --- a/usr/src/lib/libresolv2/common/isc/assertions.c +++ b/usr/src/lib/libresolv2/common/isc/assertions.c @@ -15,10 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: assertions.c,v 1.5 2008/11/14 02:36:51 marka Exp $"; -#endif - #include "port_before.h" #include <errno.h> diff --git a/usr/src/lib/libresolv2/common/isc/base64.c b/usr/src/lib/libresolv2/common/isc/base64.c index 97a6876e4e..f0b727206e 100644 --- a/usr/src/lib/libresolv2/common/isc/base64.c +++ b/usr/src/lib/libresolv2/common/isc/base64.c @@ -46,10 +46,6 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: base64.c,v 1.4 2005/04/27 04:56:34 sra Exp $"; -#endif /* not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/isc/bitncmp.c b/usr/src/lib/libresolv2/common/isc/bitncmp.c index efe5009292..d229e04c89 100644 --- a/usr/src/lib/libresolv2/common/isc/bitncmp.c +++ b/usr/src/lib/libresolv2/common/isc/bitncmp.c @@ -15,10 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: bitncmp.c,v 1.5 2008/11/14 02:36:51 marka Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/isc/ctl_clnt.c b/usr/src/lib/libresolv2/common/isc/ctl_clnt.c index f71001a6d4..eca06b2ee2 100644 --- a/usr/src/lib/libresolv2/common/isc/ctl_clnt.c +++ b/usr/src/lib/libresolv2/common/isc/ctl_clnt.c @@ -15,12 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: ctl_clnt.c,v 1.11 2008/11/14 02:36:51 marka Exp $"; -#endif /* not lint */ - -/* Extern. */ - #include "port_before.h" #include <sys/param.h> diff --git a/usr/src/lib/libresolv2/common/isc/ctl_p.c b/usr/src/lib/libresolv2/common/isc/ctl_p.c index 7ab719a5e6..3c0ebf4037 100644 --- a/usr/src/lib/libresolv2/common/isc/ctl_p.c +++ b/usr/src/lib/libresolv2/common/isc/ctl_p.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: ctl_p.c,v 1.4 2005/04/27 04:56:35 sra Exp $"; -#endif /* not lint */ - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1998,1999 by Internet Software Consortium. diff --git a/usr/src/lib/libresolv2/common/isc/ctl_srvr.c b/usr/src/lib/libresolv2/common/isc/ctl_srvr.c index 8fd7a21ffa..12191cf0b0 100644 --- a/usr/src/lib/libresolv2/common/isc/ctl_srvr.c +++ b/usr/src/lib/libresolv2/common/isc/ctl_srvr.c @@ -15,12 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: ctl_srvr.c,v 1.10 2008/11/14 02:36:51 marka Exp $"; -#endif /* not lint */ - -/* Extern. */ - #include "port_before.h" #include <sys/param.h> diff --git a/usr/src/lib/libresolv2/common/isc/ev_connects.c b/usr/src/lib/libresolv2/common/isc/ev_connects.c index 38dfdbe512..821eb8ebff 100644 --- a/usr/src/lib/libresolv2/common/isc/ev_connects.c +++ b/usr/src/lib/libresolv2/common/isc/ev_connects.c @@ -19,12 +19,6 @@ * vix 16sep96 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_connects.c,v 1.8 2006/03/09 23:57:56 marka Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/ev_files.c b/usr/src/lib/libresolv2/common/isc/ev_files.c index b12baf1aaa..f75ff6b646 100644 --- a/usr/src/lib/libresolv2/common/isc/ev_files.c +++ b/usr/src/lib/libresolv2/common/isc/ev_files.c @@ -19,10 +19,6 @@ * vix 11sep95 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_files.c,v 1.8 2005/07/28 06:51:48 marka Exp $"; -#endif - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/ev_streams.c b/usr/src/lib/libresolv2/common/isc/ev_streams.c index 5dad36d04a..824b4e25c1 100644 --- a/usr/src/lib/libresolv2/common/isc/ev_streams.c +++ b/usr/src/lib/libresolv2/common/isc/ev_streams.c @@ -19,10 +19,6 @@ * vix 04mar96 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_streams.c,v 1.5 2005/04/27 04:56:36 sra Exp $"; -#endif - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/ev_timers.c b/usr/src/lib/libresolv2/common/isc/ev_timers.c index 12ac2cebca..4aab57f5ff 100644 --- a/usr/src/lib/libresolv2/common/isc/ev_timers.c +++ b/usr/src/lib/libresolv2/common/isc/ev_timers.c @@ -19,12 +19,6 @@ * vix 09sep95 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_timers.c,v 1.6 2005/04/27 04:56:36 sra Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/ev_waits.c b/usr/src/lib/libresolv2/common/isc/ev_waits.c index 99da1526c7..9c4e819eb8 100644 --- a/usr/src/lib/libresolv2/common/isc/ev_waits.c +++ b/usr/src/lib/libresolv2/common/isc/ev_waits.c @@ -19,10 +19,6 @@ * vix 05dec95 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: ev_waits.c,v 1.4 2005/04/27 04:56:36 sra Exp $"; -#endif - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/eventlib.c b/usr/src/lib/libresolv2/common/isc/eventlib.c index be4a7848b9..ef9832c3b7 100644 --- a/usr/src/lib/libresolv2/common/isc/eventlib.c +++ b/usr/src/lib/libresolv2/common/isc/eventlib.c @@ -19,10 +19,6 @@ * vix 09sep95 [initial] */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: eventlib.c,v 1.10 2006/03/09 23:57:56 marka Exp $"; -#endif - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/isc/heap.c b/usr/src/lib/libresolv2/common/isc/heap.c index 3d22b6fc71..3e48d244e2 100644 --- a/usr/src/lib/libresolv2/common/isc/heap.c +++ b/usr/src/lib/libresolv2/common/isc/heap.c @@ -25,10 +25,6 @@ * ISBN 0-201-06673-4, chapter 11. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: heap.c,v 1.4 2006/03/09 23:57:56 marka Exp $"; -#endif /* not lint */ - #include "port_before.h" #include <stddef.h> diff --git a/usr/src/lib/libresolv2/common/isc/logging.c b/usr/src/lib/libresolv2/common/isc/logging.c index 8c2af2b9e3..ac4806b4f8 100644 --- a/usr/src/lib/libresolv2/common/isc/logging.c +++ b/usr/src/lib/libresolv2/common/isc/logging.c @@ -15,10 +15,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: logging.c,v 1.9 2008/11/14 02:36:51 marka Exp $"; -#endif /* not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/isc/memcluster.c b/usr/src/lib/libresolv2/common/isc/memcluster.c index 515793fd6a..1a2db0605b 100644 --- a/usr/src/lib/libresolv2/common/isc/memcluster.c +++ b/usr/src/lib/libresolv2/common/isc/memcluster.c @@ -22,11 +22,6 @@ /* #define DEBUGGING_MEMCLUSTER */ #define MEMCLUSTER_ATEND - -#if !defined(LINT) && !defined(CODECENTER) -static const char rcsid[] = "$Id: memcluster.c,v 1.11 2006/08/30 23:34:38 marka Exp $"; -#endif /* not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/isc/tree.c b/usr/src/lib/libresolv2/common/isc/tree.c index 8ba675fbe8..404014602a 100644 --- a/usr/src/lib/libresolv2/common/isc/tree.c +++ b/usr/src/lib/libresolv2/common/isc/tree.c @@ -1,7 +1,3 @@ -#ifndef LINT -static const char rcsid[] = "$Id: tree.c,v 1.4 2005/04/27 04:56:39 sra Exp $"; -#endif - /*% * tree - balanced binary tree library * diff --git a/usr/src/lib/libresolv2/common/nameser/ns_date.c b/usr/src/lib/libresolv2/common/nameser/ns_date.c index 292375af63..5802172a03 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_date.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_date.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_date.c,v 1.6 2005/04/27 04:56:39 sra Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include <arpa/nameser.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_name.c b/usr/src/lib/libresolv2/common/nameser/ns_name.c index 0c1f93c066..ea02a86228 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_name.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_name.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_name.c,v 1.11 2009/01/23 19:59:16 each Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_netint.c b/usr/src/lib/libresolv2/common/nameser/ns_netint.c index 559c9d5bd5..44c0e42e76 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_netint.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_netint.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_netint.c,v 1.3 2005/04/27 04:56:40 sra Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include <arpa/nameser.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_newmsg.c b/usr/src/lib/libresolv2/common/nameser/ns_newmsg.c index c18dd060e1..870a4608e2 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_newmsg.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_newmsg.c @@ -20,10 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_newmsg.c,v 1.3 2009/02/26 10:48:57 marka Exp $"; -#endif - #include <port_before.h> #include <arpa/nameser.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_parse.c b/usr/src/lib/libresolv2/common/nameser/ns_parse.c index 1e92d3c9ac..9cf2427995 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_parse.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_parse.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_parse.c,v 1.10 2009/01/23 19:59:16 each Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_print.c b/usr/src/lib/libresolv2/common/nameser/ns_print.c index cde5d8e2d7..4b7d0c0200 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_print.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_print.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_print.c,v 1.12 2009/03/03 05:29:58 each Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_rdata.c b/usr/src/lib/libresolv2/common/nameser/ns_rdata.c index d0e318ed31..ce29d2820a 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_rdata.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_rdata.c @@ -20,10 +20,6 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_rdata.c,v 1.2 2009/01/23 23:49:15 tbox Exp $"; -#endif - #include "port_before.h" #if __OpenBSD__ diff --git a/usr/src/lib/libresolv2/common/nameser/ns_samedomain.c b/usr/src/lib/libresolv2/common/nameser/ns_samedomain.c index 5e9f5cab54..b4c4ae68db 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_samedomain.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_samedomain.c @@ -15,10 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_samedomain.c,v 1.6 2005/04/27 04:56:40 sra Exp $"; -#endif - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_sign.c b/usr/src/lib/libresolv2/common/nameser/ns_sign.c index 5748a090d9..abb9b9ef14 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_sign.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_sign.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_sign.c,v 1.6 2006/03/09 23:57:56 marka Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/nameser/ns_ttl.c b/usr/src/lib/libresolv2/common/nameser/ns_ttl.c index 69c2f83f57..e3f4a023ac 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_ttl.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_ttl.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_ttl.c,v 1.4 2005/07/28 06:51:49 marka Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include <arpa/nameser.h> diff --git a/usr/src/lib/libresolv2/common/nameser/ns_verify.c b/usr/src/lib/libresolv2/common/nameser/ns_verify.c index 97c012db8f..3751416b48 100644 --- a/usr/src/lib/libresolv2/common/nameser/ns_verify.c +++ b/usr/src/lib/libresolv2/common/nameser/ns_verify.c @@ -15,12 +15,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef lint -static const char rcsid[] = "$Id: ns_verify.c,v 1.5 2006/03/09 23:57:56 marka Exp $"; -#endif - -/* Import. */ - #include "port_before.h" #include "fd_setsize.h" diff --git a/usr/src/lib/libresolv2/common/resolv/herror.c b/usr/src/lib/libresolv2/common/resolv/herror.c index 703ab8fe4d..8ae81dd33f 100644 --- a/usr/src/lib/libresolv2/common/resolv/herror.c +++ b/usr/src/lib/libresolv2/common/resolv/herror.c @@ -48,11 +48,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)herror.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: herror.c,v 1.4 2005/04/27 04:56:41 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_comp.c b/usr/src/lib/libresolv2/common/resolv/res_comp.c index 59d5acc8ca..ca512ce497 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_comp.c +++ b/usr/src/lib/libresolv2/common/resolv/res_comp.c @@ -74,11 +74,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_comp.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_comp.c,v 1.5 2005/07/28 06:51:50 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> #include <sys/param.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_data.c b/usr/src/lib/libresolv2/common/resolv/res_data.c index be2420da60..c6cb898cb5 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_data.c +++ b/usr/src/lib/libresolv2/common/resolv/res_data.c @@ -20,10 +20,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char rcsid[] = "$Id: res_data.c,v 1.7 2008/12/11 09:59:00 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_debug.c b/usr/src/lib/libresolv2/common/resolv/res_debug.c index 4300ea2722..c2e05aab14 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_debug.c +++ b/usr/src/lib/libresolv2/common/resolv/res_debug.c @@ -99,11 +99,6 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_debug.c,v 1.19 2009/02/26 11:20:20 tbox Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_findzonecut.c b/usr/src/lib/libresolv2/common/resolv/res_findzonecut.c index 933169e3ab..c2d16ea0d2 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_findzonecut.c +++ b/usr/src/lib/libresolv2/common/resolv/res_findzonecut.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: res_findzonecut.c,v 1.10 2005/10/11 00:10:16 marka Exp $"; -#endif /* not lint */ - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1999 by Internet Software Consortium. diff --git a/usr/src/lib/libresolv2/common/resolv/res_init.c b/usr/src/lib/libresolv2/common/resolv/res_init.c index 477f4f5f73..98d86acb74 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_init.c +++ b/usr/src/lib/libresolv2/common/resolv/res_init.c @@ -73,11 +73,6 @@ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.26 2008/12/11 09:59:00 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_mkquery.c b/usr/src/lib/libresolv2/common/resolv/res_mkquery.c index acc538a055..d4651ec615 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_mkquery.c +++ b/usr/src/lib/libresolv2/common/resolv/res_mkquery.c @@ -74,11 +74,6 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_mkquery.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_mkquery.c,v 1.10 2008/12/11 09:59:00 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> #include <sys/param.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_mkupdate.c b/usr/src/lib/libresolv2/common/resolv/res_mkupdate.c index 2eb6757a0e..feca48ac89 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_mkupdate.c +++ b/usr/src/lib/libresolv2/common/resolv/res_mkupdate.c @@ -21,10 +21,6 @@ * <viraj_bais@ccm.fm.intel.com> */ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: res_mkupdate.c,v 1.10 2008/12/11 09:59:00 marka Exp $"; -#endif /* not lint */ - #include "port_before.h" #include <sys/types.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_query.c b/usr/src/lib/libresolv2/common/resolv/res_query.c index ab18548c92..3d19a19c80 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_query.c +++ b/usr/src/lib/libresolv2/common/resolv/res_query.c @@ -68,11 +68,6 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_query.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_query.c,v 1.11 2008/11/14 02:36:51 marka Exp $"; -#endif /* LIBC_SCCS and not lint */ - #include "port_before.h" #include <sys/types.h> #include <sys/param.h> diff --git a/usr/src/lib/libresolv2/common/resolv/res_send.c b/usr/src/lib/libresolv2/common/resolv/res_send.c index a043cf2624..0bff83629a 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_send.c +++ b/usr/src/lib/libresolv2/common/resolv/res_send.c @@ -76,11 +76,6 @@ * SOFTWARE. */ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: res_send.c,v 1.22 2009/01/22 23:49:23 tbox Exp $"; -#endif /* LIBC_SCCS and not lint */ - /*! \file * \brief * Send query to name server and wait for reply. diff --git a/usr/src/lib/libresolv2/common/resolv/res_update.c b/usr/src/lib/libresolv2/common/resolv/res_update.c index 5b2ecb1a35..52afd64ddc 100644 --- a/usr/src/lib/libresolv2/common/resolv/res_update.c +++ b/usr/src/lib/libresolv2/common/resolv/res_update.c @@ -1,7 +1,3 @@ -#if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: res_update.c,v 1.13 2005/04/27 04:56:43 sra Exp $"; -#endif /* not lint */ - /* * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") * Copyright (c) 1996-1999 by Internet Software Consortium. diff --git a/usr/src/lib/libsocket/inet/getnameinfo.c b/usr/src/lib/libsocket/inet/getnameinfo.c index 3b707bb7f7..4fc0bb651c 100644 --- a/usr/src/lib/libsocket/inet/getnameinfo.c +++ b/usr/src/lib/libsocket/inet/getnameinfo.c @@ -25,8 +25,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <stdlib.h> #include <string.h> @@ -93,8 +91,8 @@ static const char *_inet_ntop_native(); */ int getnameinfo(const struct sockaddr *sa, socklen_t salen, - char *host, socklen_t hostlen, - char *serv, socklen_t servlen, int flags) + char *host, socklen_t hostlen, + char *serv, socklen_t servlen, int flags) { char *addr; size_t alen, slen; @@ -240,7 +238,7 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, * specified port for udp. */ sp = getservbyport(port, - flags & NI_DGRAM ? "udp" : "tcp"); + flags & NI_DGRAM ? "udp" : "tcp"); if (sp != NULL) { if (servlen < strlen(sp->s_name) + 1) return (EAI_OVERFLOW); @@ -312,7 +310,6 @@ addzoneid(const struct sockaddr_in6 *sa, char *host, size_t hostlen) static size_t getzonestr(const struct sockaddr_in6 *sa, char *zonestr, size_t zonelen) { - const in6_addr_t *addr; uint32_t ifindex; char *retstr; @@ -320,7 +317,6 @@ getzonestr(const struct sockaddr_in6 *sa, char *zonestr, size_t zonelen) return (0); } - addr = &sa->sin6_addr; /* * Since this implementation only supports link scope addresses, * there is a one-to-one mapping between interface index and diff --git a/usr/src/lib/madv/common/madv.c b/usr/src/lib/madv/common/madv.c index 5656a1fec1..756825ee34 100644 --- a/usr/src/lib/madv/common/madv.c +++ b/usr/src/lib/madv/common/madv.c @@ -23,8 +23,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <stdio.h> #include <stdlib.h> #include <strings.h> @@ -676,9 +674,6 @@ shmat(int shmid, const void *shmaddr, int shmflag) struct shmid_ds mds; #ifdef MADVDEBUG int rc; -#else - /* LINTED */ - int rc; #endif if (!shmatfunc) { @@ -703,16 +698,21 @@ shmat(int shmid, const void *shmaddr, int shmflag) * Apply advice if specified and shmat succeeded. */ if (advice >= 0 && result != (void *)-1) { +#ifdef MADVDEBUG /* First determine segment size */ rc = shmctl(shmid, IPC_STAT, &mds); - MADVPRINT(4, (stderr, "shmctl rc %d errno %d\n", - strerror(errno))); - + MADVPRINT(4, (stderr, "shmctl rc %d errno %d\n", rc, errno)); rc = memcntl(result, mds.shm_segsz, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0); MADVPRINT(1, (stderr, "shmat advice: 0x%x 0x%x %d, rc %d errno %d\n", result, mds.shm_segsz, advice, rc, errno)); +#else + /* First determine segment size */ + (void) shmctl(shmid, IPC_STAT, &mds); + (void) memcntl(result, mds.shm_segsz, MC_ADVISE, + (caddr_t)(intptr_t)advice, 0, 0); +#endif } return (result); @@ -727,12 +727,6 @@ mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos) static caddr_t (*mmapfunc)() = NULL; caddr_t result; int advice = -1; -#ifdef MADVDEBUG - int rc; -#else - /* LINTED */ - int rc; -#endif if (!mmapfunc) { mmapfunc = (caddr_t (*)()) dlsym(RTLD_NEXT, "mmap"); @@ -759,11 +753,18 @@ mmap(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos) * Apply advice if specified and mmap succeeded. */ if (advice >= 0 && result != MAP_FAILED) { +#ifdef MADVDEBUG + int rc; + rc = memcntl(result, len, MC_ADVISE, (caddr_t)(intptr_t)advice, 0, 0); MADVPRINT(1, (stderr, "mmap advice: 0x%x 0x%x %d, rc %d errno %d\n", result, len, advice, rc, errno)); +#else + (void) memcntl(result, len, MC_ADVISE, + (caddr_t)(intptr_t)advice, 0, 0); +#endif } return (result); @@ -779,12 +780,6 @@ mmap64(caddr_t addr, size_t len, int prot, int flags, int fd, off64_t pos) static caddr_t (*mmap64func)(); caddr_t result; int advice = -1; -#ifdef MADVDEBUG - int rc; -#else - /* LINTED */ - int rc; -#endif if (!mmap64func) { mmap64func = (caddr_t (*)()) dlsym(RTLD_NEXT, "mmap64"); @@ -811,10 +806,16 @@ mmap64(caddr_t addr, size_t len, int prot, int flags, int fd, off64_t pos) * Apply advice if specified and mmap succeeded. */ if (advice >= 0 && result != MAP_FAILED) { +#ifdef MADVDEBUG + int rc; + rc = memcntl(result, len, MC_ADVISE, (caddr_t)advice, 0, 0); MADVPRINT(1, (stderr, "mmap64 advice: 0x%x 0x%x %d, rc %d errno %d\n", result, len, advice, rc, errno)); +#else + (void) memcntl(result, len, MC_ADVISE, (caddr_t)advice, 0, 0); +#endif } return (result); diff --git a/usr/src/lib/smhba/common/SMHBAAPILIB.c b/usr/src/lib/smhba/common/SMHBAAPILIB.c index e6471b6b19..50f8e71c7f 100644 --- a/usr/src/lib/smhba/common/SMHBAAPILIB.c +++ b/usr/src/lib/smhba/common/SMHBAAPILIB.c @@ -1157,7 +1157,7 @@ HBA_STATUS HBA_FreeLibrary() { HBAFreeLibraryFunc FreeLibraryFunc; /* LINTED E_FUNC_SET_NOT_USED */ - HBA_STATUS status; + HBA_STATUS status __unused; HBA_LIBRARY_INFO *lib_infop; HBA_LIBRARY_INFO *lib_next; HBA_ADAPTERCALLBACK_ELEM diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c index 20db2355da..b4570e1b1f 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_create.c @@ -50,27 +50,27 @@ static DAT_RETURN dapl_lmr_create_virtual(IN DAPL_IA *ia, - IN DAT_PVOID virt_addr, - IN DAT_VLEN length, - IN DAT_LMR_COOKIE shm_cookie, - IN DAPL_PZ *pz, - IN DAT_MEM_PRIV_FLAGS privileges, - OUT DAT_LMR_HANDLE *lmr_handle, - OUT DAT_LMR_CONTEXT *lmr_context, - OUT DAT_RMR_CONTEXT *rmr_context, - OUT DAT_VLEN *registered_length, - OUT DAT_VADDR *registered_address); + IN DAT_PVOID virt_addr, + IN DAT_VLEN length, + IN DAT_LMR_COOKIE shm_cookie, + IN DAPL_PZ *pz, + IN DAT_MEM_PRIV_FLAGS privileges, + OUT DAT_LMR_HANDLE *lmr_handle, + OUT DAT_LMR_CONTEXT *lmr_context, + OUT DAT_RMR_CONTEXT *rmr_context, + OUT DAT_VLEN *registered_length, + OUT DAT_VADDR *registered_address); static DAT_RETURN dapl_lmr_create_lmr(IN DAPL_IA *ia, - IN DAPL_LMR *original_lmr, - IN DAPL_PZ *pz, - IN DAT_MEM_PRIV_FLAGS privileges, - OUT DAT_LMR_HANDLE *lmr_handle, - OUT DAT_LMR_CONTEXT *lmr_context, - OUT DAT_RMR_CONTEXT *rmr_context, - OUT DAT_VLEN *registered_length, - OUT DAT_VADDR *registered_address); + IN DAPL_LMR *original_lmr, + IN DAPL_PZ *pz, + IN DAT_MEM_PRIV_FLAGS privileges, + OUT DAT_LMR_HANDLE *lmr_handle, + OUT DAT_LMR_CONTEXT *lmr_context, + OUT DAT_RMR_CONTEXT *rmr_context, + OUT DAT_VLEN *registered_length, + OUT DAT_VADDR *registered_address); /* * Function Definitions @@ -78,16 +78,16 @@ dapl_lmr_create_lmr(IN DAPL_IA *ia, static DAT_RETURN dapl_lmr_create_virtual(IN DAPL_IA *ia, - IN DAT_PVOID virt_addr, - IN DAT_VLEN length, - IN DAT_LMR_COOKIE shm_cookie, - IN DAPL_PZ *pz, - IN DAT_MEM_PRIV_FLAGS privileges, - OUT DAT_LMR_HANDLE *lmr_handle, - OUT DAT_LMR_CONTEXT *lmr_context, - OUT DAT_RMR_CONTEXT *rmr_context, - OUT DAT_VLEN *registered_length, - OUT DAT_VADDR *registered_address) + IN DAT_PVOID virt_addr, + IN DAT_VLEN length, + IN DAT_LMR_COOKIE shm_cookie, + IN DAPL_PZ *pz, + IN DAT_MEM_PRIV_FLAGS privileges, + OUT DAT_LMR_HANDLE *lmr_handle, + OUT DAT_LMR_CONTEXT *lmr_context, + OUT DAT_RMR_CONTEXT *rmr_context, + OUT DAT_VLEN *registered_length, + OUT DAT_VADDR *registered_address) { DAPL_LMR *lmr; DAT_REGION_DESCRIPTION reg_desc; @@ -145,7 +145,7 @@ dapl_lmr_create_virtual(IN DAPL_IA *ia, goto bail; } - (void) dapl_os_atomic_inc(&pz->pz_ref_count); + dapl_os_atomic_inc(&pz->pz_ref_count); if (NULL != lmr_handle) { *lmr_handle = (DAT_LMR_HANDLE) lmr; @@ -170,14 +170,14 @@ bail: static DAT_RETURN dapl_lmr_create_lmr(IN DAPL_IA *ia, - IN DAPL_LMR *original_lmr, - IN DAPL_PZ *pz, - IN DAT_MEM_PRIV_FLAGS privileges, - OUT DAT_LMR_HANDLE *lmr_handle, - OUT DAT_LMR_CONTEXT *lmr_context, - OUT DAT_RMR_CONTEXT *rmr_context, - OUT DAT_VLEN *registered_length, - OUT DAT_VADDR *registered_address) + IN DAPL_LMR *original_lmr, + IN DAPL_PZ *pz, + IN DAT_MEM_PRIV_FLAGS privileges, + OUT DAT_LMR_HANDLE *lmr_handle, + OUT DAT_LMR_CONTEXT *lmr_context, + OUT DAT_RMR_CONTEXT *rmr_context, + OUT DAT_VLEN *registered_length, + OUT DAT_VADDR *registered_address) { DAPL_LMR *lmr; DAT_REGION_DESCRIPTION reg_desc; @@ -246,7 +246,7 @@ dapl_lmr_create_lmr(IN DAPL_IA *ia, goto bail; } - (void) dapl_os_atomic_inc(&pz->pz_ref_count); + dapl_os_atomic_inc(&pz->pz_ref_count); if (NULL != lmr_handle) { *lmr_handle = (DAT_LMR_HANDLE)lmr; @@ -300,16 +300,16 @@ bail: */ DAT_RETURN dapl_lmr_create(IN DAT_IA_HANDLE ia_handle, - IN DAT_MEM_TYPE mem_type, - IN DAT_REGION_DESCRIPTION region_description, - IN DAT_VLEN length, - IN DAT_PZ_HANDLE pz_handle, - IN DAT_MEM_PRIV_FLAGS privileges, - OUT DAT_LMR_HANDLE *lmr_handle, - OUT DAT_LMR_CONTEXT *lmr_context, - OUT DAT_RMR_CONTEXT *rmr_context, - OUT DAT_VLEN *registered_length, - OUT DAT_VADDR *registered_address) + IN DAT_MEM_TYPE mem_type, + IN DAT_REGION_DESCRIPTION region_description, + IN DAT_VLEN length, + IN DAT_PZ_HANDLE pz_handle, + IN DAT_MEM_PRIV_FLAGS privileges, + OUT DAT_LMR_HANDLE *lmr_handle, + OUT DAT_LMR_CONTEXT *lmr_context, + OUT DAT_RMR_CONTEXT *rmr_context, + OUT DAT_VLEN *registered_length, + OUT DAT_VADDR *registered_address) { DAPL_IA *ia; DAPL_PZ *pz; diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c index 62a4e6a6bf..f0d90ba56e 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_lmr_free.c @@ -98,7 +98,7 @@ dapl_lmr_free(IN DAT_LMR_HANDLE lmr_handle) if (dat_status == DAT_SUCCESS) { pz = (DAPL_PZ *) lmr->param.pz_handle; - (void) dapl_os_atomic_dec(&pz->pz_ref_count); + dapl_os_atomic_dec(&pz->pz_ref_count); dapl_lmr_dealloc(lmr); } else { diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c index 8cef871034..ebe10b24e8 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_osd.c @@ -400,7 +400,7 @@ dapls_osd_fork_cleanup(void) rmr_list_head); if (rmr_ptr->param.lmr_triplet. virtual_address != 0) { - (void) dapl_os_atomic_dec(&rmr_ptr-> + dapl_os_atomic_dec(&rmr_ptr-> lmr->lmr_ref_count); rmr_ptr->param.lmr_triplet. virtual_address = 0; diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c index 63276c37ba..02692c825e 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create.c @@ -161,7 +161,7 @@ dapl_psp_create( /* * Take a reference on the EVD handle */ - (void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); + dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); /* * Set up a listener for a connection. Connections can arrive diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c index 18ef6bba41..e73622d717 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_psp_create_any.c @@ -144,7 +144,7 @@ dapl_psp_create_any( /* * Take a reference on the EVD handle */ - (void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); + dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); /* Link it onto the IA */ dapl_ia_link_psp(ia_ptr, sp_ptr); diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c index 69865155e3..cdf3b72a33 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_bind.c @@ -162,11 +162,11 @@ dapli_rmr_bind_fuse( goto bail; } - (void) dapl_os_atomic_inc(&lmr->lmr_ref_count); + dapl_os_atomic_inc(&lmr->lmr_ref_count); /* if the RMR was previously bound */ if (NULL != rmr->lmr) { - (void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); + dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); } rmr->param.mem_priv = mem_priv; @@ -244,7 +244,7 @@ dapli_rmr_bind_unfuse( /* if the RMR was previously bound */ if (NULL != rmr->lmr) { - (void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); + dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); } rmr->param.mem_priv = DAT_MEM_PRIV_NONE_FLAG; diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c index 46ca8f09b0..863bab5593 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_create.c @@ -61,7 +61,7 @@ */ DAT_RETURN dapl_rmr_create(IN DAT_PZ_HANDLE pz_handle, - OUT DAT_RMR_HANDLE * rmr_handle) + OUT DAT_RMR_HANDLE * rmr_handle) { DAPL_PZ *pz; DAPL_RMR *rmr; @@ -94,7 +94,7 @@ dapl_rmr_create(IN DAT_PZ_HANDLE pz_handle, goto bail; } - (void) dapl_os_atomic_inc(&pz->pz_ref_count); + dapl_os_atomic_inc(&pz->pz_ref_count); *rmr_handle = rmr; diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c index 781399527a..65343b4549 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rmr_free.c @@ -80,7 +80,7 @@ dapl_rmr_free(IN DAT_RMR_HANDLE rmr_handle) * counts here. */ if (rmr->param.lmr_triplet.virtual_address != 0) { - (void) dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); + dapl_os_atomic_dec(&rmr->lmr->lmr_ref_count); rmr->param.lmr_triplet.virtual_address = 0; } diff --git a/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c b/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c index c9986c1d80..4e6e80ee01 100644 --- a/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c +++ b/usr/src/lib/udapl/udapl_tavor/common/dapl_rsp_create.c @@ -154,7 +154,7 @@ dapl_rsp_create( /* * Take a reference on the EVD handle */ - (void) dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); + dapl_os_atomic_inc(&((DAPL_EVD *)evd_handle)->evd_ref_count); /* * Update the EP state indicating the provider now owns it diff --git a/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h b/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h index dbed11b5e7..4754678031 100644 --- a/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h +++ b/usr/src/lib/udapl/udapl_tavor/include/dapl_osd.h @@ -119,21 +119,19 @@ typedef volatile DAT_COUNT DAPL_ATOMIC; * except that a DAT_COUNT might be 32 bits, rather than 64 * and it occurs in local memory. * - * DAT_COUNT dapl_os_atomic_inc(INOUT DAPL_ATOMIC *v) + * void dapl_os_atomic_inc(INOUT DAPL_ATOMIC *v) */ -#define dapl_os_atomic_inc(v) ((DAT_COUNT) \ - (atomic_add_32_nv((uint32_t *)(v), 1) - 1)) +#define dapl_os_atomic_inc(v) atomic_add_32((uint32_t *)(v), 1) /* * dapl_os_atomic_dec * * decrement the current value of '*v'. No return value is required. * - * DAT_COUNT dapl_os_atomic_dec(INOUT DAPL_ATOMIC *v) + * void dapl_os_atomic_dec(INOUT DAPL_ATOMIC *v) */ #define dapl_os_atomic_dec(v) assert(*v != 0); \ - ((DAT_COUNT) \ - (atomic_add_32_nv((uint32_t *)(v), -1) + 1)) + atomic_add_32((uint32_t *)(v), -1) /* * dapl_os_atomic_assign diff --git a/usr/src/uts/i86pc/io/rootnex.c b/usr/src/uts/i86pc/io/rootnex.c index 54f0b0f69e..6cbc2132c1 100644 --- a/usr/src/uts/i86pc/io/rootnex.c +++ b/usr/src/uts/i86pc/io/rootnex.c @@ -819,7 +819,7 @@ static int rootnex_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, off_t offset, off_t len, caddr_t *vaddrp) { - struct regspec *orp; + struct regspec *orp = NULL; struct regspec64 rp = { 0 }; ddi_map_req_t mr = *mp; /* Get private copy of request */ @@ -846,10 +846,10 @@ rootnex_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, off_t offset, } /* - * First, if given an rnumber, convert it to a regspec... - * (Presumably, this is on behalf of a child of the root node?) + * First, we need to get the original regspec out before we convert it + * to the extended format. If we have a register number, then we need to + * convert that to a regspec. */ - if (mp->map_type == DDI_MT_RNUMBER) { int rnumber = mp->map_obj.rnumber; @@ -859,44 +859,37 @@ rootnex_map(dev_info_t *dip, dev_info_t *rdip, ddi_map_req_t *mp, off_t offset, #endif /* DDI_MAP_DEBUG */ orp = i_ddi_rnumber_to_regspec(rdip, rnumber); - if (orp == NULL) { + if (orp == NULL) { #ifdef DDI_MAP_DEBUG cmn_err(CE_WARN, out_of_range, rnumber, ddi_get_name(rdip)); #endif /* DDI_MAP_DEBUG */ return (DDI_ME_RNUMBER_RANGE); } - - rp.regspec_bustype = orp->regspec_bustype; - rp.regspec_addr = orp->regspec_addr; - rp.regspec_size = orp->regspec_size; - mp->map_type = DDI_MT_REGSPEC; - mp->map_flags |= DDI_MF_EXT_REGSPEC; - mp->map_obj.rp = (struct regspec *)&rp; + } else if (!(mp->map_flags & DDI_MF_EXT_REGSPEC)) { + orp = mp->map_obj.rp; } /* - * Ensure that we are always using a 64-bit regspec regardless of what - * was passed into us. If the child driver is using a 64-bit regspec, - * then we need to make sure that we copy this to the local regspec64, - * rp. + * Ensure that we are always using a 64-bit extended regspec regardless + * of what was passed into us. If the child driver is using a 64-bit + * regspec, then we need to make sure that we copy this to the local + * regspec64, rp. */ - if (!(mp->map_flags & DDI_MF_EXT_REGSPEC)) { - orp = mp->map_obj.rp; - + if (orp != NULL) { rp.regspec_bustype = orp->regspec_bustype; rp.regspec_addr = orp->regspec_addr; rp.regspec_size = orp->regspec_size; - - mp->map_obj.rp = (struct regspec *)&rp; - mp->map_flags |= DDI_MF_EXT_REGSPEC; - } else if (mp->map_type != DDI_MT_RNUMBER) { + } else { struct regspec64 *rp64; rp64 = (struct regspec64 *)mp->map_obj.rp; rp = *rp64; - mp->map_obj.rp = (struct regspec *)&rp; } + mp->map_type = DDI_MT_REGSPEC; + mp->map_flags |= DDI_MF_EXT_REGSPEC; + mp->map_obj.rp = (struct regspec *)&rp; + /* * Adjust offset and length correspnding to called values... * XXX: A non-zero length means override the one in the regspec |