[illumos-gate merge]

commit 569041adf8e01f8f57e8a53463ab4478ffd71ec0
    13546 svr4pkg: symbol 'eptnum' is multiply-defined
commit 19a46add205c481c02687f802f63741bc0fd19ca
    13537 ldap: multiply-defined symbols
commit 1d4c48c4c76a8b6a9ab91af4f76ca68c6556ad61
    13536 lp: symbol 'lp_alloc_fail_handler' is multiply-defined
commit a6dda84350c269f3e2c54cc01367177554a7cbd8
    13548 vgrind: multiply-defined symbols
commit 2a6858720cb70fb5eaddbfe3512fe5b55bcaf594
    13522 x86pi.so: multiply-defined symbols
commit aeaf55833f532850471446fb8721ef54e0b9a36d
    13516 loader.efi: efifb_mask_from_pixfmt is missing PixelBltOnly

8 files changed, 302 insertions, 298 deletions

diff --git a/usr/src/boot/Makefile.version b/usr/src/boot/Makefile.version
index d4b95e1bef..fc79093fee 100644
--- a/usr/src/boot/Makefile.version
+++ b/usr/src/boot/Makefile.version
@@ -34,4 +34,4 @@ LOADER_VERSION = 1.1
 # Use date like formatting here, YYYY.MM.DD.XX, without leading zeroes.
 # The version is processed from left to right, the version number can only
 # be increased.
-BOOT_VERSION = $(LOADER_VERSION)-2021.01.17.2
+BOOT_VERSION = $(LOADER_VERSION)-2021.02.13.1
diff --git a/usr/src/boot/sys/boot/efi/loader/framebuffer.c b/usr/src/boot/sys/boot/efi/loader/framebuffer.c
index 1100f2e4e1..d638d136ac 100644
--- a/usr/src/boot/sys/boot/efi/loader/framebuffer.c
+++ b/usr/src/boot/sys/boot/efi/loader/framebuffer.c
@@ -84,6 +84,7 @@ efifb_mask_from_pixfmt(struct efi_fb *efifb, EFI_GRAPHICS_PIXEL_FORMAT pixfmt,
 	result = 0;
 	switch (pixfmt) {
 	case PixelRedGreenBlueReserved8BitPerColor:
+	case PixelBltOnly:
 		efifb->fb_mask_red = 0x000000ff;
 		efifb->fb_mask_green = 0x0000ff00;
 		efifb->fb_mask_blue = 0x00ff0000;
diff --git a/usr/src/cmd/ldap/ns_ldap/standalone.h b/usr/src/cmd/ldap/ns_ldap/standalone.h
index 84a4438dd3..8778be3b06 100644
--- a/usr/src/cmd/ldap/ns_ldap/standalone.h
+++ b/usr/src/cmd/ldap/ns_ldap/standalone.h
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifndef	_STANDALONE_H
 #define	_STANDALONE_H
 
@@ -37,7 +35,7 @@ extern "C" {
 #include "ns_sldap.h"
 #include "ns_internal.h"
 
-ns_standalone_conf_t standaloneDefaults;
+extern ns_standalone_conf_t standaloneDefaults;
 
 int separatePort(char *peer, char **name, uint16_t *port);
 
diff --git a/usr/src/cmd/lp/include/lp.h b/usr/src/cmd/lp/include/lp.h
index 50cef37ade..a07acfd494 100644
--- a/usr/src/cmd/lp/include/lp.h
+++ b/usr/src/cmd/lp/include/lp.h
@@ -24,13 +24,11 @@
  */
 
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 #ifndef _LP_LP_H
 #define	_LP_LP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -42,9 +40,9 @@ extern "C" {
 #include <stdio.h>
 #include <dirent.h>
 
-/**
- ** Types:
- **/
+/*
+ * Types:
+ */
 
 typedef struct SCALED {
 	float	val;	/* value of number, scaled according to "sc" */
@@ -52,7 +50,7 @@ typedef struct SCALED {
 }			SCALED;
 
 typedef struct FALERT {
-	char *	shcmd;	/* shell command used to perform the alert */
+	char	*shcmd;	/* shell command used to perform the alert */
 	int	Q;	/* # requests queued to activate alert */
 	int	W;	/* alert is sent every "W" minutes */
 } FALERT;
@@ -61,9 +59,9 @@ typedef struct FALERT {
 #define	LP_USE_PAPI_ATTR 1	/* use PAPI attributes for printing */
 				/* TODO: is this best place for this ? */
 
-/**
- ** Places:
- **/
+/*
+ * Places:
+ */
 
 /*
  * These functions no longer exist.  The defines take care
@@ -73,22 +71,22 @@ typedef struct FALERT {
 #define	getpaths()
 #define	getadminpaths(x)
 
-#define LPDIR		"/usr/lib/lp"
-#define ETCDIR		"/etc/lp"
-#define SPOOLDIR	"/var/spool/lp"
-#define LOGDIR		"/var/lp/logs"
+#define	LPDIR		"/usr/lib/lp"
+#define	ETCDIR		"/etc/lp"
+#define	SPOOLDIR	"/var/spool/lp"
+#define	LOGDIR		"/var/lp/logs"
 
 #define	TERMINFO	"/usr/share/lib/terminfo"
 
 #define	LPUSER		"lp"
-#define ROOTUSER	"root"
+#define	ROOTUSER	"root"
 
-#define BANG_S		"!"
-#define BANG_C		'!'
+#define	BANG_S		"!"
+#define	BANG_C		'!'
 
 #define	LOCAL_LPUSER	BANG_S LPUSER
-#define LOCAL_ROOTUSER	BANG_S ROOTUSER
-#define ALL_BANG_ALL	NAME_ALL BANG_S NAME_ALL
+#define	LOCAL_ROOTUSER	BANG_S ROOTUSER
+#define	ALL_BANG_ALL	NAME_ALL BANG_S NAME_ALL
 
 /* #define	ADMINSDIR	"admins"  */
 /* # define CLASSESDIR	"classes" */
@@ -100,7 +98,7 @@ typedef struct FALERT {
 /* #define LOGSDIR		"logs" */
 /* #define MODELSDIR	"model" */
 /* #define NETWORKDIR	"network" */
-#define FIFOSDIR	"fifos"
+#define	FIFOSDIR	"fifos"
 /* # define PRIVFIFODIR	"private" */
 /* # define PUBFIFODIR	"public" */
 /* #define REQUESTSDIR	"requests" */
@@ -116,36 +114,36 @@ typedef struct FALERT {
 
 /* #define DESCRIBEFILE	"describe" */
 /* #define ALIGNFILE	"align_ptrn" */
-#define COMMENTFILE	"comment"
-#define ALLOWFILE	"allow"
-#define DENYFILE	"deny"
-#define ALERTSHFILE	"alert.sh"
-#define ALERTVARSFILE	"alert.vars"
-#define ALERTPROTOFILE	"alert.proto"
-#define CONFIGFILE	"configuration"
-#define FACCESSPREFIX	"forms."
-#define PACCESSPREFIX	"paper."
-#define UACCESSPREFIX	"users."
-#define FALLOWFILE	FACCESSPREFIX ALLOWFILE
-#define FDENYFILE	FACCESSPREFIX DENYFILE
-#define UALLOWFILE	UACCESSPREFIX ALLOWFILE
-#define UDENYFILE	UACCESSPREFIX DENYFILE
+#define	COMMENTFILE	"comment"
+#define	ALLOWFILE	"allow"
+#define	DENYFILE	"deny"
+#define	ALERTSHFILE	"alert.sh"
+#define	ALERTVARSFILE	"alert.vars"
+#define	ALERTPROTOFILE	"alert.proto"
+#define	CONFIGFILE	"configuration"
+#define	FACCESSPREFIX	"forms."
+#define	PACCESSPREFIX	"paper."
+#define	UACCESSPREFIX	"users."
+#define	FALLOWFILE	FACCESSPREFIX ALLOWFILE
+#define	FDENYFILE	FACCESSPREFIX DENYFILE
+#define	UALLOWFILE	UACCESSPREFIX ALLOWFILE
+#define	UDENYFILE	UACCESSPREFIX DENYFILE
 /* #define DEFAULTFILE	"default" */
-#define STATUSFILE	"status"
+#define	STATUSFILE	"status"
 /* #define USERSFILE	"users" */
 /* #define NAMEFILE	"name" */
 /* #define XFERFILE	"transfer" */
 /* #define EXECFILE	"execute" */
-#define PSTATUSFILE	"pstatus"
-#define CSTATUSFILE	"cstatus"
+#define	PSTATUSFILE	"pstatus"
+#define	CSTATUSFILE	"cstatus"
 /* #define REQLOGFILE	"requests" */
 
-#define STANDARD	"standard"
+#define	STANDARD	"standard"
 /* #define SLOWFILTER	"slow.filter" */
-#define FAULTMESSAGEFILE "faultMessage"
-#define FORMMESSAGEFILE "formMessage"
+#define	FAULTMESSAGEFILE "faultMessage"
+#define	FORMMESSAGEFILE "formMessage"
 
-#define LPNET		"/usr/lib/lp/lpNet"
+#define	LPNET		"/usr/lib/lp/lpNet"
 
 #ifdef LP_USE_PAPI_ATTR
 #define	STANDARD_FOOMATIC	"standard_foomatic"
@@ -160,9 +158,9 @@ typedef struct FALERT {
 	 */
 #endif
 
-/**
- ** Names and phrases:
- **/
+/*
+ * Names and phrases:
+ */
 
 /*
  * If you change these from macros to defined (char *) strings,
@@ -171,161 +169,165 @@ typedef struct FALERT {
  */
 #define	NAME_ALL	"all"
 #define	NAME_ANY	"any"
-#define NAME_NONE	"none"
+#define	NAME_NONE	"none"
 #define	NAME_TERMINFO	"terminfo"
 #define	NAME_SIMPLE	"simple"
-#define NAME_HOLD	"hold"
+#define	NAME_HOLD	"hold"
 #define	NAME_RESUME	"resume"
-#define NAME_IMMEDIATE	"immediate"
-#define NAME_CONTINUE	"continue"
-#define NAME_BEGINNING	"beginning"
-#define NAME_WAIT	"wait"
-#define NAME_MAIL	"mail"
+#define	NAME_IMMEDIATE	"immediate"
+#define	NAME_CONTINUE	"continue"
+#define	NAME_BEGINNING	"beginning"
+#define	NAME_WAIT	"wait"
+#define	NAME_MAIL	"mail"
 #define	NAME_WRITE	"write"
-#define NAME_QUIET	"quiet"
-#define NAME_LIST	"list"
-#define NAME_ON		"on"
-#define NAME_OFF	"off"
-#define NAME_OPTIONAL	"optional"
-#define NAME_ALWAYS	"Always"
-#define NAME_UNKNOWN	"unknown"
-#define NAME_REJECTING	"rejecting"
-#define NAME_ACCEPTING	"accepting"
-#define NAME_DISABLED	"disabled"
-#define NAME_ENABLED	"enabled"
-#define NAME_DIRECT	"direct"
-#define NAME_PICA	"pica"
-#define NAME_ELITE	"elite"
-#define NAME_COMPRESSED	"compressed"
-#define NAME_ALLOW	"allow"
-#define NAME_DENY	"deny"
-#define NAME_ONCE	"once"
-#define NAME_DEFAULT	"default"
-#define NAME_KEEP	"keep"
-
-/**
- ** Common messages:
- **/
-
-#define CUZ_NEW_PRINTER		"new printer"
-#define CUZ_NEW_DEST		"new destination"
-#define CUZ_STOPPED		"stopped with printer fault"
-#define CUZ_FAULT		"printer fault"
-#define CUZ_LOGIN_PRINTER	"disabled by Spooler: login terminal"
-#define CUZ_MOUNTING		"mounting a form"
-#define CUZ_NOFORK		"can't fork"
-#define CUZ_PRINTING_OK		"ready and printing"
-
-#define TIMEOUT_FAULT \
+#define	NAME_QUIET	"quiet"
+#define	NAME_LIST	"list"
+#define	NAME_ON		"on"
+#define	NAME_OFF	"off"
+#define	NAME_OPTIONAL	"optional"
+#define	NAME_ALWAYS	"Always"
+#define	NAME_UNKNOWN	"unknown"
+#define	NAME_REJECTING	"rejecting"
+#define	NAME_ACCEPTING	"accepting"
+#define	NAME_DISABLED	"disabled"
+#define	NAME_ENABLED	"enabled"
+#define	NAME_DIRECT	"direct"
+#define	NAME_PICA	"pica"
+#define	NAME_ELITE	"elite"
+#define	NAME_COMPRESSED	"compressed"
+#define	NAME_ALLOW	"allow"
+#define	NAME_DENY	"deny"
+#define	NAME_ONCE	"once"
+#define	NAME_DEFAULT	"default"
+#define	NAME_KEEP	"keep"
+
+/*
+ * Common messages:
+ */
+
+#define	CUZ_NEW_PRINTER		"new printer"
+#define	CUZ_NEW_DEST		"new destination"
+#define	CUZ_STOPPED		"stopped with printer fault"
+#define	CUZ_FAULT		"printer fault"
+#define	CUZ_LOGIN_PRINTER	"disabled by Spooler: login terminal"
+#define	CUZ_MOUNTING		"mounting a form"
+#define	CUZ_NOFORK		"can't fork"
+#define	CUZ_PRINTING_OK		"ready and printing"
+
+#define	TIMEOUT_FAULT \
 "Timed-out trying to open the printer port.\n"
 
-#define OPEN_FAULT \
+#define	OPEN_FAULT \
 "Failed to open the printer port.\n"
 
-#define PUSH_FAULT \
+#define	PUSH_FAULT \
 "Failed to push module(s) onto the printer port stream.\n"
 
 /*
  * When the Spooler detected the hangup, this message is used.
  */
-#define HANGUP_FAULT \
+#define	HANGUP_FAULT \
 "The connection to the printer dropped; perhaps the printer went off-line!\n"
 
 /*
  * When lp.cat detected the hangup, this message is used.
  */
-#define HANGUP_FAULT_LPCAT \
+#define	HANGUP_FAULT_LPCAT \
 "The connection to the printer dropped; perhaps the printer went off-line.\n"
 
-#define INTERRUPT_FAULT	\
-"Received an interrupt from the printer. The reason is unknown,\nalthough a common cause is that the printer's buffer capacity\nwas exceeded. Using XON/XOFF flow control, adding carriage-return\ndelays, or lowering the baud rate may fix the problem.\nSee stty(1) and lpadmin(1M) man-pages for help in doing this.\n"
+#define	INTERRUPT_FAULT	\
+"Received an interrupt from the printer. The reason is unknown,\n\
+although a common cause is that the printer's buffer capacity\n\
+was exceeded. Using XON/XOFF flow control, adding carriage-return\n\
+delays, or lowering the baud rate may fix the problem.\n\
+See stty(1) and lpadmin(1M) man-pages for help in doing this.\n"
 
-#define PIPE_FAULT \
+#define	PIPE_FAULT \
 "The output ``port'', a FIFO, was closed before all output was written.\n"
 
-#define EXIT_FAULT \
+#define	EXIT_FAULT \
 "The interface program returned with a reserved exit code.\n"
 
-/**
- ** Lp-errno #defines, etc.
- **/
-
-#define LP_EBADSDN	1
-#define LP_EBADINT	2
-#define LP_EBADNAME	3
-#define LP_EBADARG	4
-#define LP_ETRAILIN	5
-#define LP_ENOCMT	6
-#define LP_EBADCTYPE	7
-#define LP_ENOALP	8
-#define LP_ENULLPTR	9
-#define LP_EBADHDR	10
-#define LP_ETEMPLATE	11
-#define LP_EKEYWORD	12
-#define LP_EPATTERN	13
-#define LP_ERESULT	14
-#define LP_EREGEX	15  /* and see extern int regerrno, regexpr(3G) */
-#define LP_ENOMEM	99
+/*
+ * Lp-errno #defines, etc.
+ */
+
+#define	LP_EBADSDN	1
+#define	LP_EBADINT	2
+#define	LP_EBADNAME	3
+#define	LP_EBADARG	4
+#define	LP_ETRAILIN	5
+#define	LP_ENOCMT	6
+#define	LP_EBADCTYPE	7
+#define	LP_ENOALP	8
+#define	LP_ENULLPTR	9
+#define	LP_EBADHDR	10
+#define	LP_ETEMPLATE	11
+#define	LP_EKEYWORD	12
+#define	LP_EPATTERN	13
+#define	LP_ERESULT	14
+#define	LP_EREGEX	15  /* and see extern int regerrno, regexpr(3G) */
+#define	LP_ENOMEM	99
 
 extern int		lp_errno;
 
-/**
- ** Misc. Macros
- **/
+/*
+ * Misc. Macros
+ */
 
 #define	LP_WS		" "	/* Whitespace (also list separator) */
 #define	LP_SEP		","	/* List separator */
-#define LP_QUOTES	"'\""
+#define	LP_QUOTES	"'\""
 
-#define MAIL		"mail"
-#define WRITE		"write"
+#define	MAIL		"mail"
+#define	WRITE		"write"
 
-#define STATUS_BREAK	"=========="
+#define	STATUS_BREAK	"=========="
 
-#define	STREQU(A,B)	( (!(A) || !(B)) ? 0: (strcmp((A), (B)) == 0) )
-#define	STRNEQU(A,B,N)	( (!(A) || !(B)) ? 0: (strncmp((A), (B), (N)) == 0) )
-#define	CS_STREQU(A,B)	(cs_strcmp((A), (B)) == 0)
-#define	CS_STRNEQU(A,B,N) (cs_strncmp((A), (B), (N)) == 0)
-#define STRSIZE(X)	(sizeof(X) - 1)
+#define	STREQU(A, B)	((!(A) || !(B)) ? 0 : (strcmp((A), (B)) == 0))
+#define	STRNEQU(A, B, N) ((!(A) || !(B)) ? 0 : (strncmp((A), (B), (N)) == 0))
+#define	CS_STREQU(A, B)	(cs_strcmp((A), (B)) == 0)
+#define	CS_STRNEQU(A, B, N) (cs_strncmp((A), (B), (N)) == 0)
+#define	STRSIZE(X)	(sizeof (X) - 1)
 
 /*
  * Almost STREQU but compares null pointers as equal, too.
  */
-#define	SAME(A,B)	((A) == (B) || (A) && (B) && STREQU((A), (B)))
+#define	SAME(A, B)	((A) == (B) || (A) && (B) && STREQU((A), (B)))
 
 #define	PRINTF		(void)printf
-#define SPRINTF		(void)sprintf
-#define FPRINTF		(void)fprintf
+#define	SPRINTF		(void)sprintf
+#define	FPRINTF		(void)fprintf
 
 #define	NB(X)		(X? X : "")
 
-#define PERROR		strerror(errno)
+#define	PERROR		strerror(errno)
 
 /*
  * Largest number we'll ever expect to get from doing %ld in printf,
  * as a string and number. ULONG_MAX from limits.h gives us the number,
  * but I can't figure out how to get that into a string.
  */
-#define BIGGEST_NUMBER		ULONG_MAX
-#define BIGGEST_NUMBER_S	"4294967295"
+#define	BIGGEST_NUMBER		ULONG_MAX
+#define	BIGGEST_NUMBER_S	"4294967295"
 
 /*
  * Largest request ID (numerical part), as string and number.
  * See comment above.
  */
-#define BIGGEST_REQID		999999
-#define BIGGEST_REQID_S		"999999"
+#define	BIGGEST_REQID		999999
+#define	BIGGEST_REQID_S		"999999"
 
 /*
  * Maximum number of files queued per request, as string and number.
  * See earlier comment above.
  */
-#define MOST_FILES	999999
-#define MOST_FILES_S	"999999"
+#define	MOST_FILES	999999
+#define	MOST_FILES_S	"999999"
 
-/**
- ** Alert macros:
- **/
+/*
+ * Alert macros:
+ */
 
 /*
  * Type of alert to be S_QUIET'd
@@ -334,17 +336,17 @@ extern int		lp_errno;
 #define	QA_PRINTER	2
 #define	QA_PRINTWHEEL	3
 
-/**
- ** File modes:
- ** (The "NO" prefix is relative to ``others''.)
- **/
+/*
+ * File modes:
+ * (The "NO" prefix is relative to ``others''.)
+ */
 
 #define	MODE_READ	(mode_t)0664
-#define MODE_NOREAD	(mode_t)0660
-#define MODE_EXEC	(mode_t)0775
-#define MODE_NOEXEC	(mode_t)0770
-#define MODE_DIR	(mode_t)0775
-#define MODE_NODIR	(mode_t)0770
+#define	MODE_NOREAD	(mode_t)0660
+#define	MODE_EXEC	(mode_t)0775
+#define	MODE_NOEXEC	(mode_t)0770
+#define	MODE_DIR	(mode_t)0775
+#define	MODE_NODIR	(mode_t)0770
 
 extern int	printlist_qsep;
 
@@ -387,109 +389,109 @@ extern int	fdputc(char, int);
 
 extern int	is_printer_uri(char *);
 
-FILE		*open_lpfile ( char * , char * , mode_t );
-int		close_lpfile ( FILE * );
-int		chown_lppath ( char * path );
-int		mkdir_lpdir ( char * path , int mode );
-int		rmfile ( char * path );
-int		dumpstring ( char * path , char * str );
+FILE		*open_lpfile(char *, char *, mode_t);
+int		close_lpfile(FILE *);
+int		chown_lppath(char *);
+int		mkdir_lpdir(char *, int);
+int		rmfile(char *);
+int		dumpstring(char *, char *);
 
-char *		loadstring ( char * path );
-char *		loadline ( char * path );
-char *		sop_up_rest (int, char * endsop );
+char		*loadstring(char *);
+char		*loadline(char *);
+char		*sop_up_rest(int, char *);
 
 /*
  * List manipulation routines:
  */
 
-#define emptylist(LP)	(!(LP) || !(LP)[0])
+#define	emptylist(LP)	(!(LP) || !(LP)[0])
 
-int		addlist ( char *** , char * );
-int		addstring ( char ** , char * );
-int		appendlist ( char *** , char * );
-int		dellist ( char *** , char * );
-int		joinlist ( char *** , char ** );
-int		lenlist ( char ** );
-int		printlist ( FILE * , char ** );
-int		fdprintlist(int , char ** );
-int		searchlist ( char *, char ** );
-int		searchlist_with_terminfo ( char * , char ** );
+int		addlist(char ***, char *);
+int		addstring(char **, char *);
+int		appendlist(char ***, char *);
+int		dellist(char ***, char *);
+int		joinlist(char ***, char **);
+int		lenlist(char **);
+int		printlist(FILE *, char **);
+int		fdprintlist(int, char **);
+int		searchlist(char *, char **);
+int		searchlist_with_terminfo(char *, char **);
 
-char **		duplist ( char ** );
-char **		getlist ( char * , char * , char * );
-char **		dashos ( char * );
-char **		wherelist ( char * , char ** );
+char		**duplist(char **);
+char		**getlist(char *, char *, char *);
+char		**dashos(char *);
+char		**wherelist(char *, char **);
 
-char *		sprintlist ( char ** );
-char *		search_cslist ( char * , char ** );
+char		*sprintlist(char **);
+char		*search_cslist(char *, char **);
 
-void		freelist ( char ** );
-void		printlist_setup ( char * , char * , char * , char * );
-void		printlist_unsetup ( void );
+void		freelist(char **);
+void		printlist_setup(char *, char *, char *, char *);
+void		printlist_unsetup(void);
 
 /*
  * Scaled decimal number routines:
  */
 
-#define getsdn(S)	_getsdn(S, (char **)0, 0)
-#define getcpi(S)	_getsdn(S, (char **)0, 1)
+#define	getsdn(S)	_getsdn(S, (char **)0, 0)
+#define	getcpi(S)	_getsdn(S, (char **)0, 1)
 
-#define N_COMPRESSED	9999
+#define	N_COMPRESSED	9999
 
-void		printsdn ( FILE * , SCALED );
-void		fdprintsdn ( int , SCALED );
-void		printsdn_setup ( char * , char * , char * );
-void		printsdn_unsetup ( void );
+void		printsdn(FILE *, SCALED);
+void		fdprintsdn(int, SCALED);
+void		printsdn_setup(char *, char *, char *);
+void		printsdn_unsetup(void);
 
-SCALED		_getsdn ( char * , char ** , int );
+SCALED		_getsdn(char *, char **, int);
 
 /*
  * File name routines:
  */
 
-char *		makepath ( char * , ... );
-char *		getspooldir ( void );
-char *		getrequestfile ( char * );
-char *		getprinterfile ( char * , char * );
-char *		getsystemfile ( char * , char * );
-char *		getclassfile ( char * );
-char *		getfilterfile ( char * );
-char *		getformfile ( char * , char * );
+char		*makepath(char *, ...);
+char		*getspooldir(void);
+char		*getrequestfile(char *);
+char		*getprinterfile(char *, char *);
+char		*getsystemfile(char *, char *);
+char		*getclassfile(char *);
+char		*getfilterfile(char *);
+char		*getformfile(char *, char *);
 
 /*
  * Additional string manipulation routines:
  */
 
-int		cs_strcmp ( char * , char * );
-int		cs_strncmp ( char * , char * , int );
+int		cs_strcmp(char *, char *);
+int		cs_strncmp(char *, char *, int);
 
 /*
  * Syntax checking routines:
  */
 
-int		syn_name ( char * );
-int		syn_text ( char * );
-int		syn_comment ( char * );
-int		syn_machine_name ( char * );
-int		syn_option ( char * );
+int		syn_name(char *);
+int		syn_text(char *);
+int		syn_comment(char *);
+int		syn_machine_name(char *);
+int		syn_option(char *);
 
 /*
  * Alert management routines:
  */
 
-int		putalert ( char * , char * , FALERT * );
-int		delalert ( char * , char * );
+int		putalert(char *, char *, FALERT *);
+int		delalert(char *, char *);
 
-FALERT *	getalert ( char * , char * );
+FALERT		*getalert(char *, char *);
 
-void		printalert ( FILE * , FALERT * , int );
+void		printalert(FILE *, FALERT *, int);
 
 /*
  * Terminfo Database Inquiry Tool
  */
 
-int		tidbit ( char * , char * , ... );
-void		untidbit ( char * );
+int		tidbit(char *, char *, ...);
+void		untidbit(char *);
 
 /*
  * Auto-restarting and other system calls:
@@ -498,77 +500,77 @@ void		untidbit ( char * );
  * Read/Write).
  */
 
-#define Access	_Access
-#define Chdir	_Chdir
-#define Chmod	_Chmod
-#define Chown	_Chown
-#define Close	_Close
-#define Creat	_Creat
-#define Fcntl	_Fcntl
-#define Fstat	_Fstat
-#define Link	_Link
-#define Lstat	_Lstat
-#define Mknod	_Mknod
-#define Open	_Open
-#define Read	_Read
-#define Readlink _Readlink
-#define Rename	_Rename
-#define Stat	_Stat
-#define Symlink	_Symlink
-#define Unlink	_Unlink
-#define Wait	_Wait
-#define Write	_Write
-
-#define Malloc(size)		_Malloc(size, __FILE__, __LINE__)
-#define Realloc(ptr,size)	_Realloc(ptr, size, __FILE__, __LINE__)
-#define Calloc(nelem,elsize)	_Calloc(nelem, elsize, __FILE__, __LINE__)
-#define Strdup(s)		_Strdup(s, __FILE__, __LINE__)
-#define Free(ptr)		_Free(ptr, __FILE__, __LINE__)
-
-int		_Access ( char * , int );
-int		_Chdir ( char * );
-int		_Chmod ( char * , int );
-int		_Chown ( char * , int , int );
-int		_Close ( int );
-int		_Creat ( char * , int );
-int		_Fcntl ( int , int , ... );
-int		_Fstat ( int , struct stat * );
-int		_Link ( char * , char * );
-int		_Lstat ( char * , struct stat * );
-int		_Mknod ( char * , int , int );
-int		_Mkpipe ( char * , int , int );
-int		_Open ( char * , int , ... /* mode_t */ );
-int		_Read ( int , char * , unsigned int );
-int		_Readlink ( char * , char * , unsigned int );
-int		_Rename ( char * , char * );
-int		_Symlink ( char * , char * );
-int		_Stat ( char * , struct stat * );
-int		_Unlink ( char * );
-int		_Wait ( int * );
-int		_Write ( int , char * , unsigned int );
-
-void *		_Malloc ( size_t , const char * , int );
-void *		_Realloc ( void * , size_t , const char * , int );
-void *		_Calloc ( size_t , size_t , const char * , int );
-char *		_Strdup ( const char * , const char * , int );
-void		_Free ( void * , const char * , int );
+#define	Access	_Access
+#define	Chdir	_Chdir
+#define	Chmod	_Chmod
+#define	Chown	_Chown
+#define	Close	_Close
+#define	Creat	_Creat
+#define	Fcntl	_Fcntl
+#define	Fstat	_Fstat
+#define	Link	_Link
+#define	Lstat	_Lstat
+#define	Mknod	_Mknod
+#define	Open	_Open
+#define	Read	_Read
+#define	Readlink _Readlink
+#define	Rename	_Rename
+#define	Stat	_Stat
+#define	Symlink	_Symlink
+#define	Unlink	_Unlink
+#define	Wait	_Wait
+#define	Write	_Write
+
+#define	Malloc(size)		_Malloc(size, __FILE__, __LINE__)
+#define	Realloc(ptr, size)	_Realloc(ptr, size, __FILE__, __LINE__)
+#define	Calloc(nelem, elsize)	_Calloc(nelem, elsize, __FILE__, __LINE__)
+#define	Strdup(s)		_Strdup(s, __FILE__, __LINE__)
+#define	Free(ptr)		_Free(ptr, __FILE__, __LINE__)
+
+int		_Access(char *, int);
+int		_Chdir(char *);
+int		_Chmod(char *, int);
+int		_Chown(char *, int, int);
+int		_Close(int);
+int		_Creat(char *, int);
+int		_Fcntl(int, int, ...);
+int		_Fstat(int, struct stat *);
+int		_Link(char *, char *);
+int		_Lstat(char *, struct stat *);
+int		_Mknod(char *, int, int);
+int		_Mkpipe(char *, int, int);
+int		_Open(char *, int, ... /* mode_t */);
+int		_Read(int, char *, unsigned int);
+int		_Readlink(char *, char *, unsigned int);
+int		_Rename(char *, char *);
+int		_Symlink(char *, char *);
+int		_Stat(char *, struct stat *);
+int		_Unlink(char *);
+int		_Wait(int *);
+int		_Write(int, char *, unsigned int);
+
+void		*_Malloc(size_t, const char *, int);
+void		*_Realloc(void *, size_t, const char *, int);
+void		*_Calloc(size_t, size_t, const char *, int);
+char		*_Strdup(const char *, const char *, int);
+void		_Free(void *, const char *, int);
 
 /*
  * Misc. routines:
  */
 
-int		isterminfo ( char * );
-int		isprinter ( char * );
-int		isrequest ( char * );
-int		isnumber ( char * );
+int		isterminfo(char *);
+int		isprinter(char *);
+int		isrequest(char *);
+int		isnumber(char *);
 
-char *		getname ( void );
-char *		makestr ( char * , ... );
-char *		strip ( char * );
+char		*getname(void);
+char		*makestr(char *, ...);
+char		*strip(char *);
 
-void		sendmail ( char * , char * );
+void		sendmail(char *, char *);
 
-void		(*lp_alloc_fail_handler)( void );
+extern void	(*lp_alloc_fail_handler)(void);
 
 /*
  * Originally part of liblpfs.a and fs.h, now no longer needed
@@ -586,17 +588,17 @@ void		(*lp_alloc_fail_handler)( void );
 #define	next_dir(base, ptr)	next_x(base, ptr, S_IFDIR)
 #define	next_file(base, ptr)	next_x(base, ptr, S_IFREG)
 
-extern int chownmod(char *path, uid_t owner, gid_t group, mode_t mode);
+extern int chownmod(char *, uid_t, gid_t, mode_t);
 
 
-char *		next_x  ( char * , long * , unsigned int );
+char		*next_x(char *, long *, unsigned int);
 
 /*
  * Stuff needed for Trusted Extensions
  */
 
 extern	char	*get_labeled_zonename(char *);
-extern int	get_peer_label(int fd, char **slabel);
+extern int	get_peer_label(int, char **);
 
 
 #ifdef __cplusplus
diff --git a/usr/src/cmd/svr4pkg/installf/main.c b/usr/src/cmd/svr4pkg/installf/main.c
index 9d6775620a..53d7c6b48e 100644
--- a/usr/src/cmd/svr4pkg/installf/main.c
+++ b/usr/src/cmd/svr4pkg/installf/main.c
@@ -103,7 +103,7 @@
 
 #define	LINK	1
 
-extern char	dbst; 			/* libinst/pkgdbmerg.c */
+extern char	dbst;			/* libinst/pkgdbmerg.c */
 
 struct cfextra **extlist;
 struct pinfo **eptlist;
@@ -111,11 +111,10 @@ struct pinfo **eptlist;
 char	*classname = NULL;
 char	*pkginst;
 char	*uniTmp;
-char 	*abi_sym_ptr;
-char 	*ulim;
-char 	*script;
+char	*abi_sym_ptr;
+char	*ulim;
+char	*script;
 
-int	eptnum;
 int	nosetuid;
 int	nocnflct;
 int	warnflag = 0;
diff --git a/usr/src/cmd/vgrind/regexp.c b/usr/src/cmd/vgrind/regexp.c
index 027cdc058c..4add5086cf 100644
--- a/usr/src/cmd/vgrind/regexp.c
+++ b/usr/src/cmd/vgrind/regexp.c
@@ -4,8 +4,6 @@
  * specifies the terms and conditions for redistribution.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <ctype.h>
 
 typedef int	boolean;
@@ -25,7 +23,7 @@ static void	expconv(void);
 #define makelower(c)	(isupper((c)) ? tolower((c)) : (c))
 
 /*  STRNCMP -	like strncmp except that we convert the
- *	 	first string to lower case before comparing
+ *		first string to lower case before comparing
  *		if l_onecase is set.
  */
 
@@ -98,7 +96,7 @@ STRNCMP(char *s1, char *s2, int len)
 #define SNEXT(A) (A+2+*(A+1))	/* character following the string */
 
 /*
- *  bit flags in the descriptor 
+ * bit flags in the descriptor
  */
 #define OPT 1
 #define STR 2
@@ -160,8 +158,9 @@ expconv(void)
 		    *cs = STR;
 		    SCNT(cs) = 1;
 		    ccre += 2;
-		} else 
+		} else {
 		    SCNT(cs)++;
+		}
 		*ccre++ = c;
 		break;
 
@@ -173,7 +172,7 @@ expconv(void)
 		if (acs != NIL && acs != cs) {
 		    do {
 			temp = OCNT(acs);
-			OCNT(acs) = ccre - acs; 
+			OCNT(acs) = ccre - acs;
 			acs -= temp;
 		    } while (temp != 0);
 		    acs = NIL;
@@ -185,7 +184,7 @@ expconv(void)
 		break;
 	    }
 	    break;
-	    
+
 	/* just put the symbol in */
 	case '^':
 	case '$':
@@ -206,7 +205,7 @@ expconv(void)
 	/* mark the last match sequence as optional */
 	case '?':
 	    if (cs)
-	    	*cs = *cs | OPT;
+		*cs = *cs | OPT;
 	    break;
 
 	/* recurse and define a subexpression */
@@ -302,12 +301,12 @@ expconv(void)
  *	The irregular expression must be translated to internal form
  *	prior to calling this routine
  *
- *	The value returned is the pointer to the first non \a 
+ *	The value returned is the pointer to the first non \a
  *	character matched.
  */
 
-boolean _escaped;		/* true if we are currently _escaped */
-char *Start;			/* start of string */
+extern boolean _escaped;	/* true if we are currently _escaped */
+extern char *Start;		/* start of string */
 
 char *
 expmatch(char *s, char *re, char *mstring)
@@ -467,7 +466,7 @@ expmatch(char *s, char *re, char *mstring)
 	    case 'e':
 		if (_escaped)
 		    return(NIL);
-		cs = MNEXT(cs); 
+		cs = MNEXT(cs);
 		break;
 
 	    /* match any number of tabs and spaces */
@@ -479,12 +478,12 @@ expmatch(char *s, char *re, char *mstring)
 
 		    /* match, be happy */
 		    matched = 1;
-		    cs = MNEXT(cs); 
+		    cs = MNEXT(cs);
 		} else if (*s == '\n' || *s == '\0') {
 
 		    /* match, be happy */
 		    matched = 1;
-		    cs = MNEXT(cs); 
+		    cs = MNEXT(cs);
 		} else if (*cs & ALT) {
 
 		    /* try the next part */
diff --git a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c
index 2e78a755fe..f836907eb8 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c
+++ b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi.c
@@ -73,6 +73,11 @@ static topo_modinfo_t	x86pi_modinfo =
  */
 int x86pi_smbios = 0;
 
+/* indication of successful fac node creation */
+int fac_done;
+/* one for each struct */
+smbs_cnt_t stypes[SMB_TYPE_OEM_HI];
+
 /*
  * Called by libtopo when the topo module is loaded.
  */
@@ -264,7 +269,7 @@ x86pi_enum_gentopo(topo_mod_t *mod, tnode_t *t_parent)
 	smbios_pciexrc_t hbr;
 	smbios_port_ext_t export;
 	char		*f = "x86pi_enum_gentopo";
-	smbios_hdl_t 	*shp;
+	smbios_hdl_t	*shp;
 
 	shp = topo_mod_smbios(mod);
 	if (shp == NULL) {
diff --git a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi_impl.h b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi_impl.h
index f1444c6d10..1d8e4c49b6 100644
--- a/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi_impl.h
+++ b/usr/src/lib/fm/topo/modules/i86pc/x86pi/x86pi_impl.h
@@ -91,7 +91,7 @@ extern "C" {
 #define	SMB_MAX_ID	0x40
 
 /* indication of successful fac node creation */
-int fac_done;
+extern int fac_done;
 
 /*
  * Count and smbios struct id(s) for each smbios struct type.
@@ -111,7 +111,7 @@ typedef struct smbs_cnt {
 	smbs_con_ids_t ids[SMB_MAX_ID]; /* SMBIOS table entry id(s) */
 } smbs_cnt_t;
 
-smbs_cnt_t stypes[SMB_TYPE_OEM_HI]; /* one for each struct */
+extern smbs_cnt_t stypes[SMB_TYPE_OEM_HI]; /* one for each struct */
 
 /*
  * The enumerator needs to pass some state in to the function that walks