[illumos-gate merge]

commit b14715fcd76b149c1fa0e1137cd516631ca5f295
    8699 Want NIC transceiver visibility (fix lint)
commit 9d218268650a3767f3df2612043a730a935ea2a9
    8804 nvme: add alias for pciclass,010802
commit 5b5fb15366257580ddfa65c652a1da8e0c6d4fd5
    8795 loader: add efi_devpath_is_prefix()
commit 7373b68a8a0aaee382a6403d5a70fce9bd19d62a
    8786 s1394: variable 'type' set but not used
commit c340f0f5876f4c5f9f4768c5b3f112e89b611888
    8785 p4_pcbe: 'p4_cccrstop' defined but not used
commit 4f62a6570dcd50f97b2c01e95cbb683b3f9d7a7c
    8783 pppd: 'rcsid' defined but not used
commit 3078e445fa2468f969d4f787db6f303739fdf820
    8782 chat: 'rcsid' defined but not used
commit f4d6818a2f6bb2640f51b221780039982957a0ca
    8781 pppstats: 'rcsid' defined but not used
commit ba448f1770618a414cb80eee258f018e711b407f
    8780 gss_mechs: variable set but not used
commit 38f33a76fa7f74946118fef8a670ecc05f7675e1
    8778 kadm5: variable 'tl_data_orig' set but not used
commit 495ee6847d0d3e288f47ba026d98a830e51cbc06
    8777 krb5/plugins/kdb: variable set but not used
commit 0f1d26a485e4e2010058758dfd2d45d98e3482b0
    8772 kadmin/server: variable 'maj_stat' set but not used
commit 6e573db1dd63b3b24579b7ceee32de57c994405c
    8770 lofiadm: variable 'btMode' set but not used
commit 9c3b8506879f8963287c430f2eb2e74c554a1c54
    8724 libc: multiple variable set but not used errors
commit 578f67364c19b20450a4783ebeae776c9e900185
    8794 cstyle generates warnings with recent perl
commit fa4b26fb5b73dd0f0319a34c6046034202e60bc6
    8793 libbsm build failure with recent perl
commit 5026b7fcee27ac1c884a99b607cc2abea07137d6
    8775 krb5kdc: variable set but not used
commit dfe02591ce4c15a40d7babbf85ceb4125485779d
    8769 mv: variable 'rc' set but not used
commit d9e525a856d3050197717c45fb58667e0ee0f297
    8767 cmd/hal: variable set but not used
commit 0803869a9bc0aff1c81287ac6eae15943cbba545
    8766 pcitool: typedef locally defined but not used
commit 62a14a75a4b2740af69a083f5ae385596db7ffc8
    8763 sendmail: set but not used parameter/variable

3 files changed, 6 insertions, 9 deletions

diff --git a/usr/src/lib/libc/port/fp/_base_sup.c b/usr/src/lib/libc/port/fp/_base_sup.c
index b07957740c..52e258d002 100644
--- a/usr/src/lib/libc/port/fp/_base_sup.c
+++ b/usr/src/lib/libc/port/fp/_base_sup.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "lint.h"
 #include <sys/types.h>
 #include "base_conversion.h"
@@ -56,7 +54,7 @@ void
 __base_conversion_set_exception(fp_exception_field_type ef)
 {
 	double	t;
-	volatile double tstored;
+	volatile double tstored __unused;
 
 	if (ef == (1 << fp_inexact)) {
 		t = 9.999999962747097015E-1;
diff --git a/usr/src/lib/libc/port/print/doprnt.c b/usr/src/lib/libc/port/print/doprnt.c
index 3bb54445ab..0c0fe0cacb 100644
--- a/usr/src/lib/libc/port/print/doprnt.c
+++ b/usr/src/lib/libc/port/print/doprnt.c
@@ -449,7 +449,6 @@ _ndoprnt(const char *format, va_list in_args, FILE *iop, int prflag)
 	size_t bpsize;
 	wchar_t	*p;
 	char	*cbp;
-	char	*cp;
 
 #else  /* _WIDE */
 	/* Starting and ending points for value to be printed */
@@ -460,7 +459,6 @@ _ndoprnt(const char *format, va_list in_args, FILE *iop, int prflag)
 	int	prec = 0;
 	ssize_t width;
 	ssize_t num;
-	ssize_t sec_display;
 	wchar_t *wp;
 	ssize_t preco;
 	ssize_t wcount = 0;
@@ -470,13 +468,13 @@ _ndoprnt(const char *format, va_list in_args, FILE *iop, int prflag)
 	int quote;		/* ' */
 	int	retcode;
 
-
 #ifdef	_WIDE
 	/* Format code */
 	wchar_t	fcode;
 #else  /* _WIDE */
 	/* Format code */
 	char	fcode;
+	ssize_t sec_display;
 #endif /* _WIDE */
 
 	/* Number of padding zeroes required on the left and right */
@@ -714,8 +712,10 @@ _ndoprnt(const char *format, va_list in_args, FILE *iop, int prflag)
 		format++;
 		wflag = 0;
 		lflag = 0;
-		sec_display = 0;
 		quote = 0;
+#ifndef	_WIDE
+		sec_display = 0;
+#endif
 
 	charswitch:
 
@@ -1840,7 +1840,6 @@ wide_S:
 						return (EOF);
 					}
 					nwc = mbstowcs(wstr, cbp, nwc);
-					cp = cbp + strlen(cbp);
 					wcount = nwc;
 					bp = wstr;
 					p = wstr + nwc;
diff --git a/usr/src/lib/libc/port/regex/engine.c b/usr/src/lib/libc/port/regex/engine.c
index 68cf24a5da..c66c08e59e 100644
--- a/usr/src/lib/libc/port/regex/engine.c
+++ b/usr/src/lib/libc/port/regex/engine.c
@@ -382,7 +382,7 @@ dissect(struct match *m, const char *start, const char *stop, sopno startst,
 	const char *ssp;	/* start of string matched by subsubRE */
 	const char *sep;	/* end of string matched by subsubRE */
 	const char *oldssp;	/* previous ssp */
-	const char *dp;
+	const char *dp __unused;
 
 	AT("diss", start, stop, startst, stopst);
 	sp = start;