8451 cstyle: Remove space-tab sequences in usr/src/head

Reviewed by: Andrew Stormont <andyjstormont@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Dan McDonald <danmcd@omniti.com>

38 files changed, 200 insertions, 239 deletions

diff --git a/usr/src/head/arpa/nameser.h b/usr/src/head/arpa/nameser.h
index db1ece7a68..29a1c5b38e 100644
--- a/usr/src/head/arpa/nameser.h
+++ b/usr/src/head/arpa/nameser.h
@@ -17,8 +17,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/usr/src/head/arpa/nameser_compat.h b/usr/src/head/arpa/nameser_compat.h
index ae3a925fa5..d948d8e721 100644
--- a/usr/src/head/arpa/nameser_compat.h
+++ b/usr/src/head/arpa/nameser_compat.h
@@ -38,8 +38,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
diff --git a/usr/src/head/arpa/telnet.h b/usr/src/head/arpa/telnet.h
index b56727bab1..41ec9cbdde 100644
--- a/usr/src/head/arpa/telnet.h
+++ b/usr/src/head/arpa/telnet.h
@@ -89,8 +89,8 @@ char *telcmds[] = {
 #define	TELOPT_STATUS	5	/* give status */
 #define	TELOPT_TM	6	/* timing mark */
 #define	TELOPT_RCTE	7	/* remote controlled transmission and echo */
-#define	TELOPT_NAOL 	8	/* negotiate about output line width */
-#define	TELOPT_NAOP 	9	/* negotiate about output page size */
+#define	TELOPT_NAOL	8	/* negotiate about output line width */
+#define	TELOPT_NAOP	9	/* negotiate about output page size */
 #define	TELOPT_NAOCRD	10	/* negotiate about CR disposition */
 #define	TELOPT_NAOHTS	11	/* negotiate about horizontal tabstops */
 #define	TELOPT_NAOHTD	12	/* negotiate about horizontal tab disposition */
diff --git a/usr/src/head/audio/au.h b/usr/src/head/audio/au.h
index 4579e7daa3..7072a7e818 100644
--- a/usr/src/head/audio/au.h
+++ b/usr/src/head/audio/au.h
@@ -27,8 +27,6 @@
 #ifndef _AUDIO_AU_H
 #define	_AUDIO_AU_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/isa_defs.h>
 #include <sys/types.h>
 
@@ -70,7 +68,7 @@ typedef struct au_filehdr au_filehdr_t;
 	 *
 	 *	------------------------------------------------------------
 	 *	|			|		|		   |
-	 *	|   AU Audio Header	|    Info 	|   Audio Data	   |
+	 *	|   AU Audio Header	|    Info	|   Audio Data	   |
 	 *	|			| (optional)	|		   |
 	 *	|			|		|		   |
 	 *	|	24 bytes	| 4 bytes (min)	|    n bytes	   |
diff --git a/usr/src/head/config_admin.h b/usr/src/head/config_admin.h
index b9ec606ace..4d5b71f126 100644
--- a/usr/src/head/config_admin.h
+++ b/usr/src/head/config_admin.h
@@ -114,9 +114,9 @@ typedef char cfga_phys_ext_t[CFGA_PHYS_EXT_LEN];
 typedef char cfga_class_t[CFGA_CLASS_LEN];
 
 typedef struct cfga_list_data {
-	cfga_log_ext_t 	ap_log_id;	/* Attachment point logical id */
+	cfga_log_ext_t	ap_log_id;	/* Attachment point logical id */
 	cfga_phys_ext_t	ap_phys_id;	/* Attachment point physical id */
-	cfga_class_t 	ap_class;	/* Attachment point class */
+	cfga_class_t	ap_class;	/* Attachment point class */
 	cfga_stat_t	ap_r_state;	/* Receptacle state */
 	cfga_stat_t	ap_o_state;	/* Occupant state */
 	cfga_cond_t	ap_cond;	/* Attachment point condition */
diff --git a/usr/src/head/devid.h b/usr/src/head/devid.h
index 7ea92df26e..e876c6bc86 100644
--- a/usr/src/head/devid.h
+++ b/usr/src/head/devid.h
@@ -39,7 +39,7 @@ extern "C" {
 #endif
 
 typedef struct devid_nmlist {
-	char 	*devname;
+	char	*devname;
 	dev_t	dev;
 } devid_nmlist_t;
 
diff --git a/usr/src/head/dirent.h b/usr/src/head/dirent.h
index a9370f84b2..7fa0111bfd 100644
--- a/usr/src/head/dirent.h
+++ b/usr/src/head/dirent.h
@@ -27,7 +27,7 @@
  */
 
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 #ifndef _DIRENT_H
 #define	_DIRENT_H
@@ -174,7 +174,8 @@ extern int __posix_readdir_r(DIR *_RESTRICT_KYWD,
 
 static int
 readdir_r(DIR *_RESTRICT_KYWD __dp, struct dirent *_RESTRICT_KYWD __ent,
-		struct dirent **_RESTRICT_KYWD __res) {
+    struct dirent **_RESTRICT_KYWD __res)
+{
 	return (__posix_readdir_r(__dp, __ent, __res));
 }
 
diff --git a/usr/src/head/dlfcn.h b/usr/src/head/dlfcn.h
index c3309f7817..f150e90bc3 100644
--- a/usr/src/head/dlfcn.h
+++ b/usr/src/head/dlfcn.h
@@ -107,7 +107,7 @@ typedef ulong_t		Lmid_t;
  * Declarations used for dynamic linking support routines.
  */
 extern void	*dlopen(const char *, int);
-extern void   	*dlsym(void *_RESTRICT_KYWD, const char *_RESTRICT_KYWD);
+extern void	*dlsym(void *_RESTRICT_KYWD, const char *_RESTRICT_KYWD);
 extern int	dlclose(void *);
 extern char	*dlerror(void);
 #if !defined(_XOPEN_SOURCE) || defined(__EXTENSIONS__)
@@ -171,7 +171,7 @@ extern Dl_amd64_unwindinfo  *dlamd64getunwind(void *, Dl_amd64_unwindinfo *);
 						/*	bind to ourself */
 #define	RTLD_REL_WEAK		0x00020		/* apply symbolic weak relocs */
 						/*	even if unresolved */
-#define	RTLD_REL_ALL		0x00fff 	/* apply all relocs */
+#define	RTLD_REL_ALL		0x00fff		/* apply all relocs */
 
 #define	RTLD_MEMORY		0x01000		/* use memory sections */
 #define	RTLD_STRIP		0x02000		/* retain allocable sections */
diff --git a/usr/src/head/floatingpoint.h b/usr/src/head/floatingpoint.h
index c774303e65..1935b611c6 100644
--- a/usr/src/head/floatingpoint.h
+++ b/usr/src/head/floatingpoint.h
@@ -69,8 +69,8 @@ typedef int sigfpe_code_type;	/* Type of SIGFPE code. */
 typedef void (*sigfpe_handler_type)();	/* Pointer to exception handler */
 
 #define	SIGFPE_DEFAULT (void (*)())0	/* default exception handling */
-#define	SIGFPE_IGNORE  (void (*)())1  	/* ignore this exception or code */
-#define	SIGFPE_ABORT   (void (*)())2  	/* force abort on exception */
+#define	SIGFPE_IGNORE  (void (*)())1	/* ignore this exception or code */
+#define	SIGFPE_ABORT   (void (*)())2	/* force abort on exception */
 
 extern sigfpe_handler_type sigfpe __P((sigfpe_code_type, sigfpe_handler_type));
 
@@ -109,7 +109,7 @@ typedef struct {
 	int	more;		/* On conversion from decimal to binary, != 0 */
 				/* indicates more non-zero digits following */
 				/* ds. */
-	int 	ndigits;	/* On fixed_form conversion from binary to */
+	int	ndigits;	/* On fixed_form conversion from binary to */
 				/* decimal, contains number of digits */
 				/* required for ds. */
 } decimal_record;
@@ -134,8 +134,8 @@ typedef struct {
 enum decimal_string_form {	/* Valid decimal number string formats. */
 	invalid_form,		/* Not a valid decimal string format. */
 	whitespace_form,	/* All white space - valid in Fortran! */
-	fixed_int_form,		/* <digs> 		*/
-	fixed_intdot_form,	/* <digs>. 		*/
+	fixed_int_form,		/* <digs>		*/
+	fixed_intdot_form,	/* <digs>.		*/
 	fixed_dotfrac_form,	/* .<digs>		*/
 	fixed_intdotfrac_form,	/* <digs>.<frac>	*/
 	floating_int_form,	/* <digs><exp>		*/
diff --git a/usr/src/head/iso/limits_iso.h b/usr/src/head/iso/limits_iso.h
index ea9e41b90e..47902e5403 100644
--- a/usr/src/head/iso/limits_iso.h
+++ b/usr/src/head/iso/limits_iso.h
@@ -84,7 +84,7 @@ extern "C" {
 #define	LONG_MIN	(-2147483647L-1L)
 					/* min value of a "long int" */
 #define	LONG_MAX	2147483647L	/* max value of a "long int" */
-#define	ULONG_MAX	4294967295UL 	/* max value of "unsigned long int" */
+#define	ULONG_MAX	4294967295UL	/* max value of "unsigned long int" */
 #endif
 #if !defined(_STRICT_STDC) || defined(_STDC_C99) || defined(__EXTENSIONS__)
 #define	LLONG_MIN	(-9223372036854775807LL-1LL)
diff --git a/usr/src/head/langinfo.h b/usr/src/head/langinfo.h
index 5cd22c9356..2a7040b389 100644
--- a/usr/src/head/langinfo.h
+++ b/usr/src/head/langinfo.h
@@ -107,16 +107,16 @@ extern "C" {
 /* YESSTR and NOSTR marked as legacy in XPG5 and removed in SUSv3 */
 #if !defined(_XPG6) || defined(__EXTENSIONS__)
 #define	YESSTR	  41    /* affirmative response for yes/no queries */
-#define	NOSTR	  42  	/* negative response for yes/no queries */
+#define	NOSTR	  42	/* negative response for yes/no queries */
 #endif /* !defined(_XPG6) || defined(__EXTENSIONS__ */
-#define	CRNCYSTR  43 	/* currency symbol */
+#define	CRNCYSTR  43	/* currency symbol */
 
 /*
  * Default string used to format date and time
  *	e.g. Sunday, August 24 21:08:38 MET 1986
  */
 
-#define	D_T_FMT	  44 	/* string for formatting date and time */
+#define	D_T_FMT	  44	/* string for formatting date and time */
 #define	D_FMT	  45	/* date format */
 #define	T_FMT	  46	/* time format */
 #define	AM_STR	  47	/* am string */
diff --git a/usr/src/head/ldap.h b/usr/src/head/ldap.h
index 046d08f4f0..8410782150 100644
--- a/usr/src/head/ldap.h
+++ b/usr/src/head/ldap.h
@@ -50,10 +50,10 @@ extern "C" {
 #define	LDAP_PORT		389
 #define	LDAPS_PORT		636
 #define	LDAP_PORT_MAX		65535		/* API extension */
-#define	LDAP_VERSION1   	1		/* API extension */
-#define	LDAP_VERSION2   	2
-#define	LDAP_VERSION3   	3
-#define	LDAP_VERSION    	LDAP_VERSION2	/* API extension */
+#define	LDAP_VERSION1		1		/* API extension */
+#define	LDAP_VERSION2		2
+#define	LDAP_VERSION3		3
+#define	LDAP_VERSION		LDAP_VERSION2	/* API extension */
 #define	LDAP_VERSION_MIN	LDAP_VERSION3
 #define	LDAP_VERSION_MAX	LDAP_VERSION3
 
@@ -223,7 +223,7 @@ typedef struct ldap_apifeature_info {
 
 #ifdef	_SOLARIS_SDK
 #define	LDAP_SASL_CRAM_MD5	"CRAM-MD5"
-#define	LDAP_SASL_DIGEST_MD5 	"DIGEST-MD5"
+#define	LDAP_SASL_DIGEST_MD5	"DIGEST-MD5"
 #define	LDAP_SASL_BIND_INPROGRESS	0x0e    /* for backward compatibility */
 #endif
 
@@ -330,7 +330,7 @@ typedef struct ldap_apifeature_info {
 #define	LDAP_CONTROL_SORTRESPONSE	"1.2.840.113556.1.4.474"
 #define	LDAP_CONTROL_PERSISTENTSEARCH	"2.16.840.1.113730.3.4.3"
 #define	LDAP_CONTROL_ENTRYCHANGE	"2.16.840.1.113730.3.4.7"
-#define	LDAP_CONTROL_VLVREQUEST    	"2.16.840.1.113730.3.4.9"
+#define	LDAP_CONTROL_VLVREQUEST		"2.16.840.1.113730.3.4.9"
 #define	LDAP_CONTROL_VLVRESPONSE	"2.16.840.1.113730.3.4.10"
 #define	LDAP_CONTROL_PROXYAUTH		"2.16.840.1.113730.3.4.12"
 	/* version 1 */
@@ -533,9 +533,9 @@ int LDAP_CALL ldap_result2error(LDAP *ld, LDAPMessage *r,
 char *LDAP_CALL ldap_err2string(int err);
 LDAP_API(void) LDAP_CALL ldap_perror(LDAP *ld, const char *s);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_first_entry(LDAP *ld,
-	LDAPMessage *chain);
+    LDAPMessage *chain);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_next_entry(LDAP *ld,
-	LDAPMessage *entry);
+    LDAPMessage *entry);
 int LDAP_CALL ldap_count_entries(LDAP *ld, LDAPMessage *chain);
 char *LDAP_CALL ldap_get_dn(LDAP *ld, LDAPMessage *entry);
 char *LDAP_CALL ldap_dn2ufn(const char *dn);
@@ -634,14 +634,14 @@ int LDAP_CALL ldap_parse_result(LDAP *ld, LDAPMessage *res,
 int LDAP_CALL ldap_parse_extended_result(LDAP *ld, LDAPMessage *res,
 	char **retoidp, struct berval **retdatap, int freeit);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_first_message(LDAP *ld,
-	LDAPMessage *res);
+    LDAPMessage *res);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_next_message(LDAP *ld,
-	LDAPMessage *msg);
+    LDAPMessage *msg);
 int LDAP_CALL ldap_count_messages(LDAP *ld, LDAPMessage *res);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_first_reference(LDAP *ld,
-	LDAPMessage *res);
+    LDAPMessage *res);
 LDAP_API(LDAPMessage *) LDAP_CALL ldap_next_reference(LDAP *ld,
-	LDAPMessage *ref);
+    LDAPMessage *ref);
 int LDAP_CALL ldap_count_references(LDAP *ld, LDAPMessage *res);
 int LDAP_CALL ldap_parse_reference(LDAP *ld, LDAPMessage *ref,
 	char ***referralsp, LDAPControl ***serverctrlsp, int freeit);
@@ -944,97 +944,75 @@ struct ldap_disptmpl {
 
 typedef int (*writeptype)(void *writeparm, char *p, int len);
 
-LDAP_API(int)
-LDAP_CALL
-ldap_init_templates(char *file, struct ldap_disptmpl **tmpllistp);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_init_templates_buf(char *buf, long buflen,
-	struct ldap_disptmpl **tmpllistp);
-
-LDAP_API(void)
-LDAP_CALL
-ldap_free_templates(struct ldap_disptmpl *tmpllist);
-
-LDAP_API(struct ldap_disptmpl *)
-LDAP_CALL
-ldap_first_disptmpl(struct ldap_disptmpl *tmpllist);
-
-LDAP_API(struct ldap_disptmpl *)
-LDAP_CALL
-ldap_next_disptmpl(struct ldap_disptmpl *tmpllist,
-	struct ldap_disptmpl *tmpl);
-
-LDAP_API(struct ldap_disptmpl *)
-LDAP_CALL
-ldap_name2template(char *name, struct ldap_disptmpl *tmpllist);
-
-LDAP_API(struct ldap_disptmpl *)
-LDAP_CALL
-ldap_oc2template(char **oclist, struct ldap_disptmpl *tmpllist);
-
-LDAP_API(char **)
-LDAP_CALL
-ldap_tmplattrs(struct ldap_disptmpl *tmpl, char **includeattrs, int exclude,
-	unsigned long syntaxmask);
-
-LDAP_API(struct ldap_tmplitem *)
-LDAP_CALL
-ldap_first_tmplrow(struct ldap_disptmpl *tmpl);
-
-LDAP_API(struct ldap_tmplitem *)
-LDAP_CALL
-ldap_next_tmplrow(struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row);
-
-LDAP_API(struct ldap_tmplitem *)
-LDAP_CALL
-ldap_first_tmplcol(struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row);
-
-LDAP_API(struct ldap_tmplitem *)
-LDAP_CALL
-ldap_next_tmplcol(struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row,
-	struct ldap_tmplitem *col);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_entry2text(LDAP *ld, char *buf, LDAPMessage *entry,
-	struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
-	writeptype writeproc, void *writeparm, char *eol, int rdncount,
-	unsigned long opts);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_vals2text(LDAP *ld, char *buf, char **vals, char *label, int labelwidth,
-	unsigned long syntaxid, writeptype writeproc, void *writeparm,
-	char *eol, int rdncount);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_entry2text_search(LDAP *ld, char *dn, char *base, LDAPMessage *entry,
-	struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
-	writeptype writeproc, void *writeparm, char *eol, int rdncount,
-	unsigned long opts);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_entry2html(LDAP *ld, char *buf, LDAPMessage *entry,
-	struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
-	writeptype writeproc, void *writeparm, char *eol, int rdncount,
-	unsigned long opts, char *urlprefix, char *base);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_vals2html(LDAP *ld, char *buf, char **vals, char *label, int labelwidth,
-	unsigned long syntaxid, writeptype writeproc, void *writeparm,
-	char *eol, int rdncount, char *urlprefix);
-
-LDAP_API(int)
-LDAP_CALL
-ldap_entry2html_search(LDAP *ld, char *dn, char *base, LDAPMessage *entry,
-	struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
-	writeptype writeproc, void *writeparm, char *eol, int rdncount,
-	unsigned long opts, char *urlprefix);
+LDAP_API(int) LDAP_CALL ldap_init_templates(char *file,
+    struct ldap_disptmpl **tmpllistp);
+
+LDAP_API(int) LDAP_CALL ldap_init_templates_buf(char *buf, long buflen,
+    struct ldap_disptmpl **tmpllistp);
+
+LDAP_API(void) LDAP_CALL ldap_free_templates(struct ldap_disptmpl *tmpllist);
+
+LDAP_API(struct ldap_disptmpl *) LDAP_CALL ldap_first_disptmpl(
+    struct ldap_disptmpl *tmpllist);
+
+LDAP_API(struct ldap_disptmpl *) LDAP_CALL ldap_next_disptmpl(
+    struct ldap_disptmpl *tmpllist,
+    struct ldap_disptmpl *tmpl);
+
+LDAP_API(struct ldap_disptmpl *) LDAP_CALL ldap_name2template(char *name,
+    struct ldap_disptmpl *tmpllist);
+
+LDAP_API(struct ldap_disptmpl *) LDAP_CALL ldap_oc2template(char **oclist,
+    struct ldap_disptmpl *tmpllist);
+
+LDAP_API(char **) LDAP_CALL ldap_tmplattrs(struct ldap_disptmpl *tmpl,
+    char **includeattrs, int exclude,
+    unsigned long syntaxmask);
+
+LDAP_API(struct ldap_tmplitem *) LDAP_CALL ldap_first_tmplrow(
+    struct ldap_disptmpl *tmpl);
+
+LDAP_API(struct ldap_tmplitem *) LDAP_CALL ldap_next_tmplrow(
+    struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row);
+
+LDAP_API(struct ldap_tmplitem *) LDAP_CALL ldap_first_tmplcol(
+    struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row);
+
+LDAP_API(struct ldap_tmplitem *) LDAP_CALL ldap_next_tmplcol(
+    struct ldap_disptmpl *tmpl, struct ldap_tmplitem *row,
+    struct ldap_tmplitem *col);
+
+LDAP_API(int) LDAP_CALL ldap_entry2text(LDAP *ld, char *buf, LDAPMessage *entry,
+    struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
+    writeptype writeproc, void *writeparm, char *eol, int rdncount,
+    unsigned long opts);
+
+LDAP_API(int) LDAP_CALL ldap_vals2text(LDAP *ld, char *buf, char **vals,
+    char *label, int labelwidth,
+    unsigned long syntaxid, writeptype writeproc, void *writeparm,
+    char *eol, int rdncount);
+
+LDAP_API(int) LDAP_CALL ldap_entry2text_search(LDAP *ld, char *dn, char *base,
+    LDAPMessage *entry,
+    struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
+    writeptype writeproc, void *writeparm, char *eol, int rdncount,
+    unsigned long opts);
+
+LDAP_API(int) LDAP_CALL ldap_entry2html(LDAP *ld, char *buf, LDAPMessage *entry,
+    struct ldap_disptmpl *tmpl, char **defattrs, char ***defvals,
+    writeptype writeproc, void *writeparm, char *eol, int rdncount,
+    unsigned long opts, char *urlprefix, char *base);
+
+LDAP_API(int) LDAP_CALL ldap_vals2html(LDAP *ld, char *buf, char **vals,
+    char *label, int labelwidth,
+    unsigned long syntaxid, writeptype writeproc, void *writeparm,
+    char *eol, int rdncount, char *urlprefix);
+
+LDAP_API(int) LDAP_CALL ldap_entry2html_search(LDAP *ld, char *dn, char *base,
+    LDAPMessage *entry,
+    struct ldap_disptmpl *tmpllist, char **defattrs, char ***defvals,
+    writeptype writeproc, void *writeparm, char *eol, int rdncount,
+    unsigned long opts, char *urlprefix);
 
 /*
  * Search Preference Definitions
@@ -1088,27 +1066,19 @@ struct ldap_searchobj {
 #define	LDAP_SEARCHPREF_ERR_SYNTAX	3
 #define	LDAP_SEARCHPREF_ERR_FILE	4
 
-LDAP_API(int)
-LDAP_CALL
-ldap_init_searchprefs(char *file, struct ldap_searchobj **solistp);
+LDAP_API(int) LDAP_CALL ldap_init_searchprefs(char *file,
+    struct ldap_searchobj **solistp);
 
-LDAP_API(int)
-LDAP_CALL
-ldap_init_searchprefs_buf(char *buf, long buflen,
-	struct ldap_searchobj **solistp);
+LDAP_API(int) LDAP_CALL ldap_init_searchprefs_buf(char *buf, long buflen,
+    struct ldap_searchobj **solistp);
 
-LDAP_API(void)
-LDAP_CALL
-ldap_free_searchprefs(struct ldap_searchobj *solist);
+LDAP_API(void) LDAP_CALL ldap_free_searchprefs(struct ldap_searchobj *solist);
 
-LDAP_API(struct ldap_searchobj *)
-LDAP_CALL
-ldap_first_searchobj(struct ldap_searchobj *solist);
+LDAP_API(struct ldap_searchobj *) LDAP_CALL ldap_first_searchobj(
+    struct ldap_searchobj *solist);
 
-LDAP_API(struct ldap_searchobj *)
-LDAP_CALL
-ldap_next_searchobj(struct ldap_searchobj *sollist,
-struct ldap_searchobj *so);
+LDAP_API(struct ldap_searchobj *) LDAP_CALL ldap_next_searchobj(
+    struct ldap_searchobj *sollist, struct ldap_searchobj *so);
 
 /*
  * specific LDAP instantiations of BER types we know about
@@ -1207,7 +1177,7 @@ struct berval **LDAP_CALL ldap_get_lang_values_len(LDAP *ld,
 typedef int (LDAP_CALL LDAP_CALLBACK LDAP_REBINDPROC_CALLBACK)(LDAP *ld,
 	char **dnp, char **passwdp, int *authmethodp, int freeit, void *arg);
 LDAP_API(void) LDAP_CALL ldap_set_rebind_proc(LDAP *ld,
-	LDAP_REBINDPROC_CALLBACK *rebindproc, void *arg);
+    LDAP_REBINDPROC_CALLBACK *rebindproc, void *arg);
 
 /*
  * Thread function callbacks (an API extension --
@@ -1301,9 +1271,9 @@ typedef struct ldap_filt_desc LDAPFiltDesc; /* opaque filter desc handle */
  */
 LDAP_API(LDAPFiltDesc *) LDAP_CALL ldap_init_getfilter(char *fname);
 LDAP_API(LDAPFiltDesc *) LDAP_CALL ldap_init_getfilter_buf(char *buf,
-	ssize_t buflen);
+    ssize_t buflen);
 LDAP_API(LDAPFiltInfo *) LDAP_CALL ldap_getfirstfilter(LDAPFiltDesc *lfdp,
-	char *tagpat, char *value);
+    char *tagpat, char *value);
 LDAP_API(LDAPFiltInfo *) LDAP_CALL ldap_getnextfilter(LDAPFiltDesc *lfdp);
 int LDAP_CALL ldap_set_filter_additions(LDAPFiltDesc *lfdp,
 	char *prefix, char *suffix);
@@ -1336,7 +1306,7 @@ int LDAP_CALL ldap_memcache_init(unsigned long ttl,
 int LDAP_CALL ldap_memcache_set(LDAP *ld, LDAPMemCache *cache);
 int LDAP_CALL ldap_memcache_get(LDAP *ld, LDAPMemCache **cachep);
 LDAP_API(void) LDAP_CALL ldap_memcache_flush(LDAPMemCache *cache, char *dn,
-	int scope);
+    int scope);
 LDAP_API(void) LDAP_CALL ldap_memcache_destroy(LDAPMemCache *cache);
 LDAP_API(void) LDAP_CALL ldap_memcache_update(LDAPMemCache *cache);
 
@@ -1431,11 +1401,11 @@ int LDAP_CALL ldap_version(LDAPVersion *ver);
 
 /* use ldap_create_filter() instead of ldap_build_filter() */
 LDAP_API(void) LDAP_CALL ldap_build_filter(char *buf, size_t buflen,
-	char *pattern, char *prefix, char *suffix, char *attr,
-	char *value, char **valwords);
+    char *pattern, char *prefix, char *suffix, char *attr,
+    char *value, char **valwords);
 /* use ldap_set_filter_additions() instead of ldap_setfilteraffixes() */
 LDAP_API(void) LDAP_CALL ldap_setfilteraffixes(LDAPFiltDesc *lfdp,
-	char *prefix, char *suffix);
+    char *prefix, char *suffix);
 
 /* older result types a server can return -- use LDAP_RES_MODDN instead */
 #define	LDAP_RES_MODRDN			LDAP_RES_MODDN
diff --git a/usr/src/head/libelf.h b/usr/src/head/libelf.h
index 0c923c633e..722d0cdc97 100644
--- a/usr/src/head/libelf.h
+++ b/usr/src/head/libelf.h
@@ -123,10 +123,10 @@ typedef struct {
 	char		*ar_name;
 	time_t		ar_date;
 	uid_t		ar_uid;
-	gid_t 		ar_gid;
+	gid_t		ar_gid;
 	mode_t		ar_mode;
 	off_t		ar_size;
-	char 		*ar_rawname;
+	char		*ar_rawname;
 } Elf_Arhdr;
 
 
diff --git a/usr/src/head/libzonecfg.h b/usr/src/head/libzonecfg.h
index 746b872919..7db0d126c7 100644
--- a/usr/src/head/libzonecfg.h
+++ b/usr/src/head/libzonecfg.h
@@ -184,7 +184,7 @@ typedef struct zone_fsopt {
 } zone_fsopt_t;
 
 struct zone_fstab {
-	char		zone_fs_special[MAXPATHLEN]; 	/* special file */
+	char		zone_fs_special[MAXPATHLEN];	/* special file */
 	char		zone_fs_dir[MAXPATHLEN];	/* mount point */
 	char		zone_fs_type[FSTYPSZ];		/* e.g. ufs */
 	zone_fsopt_t   *zone_fs_options;		/* mount options */
@@ -344,7 +344,7 @@ extern	int	zonecfg_lookup_filesystem(zone_dochandle_t,
 extern	int	zonecfg_add_fs_option(struct zone_fstab *, char *);
 extern	int	zonecfg_remove_fs_option(struct zone_fstab *, char *);
 extern	void	zonecfg_free_fs_option_list(zone_fsopt_t *);
-extern	int 	zonecfg_find_mounts(char *, int(*)(const struct mnttab *,
+extern	int	zonecfg_find_mounts(char *, int(*)(const struct mnttab *,
     void *), void *);
 
 /*
diff --git a/usr/src/head/listen.h b/usr/src/head/listen.h
index 983fe5c266..baac41c0ec 100644
--- a/usr/src/head/listen.h
+++ b/usr/src/head/listen.h
@@ -20,14 +20,12 @@
  * CDDL HEADER END
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 
 #ifndef	_LISTEN_H
 #define	_LISTEN_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"	/* SVr4.0 1.4.3.1 */
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -101,7 +99,7 @@ struct call_list {
 };
 
 
-#define	EMPTYLIST(p)	(p->cl_head == (struct callsave *) NULL)
+#define	EMPTYLIST(p)	(p->cl_head == (struct callsave *)NULL)
 
 /*
  * Ridiculously high value for maximum number of connects per stream.
diff --git a/usr/src/head/macros.h b/usr/src/head/macros.h
index d284b4c722..ed4f9226d9 100644
--- a/usr/src/head/macros.h
+++ b/usr/src/head/macros.h
@@ -42,8 +42,8 @@ extern "C" {
  *	abs() is absolute value
  */
 #define	numeric(c)		((c) >= '0' && (c) <= '9')
-#define	max(a, b) 		((a) < (b) ? (b) : (a))
-#define	min(a, b) 		((a) > (b) ? (b) : (a))
+#define	max(a, b)		((a) < (b) ? (b) : (a))
+#define	min(a, b)		((a) > (b) ? (b) : (a))
 #define	abs(x)			((x) >= 0 ? (x) : -(x))
 
 #define	compare(str1, str2)	strcmp((str1), (str2))
diff --git a/usr/src/head/ndpd.h b/usr/src/head/ndpd.h
index 6cddbfa4e6..a8b16d9a40 100644
--- a/usr/src/head/ndpd.h
+++ b/usr/src/head/ndpd.h
@@ -26,8 +26,6 @@
 #ifndef	_NDPD_H
 #define	_NDPD_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -111,10 +109,10 @@ typedef struct ndpd_phyint_info_s {
 	uint_t		phyint_info_type;
 	uint_t		phyint_info_version;
 	int		phyint_index;
-	struct confvar 	phyint_config[I_IFSIZE];
-#define	phyint_DupAddrDetectTransmits 	\
+	struct confvar	phyint_config[I_IFSIZE];
+#define	phyint_DupAddrDetectTransmits	\
 				phyint_config[I_DupAddrDetectTransmits].cf_value
-#define	phyint_AdvSendAdvertisements 	\
+#define	phyint_AdvSendAdvertisements	\
 				phyint_config[I_AdvSendAdvertisements].cf_value
 #define	phyint_MaxRtrAdvInterval	\
 				phyint_config[I_MaxRtrAdvInterval].cf_value
@@ -140,8 +138,8 @@ typedef struct ndpd_phyint_info_s {
 				phyint_config[I_TmpMaxDesyncFactor].cf_value
 #define	phyint_StatefulAddrConf	\
 				phyint_config[I_StatefulAddrConf].cf_value
-	uint_t 		phyint_num_of_prefixes;
-	uint_t 		phyint_num_of_routers;
+	uint_t		phyint_num_of_prefixes;
+	uint_t		phyint_num_of_routers;
 } ndpd_phyint_info_t;
 
 #ifdef	__cplusplus
diff --git a/usr/src/head/netdir.h b/usr/src/head/netdir.h
index 53abe5e2ec..123aeeea10 100644
--- a/usr/src/head/netdir.h
+++ b/usr/src/head/netdir.h
@@ -49,8 +49,8 @@ extern "C" {
 #endif
 
 struct nd_addrlist {
-	int 		n_cnt;		/* number of netbufs */
-	struct netbuf 	*n_addrs;	/* the netbufs */
+	int		n_cnt;		/* number of netbufs */
+	struct netbuf	*n_addrs;	/* the netbufs */
 };
 
 struct nd_hostservlist {
@@ -126,8 +126,8 @@ char *_netdir_mergeaddr(struct netconfig *, char *uaddr, char *ruaddr);
 #define	ND_NO_DATA	-3	/* Valid name, no data record of requested */
 				/* type */
 #define	ND_NO_ADDRESS ND_NO_DATA /* no address, look for MX record */
-#define	ND_BADARG	-2	/* Bad arguments passed 	*/
-#define	ND_NOMEM 	-1	/* No virtual memory left	*/
+#define	ND_BADARG	-2	/* Bad arguments passed		*/
+#define	ND_NOMEM	-1	/* No virtual memory left	*/
 #define	ND_OK		0	/* Translation successful	*/
 #define	ND_NOHOST	1	/* Hostname was not resolvable	*/
 #define	ND_NOSERV	2	/* Service was unknown		*/
diff --git a/usr/src/head/nl_types.h b/usr/src/head/nl_types.h
index c6cee0428f..1a4b1fc637 100644
--- a/usr/src/head/nl_types.h
+++ b/usr/src/head/nl_types.h
@@ -40,13 +40,13 @@
 extern "C" {
 #endif
 
-#define	NL_SETD 		1    /* XPG3 Conformant Default set number. */
-#define	NL_CAT_LOCALE 		(-1) /* XPG4 requirement */
+#define	NL_SETD			1    /* XPG3 Conformant Default set number. */
+#define	NL_CAT_LOCALE		(-1) /* XPG4 requirement */
 
-#define	_CAT_MAGIC 		0xFF88FF89
-#define	_CAT_HDR_SIZE 		sizeof (struct _cat_hdr)
-#define	_CAT_SET_HDR_SIZE 	sizeof (struct _cat_set_hdr)
-#define	_CAT_MSG_HDR_SIZE 	sizeof (struct _cat_msg_hdr)
+#define	_CAT_MAGIC		0xFF88FF89
+#define	_CAT_HDR_SIZE		sizeof (struct _cat_hdr)
+#define	_CAT_SET_HDR_SIZE	sizeof (struct _cat_set_hdr)
+#define	_CAT_MSG_HDR_SIZE	sizeof (struct _cat_msg_hdr)
 
 struct _cat_hdr
 {
diff --git a/usr/src/head/nss_common.h b/usr/src/head/nss_common.h
index 066d8462ab..3d2d775e5e 100644
--- a/usr/src/head/nss_common.h
+++ b/usr/src/head/nss_common.h
@@ -71,7 +71,7 @@ extern "C" {
  *
  *    - Old style backend interfaces follow this pointer to function interface:
  *
- *     	A "backend" exists for useful <database, source> pairs.  Each backend
+ *	A "backend" exists for useful <database, source> pairs.  Each backend
  *	consists of whatever private data it needs and a set of functions
  *	that the switch engine may invoke on behalf of the frontend
  *	[e.g. the "nis" backend for "passwd" provides routines to lookup
@@ -349,7 +349,7 @@ enum nss_dbp_flags {
 };
 
 struct nss_db_params {
-	const char 		*name;		/* Mandatory: database name */
+	const char		*name;		/* Mandatory: database name */
 	const char		*config_name;	/* config-file database name */
 	const char		*default_config; /* Mandatory: default config */
 	unsigned		max_active_per_src;
diff --git a/usr/src/head/nsswitch.h b/usr/src/head/nsswitch.h
index d1612a2988..6044906a17 100644
--- a/usr/src/head/nsswitch.h
+++ b/usr/src/head/nsswitch.h
@@ -116,7 +116,7 @@ struct __nsw_switchconfig {
 	struct __nsw_lookup *lookups;
 };
 
-#define	__NSW_ACTION(lkp, err) 	\
+#define	__NSW_ACTION(lkp, err)	\
 	((lkp)->next == NULL ? \
 		__NSW_RETURN \
 	: \
diff --git a/usr/src/head/pkgdev.h b/usr/src/head/pkgdev.h
index 960ee105fb..9d5222b733 100644
--- a/usr/src/head/pkgdev.h
+++ b/usr/src/head/pkgdev.h
@@ -35,7 +35,7 @@ extern "C" {
 struct pkgdev {
 	int			rdonly;
 	int			mntflg;
-	longlong_t 	capacity; /* number of 512-blocks on device */
+	longlong_t	capacity; /* number of 512-blocks on device */
 	char		*name;
 	char		*dirname;
 	char		*pathname;
diff --git a/usr/src/head/pkginfo.h b/usr/src/head/pkginfo.h
index 1bc384ca1c..702f9e0325 100644
--- a/usr/src/head/pkginfo.h
+++ b/usr/src/head/pkginfo.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#define	PI_INSTALLED 	0
+#define	PI_INSTALLED	0
 #define	PI_PARTIAL	1
 #define	PI_PRESVR4	2
 #define	PI_UNKNOWN	3
diff --git a/usr/src/head/protocols/dumprestore.h b/usr/src/head/protocols/dumprestore.h
index 029f5cbbe5..29b3b309b7 100644
--- a/usr/src/head/protocols/dumprestore.h
+++ b/usr/src/head/protocols/dumprestore.h
@@ -35,8 +35,6 @@
 #ifndef _PROTOCOLS_DUMPRESTORE_H
 #define	_PROTOCOLS_DUMPRESTORE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -89,7 +87,7 @@ extern	int32_t		tp_bsize;
 #define	TP_BUFSIZE	TP_BSIZE
 #endif /* SUPPORTS_MTB_TAPE_FORMAT */
 
-#define	NTREC   	10
+#define	NTREC		10
 #define	HIGHDENSITYTREC	32
 #define	CARTRIDGETREC	63
 #define	TP_NINDIR	(TP_BSIZE_MIN/2)
@@ -97,9 +95,9 @@ extern	int32_t		tp_bsize;
 #define	LBLSIZE		16
 #define	NAMELEN		64
 
-#define	OFS_MAGIC   	(int)60011
-#define	NFS_MAGIC   	(int)60012
-#define	MTB_MAGIC   	(int)60013
+#define	OFS_MAGIC	(int)60011
+#define	NFS_MAGIC	(int)60012
+#define	MTB_MAGIC	(int)60013
 #define	CHECKSUM	(int)84446
 
 union u_data {
@@ -156,12 +154,12 @@ union u_spcl {
 /*
  * special record types
  */
-#define	TS_TAPE 	1	/* dump tape header */
+#define	TS_TAPE		1	/* dump tape header */
 #define	TS_INODE	2	/* beginning of file record */
-#define	TS_ADDR 	4	/* continuation of file record */
-#define	TS_BITS 	3	/* map of inodes on tape */
-#define	TS_CLRI 	6	/* map of inodes deleted since last dump */
-#define	TS_END  	5	/* end of volume marker */
+#define	TS_ADDR		4	/* continuation of file record */
+#define	TS_BITS		3	/* map of inodes on tape */
+#define	TS_CLRI		6	/* map of inodes deleted since last dump */
+#define	TS_END		5	/* end of volume marker */
 #define	TS_EOM		7	/* floppy EOM - restore compat w/ old dump */
 
 /*
diff --git a/usr/src/head/protocols/timed.h b/usr/src/head/protocols/timed.h
index 0b92374617..6c44afe56b 100644
--- a/usr/src/head/protocols/timed.h
+++ b/usr/src/head/protocols/timed.h
@@ -44,7 +44,7 @@ extern "C" {
 #endif
 
 #define	TSPVERSION	1
-#define	ANYADDR 	NULL
+#define	ANYADDR		NULL
 
 struct tsp {
 	uchar_t	tsp_type;
diff --git a/usr/src/head/regexp.h b/usr/src/head/regexp.h
index 5336c81677..d224c5b2c4 100644
--- a/usr/src/head/regexp.h
+++ b/usr/src/head/regexp.h
@@ -19,7 +19,7 @@
  * CDDL HEADER END
  */
 /*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * Copyright 2014 Garrett D'Amore <garrett@damore.org>
@@ -472,7 +472,7 @@ advance(const char *lp, const char *ep)
 			}
 			if (size < 0)
 				lp++;
-			ep += 18; 		/* 16 + 2 */
+			ep += 18;		/* 16 + 2 */
 			goto star;
 			/*FALLTHRU*/
 
@@ -504,13 +504,15 @@ advance(const char *lp, const char *ep)
 
 		case CDOT | STAR:
 			curlp = lp;
-			while (*lp++);
+			while (*lp++)
+				;
 			goto star;
 			/*FALLTHRU*/
 
 		case CCHR | STAR:
 			curlp = lp;
-			while (*lp++ == *ep);
+			while (*lp++ == *ep)
+				;
 			ep++;
 			goto star;
 			/*FALLTHRU*/
diff --git a/usr/src/head/resolv.h b/usr/src/head/resolv.h
index 2d3ceb69b2..dcf06e95a7 100644
--- a/usr/src/head/resolv.h
+++ b/usr/src/head/resolv.h
@@ -53,8 +53,8 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -155,8 +155,8 @@ typedef res_sendhookact (*res_send_rhook)__P((const struct sockaddr *ns,
 
 struct res_sym {
 	int		number;	   /* Identifying number, like T_MX */
-	const char 	*name;	   /* Its symbolic name, like "MX" */
-	const char 	*humanname; /* Its fun name, like "mail exchanger" */
+	const char	*name;	   /* Its symbolic name, like "MX" */
+	const char	*humanname; /* Its fun name, like "mail exchanger" */
 };
 
 /*
@@ -423,12 +423,12 @@ void		res_send_setqhook __P((res_send_qhook hook));
 void		res_send_setrhook __P((res_send_rhook hook));
 int		__res_vinit __P((res_state, int));
 void		res_destroyservicelist __P((void));
-const char 	*res_servicename __P((uint16_t port, const char *proto));
-const char 	*res_protocolname __P((int num));
+const char	*res_servicename __P((uint16_t port, const char *proto));
+const char	*res_protocolname __P((int num));
 void		res_destroyprotolist __P((void));
 void		res_buildprotolist __P((void));
-const char 	*res_get_nibblesuffix __P((res_state));
-const char 	*res_get_nibblesuffix2 __P((res_state));
+const char	*res_get_nibblesuffix __P((res_state));
+const char	*res_get_nibblesuffix2 __P((res_state));
 void		res_ndestroy __P((res_state));
 uint16_t	res_nametoclass __P((const char *buf, int *success));
 uint16_t	res_nametotype __P((const char *buf, int *success));
diff --git a/usr/src/head/rpcsvc/svc_dg_priv.h b/usr/src/head/rpcsvc/svc_dg_priv.h
index 80d2294f73..4b6c6fa242 100644
--- a/usr/src/head/rpcsvc/svc_dg_priv.h
+++ b/usr/src/head/rpcsvc/svc_dg_priv.h
@@ -51,7 +51,7 @@ struct svc_dg_data {
 	/* Note: optbuf must be the first field, used by ti_opts.c code */
 	struct	netbuf optbuf;			/* netbuf for options */
 	uint_t	 su_iosz;			/* size of send.recv buffer */
-	uint32_t	su_xid; 		/* transaction id */
+	uint32_t	su_xid;			/* transaction id */
 	XDR	su_xdrs;			/* XDR handle */
 	char	su_verfbody[MAX_AUTH_BYTES];	/* verifier body */
 	char	*su_cache;			/* cached data, NULL if none */
diff --git a/usr/src/head/rpcsvc/yp_prot.h b/usr/src/head/rpcsvc/yp_prot.h
index 828500f132..f7e5dff572 100644
--- a/usr/src/head/rpcsvc/yp_prot.h
+++ b/usr/src/head/rpcsvc/yp_prot.h
@@ -342,13 +342,13 @@ struct yppushresp_xfr {
 
 #define	YPPUSH_SUCC	(1)	/* Success */
 #define	YPPUSH_AGE	(2)	/* Master's version not newer */
-#define	YPPUSH_NOMAP 	(-1)	/* Can't find server for map */
-#define	YPPUSH_NODOM 	(-2)	/* Domain not supported */
-#define	YPPUSH_RSRC 	(-3)	/* Local resouce alloc failure */
-#define	YPPUSH_RPC 	(-4)	/* RPC failure talking to server */
+#define	YPPUSH_NOMAP	(-1)	/* Can't find server for map */
+#define	YPPUSH_NODOM	(-2)	/* Domain not supported */
+#define	YPPUSH_RSRC	(-3)	/* Local resouce alloc failure */
+#define	YPPUSH_RPC	(-4)	/* RPC failure talking to server */
 #define	YPPUSH_MADDR	(-5)	/* Can't get master address */
-#define	YPPUSH_YPERR 	(-6)	/* YP server/map db error */
-#define	YPPUSH_BADARGS 	(-7)	/* Request arguments bad */
+#define	YPPUSH_YPERR	(-6)	/* YP server/map db error */
+#define	YPPUSH_BADARGS	(-7)	/* Request arguments bad */
 #define	YPPUSH_DBM	(-8)	/* Local dbm operation failed */
 #define	YPPUSH_FILE	(-9)	/* Local file I/O operation failed */
 #define	YPPUSH_SKEW	(-10)	/* Map version skew during transfer */
diff --git a/usr/src/head/semaphore.h b/usr/src/head/semaphore.h
index 08f8fe1c1e..ddc3c6b9c9 100644
--- a/usr/src/head/semaphore.h
+++ b/usr/src/head/semaphore.h
@@ -44,7 +44,7 @@ typedef struct {
 	uint16_t	sem_type;
 	uint16_t	sem_magic;
 	upad64_t	sem_pad1[3];	/* reserved for a mutex_t */
-	upad64_t 	sem_pad2[2];	/* reserved for a cond_t */
+	upad64_t	sem_pad2[2];	/* reserved for a cond_t */
 } sem_t;
 
 #define	SEM_FAILED	((sem_t *)(-1))
diff --git a/usr/src/head/shadow.h b/usr/src/head/shadow.h
index 2bd3cf61ae..1506e09e57 100644
--- a/usr/src/head/shadow.h
+++ b/usr/src/head/shadow.h
@@ -37,10 +37,10 @@
 extern "C" {
 #endif
 
-#define	PASSWD 		"/etc/passwd"
+#define	PASSWD		"/etc/passwd"
 #define	SHADOW		"/etc/shadow"
 #define	OPASSWD		"/etc/opasswd"
-#define	OSHADOW 	"/etc/oshadow"
+#define	OSHADOW		"/etc/oshadow"
 #define	PASSTEMP	"/etc/ptmp"
 #define	SHADTEMP	"/etc/stmp"
 
diff --git a/usr/src/head/stack_unwind.h b/usr/src/head/stack_unwind.h
index 5f6fd71eb1..eeead4c631 100644
--- a/usr/src/head/stack_unwind.h
+++ b/usr/src/head/stack_unwind.h
@@ -31,8 +31,6 @@
 #ifndef _STACK_UNWIND_H
 #define	_STACK_UNWIND_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/types.h>
 
 #ifdef	__cplusplus
@@ -147,8 +145,8 @@ void _Unwind_Resume(struct _Unwind_Exception *exception_object);
 void _Unwind_DeleteException(struct _Unwind_Exception *exception_object);
 /*
  * {
- * 	(*(exception_object->exception_cleanup))(_URC_NO_REASON,
- * 		exception_object);
+ *	(*(exception_object->exception_cleanup))(_URC_NO_REASON,
+ *		exception_object);
  * }
  */
 
@@ -157,8 +155,8 @@ void _Unwind_DeleteException(struct _Unwind_Exception *exception_object);
 
 extern "C" _Unwind_Reason_Code
 __example_stop_fn(int version, int actions, uint64_t exclass,
-	struct _Unwind_Exception *exception_object,
-	struct _Unwind_Context *ctx, void *_Sa)
+    struct _Unwind_Exception *exception_object,
+    struct _Unwind_Context *ctx, void *_Sa)
 {
 	_Unwind_Reason_Code res;
 
diff --git a/usr/src/head/string.h b/usr/src/head/string.h
index ac2ed5d20e..2194b70bd8 100644
--- a/usr/src/head/string.h
+++ b/usr/src/head/string.h
@@ -176,7 +176,7 @@ extern __thread char *__strdupa_str;
 extern __thread size_t __strdupa_len;
 
 #define	strdupa(s)							\
-	(__strdupa_str = (char *)(s), 					\
+	(__strdupa_str = (char *)(s),					\
 	strcpy((char *)__builtin_alloca(strlen(__strdupa_str) + 1),	\
 	    __strdupa_str))
 
diff --git a/usr/src/head/syms.h b/usr/src/head/syms.h
index 35375f5e78..ae1336ad5a 100644
--- a/usr/src/head/syms.h
+++ b/usr/src/head/syms.h
@@ -181,18 +181,18 @@ union auxent
 				long	x_lnnoptr;	/* ptr to fcn line # */
 				long	x_endndx;	/* entry ndx past */
 							/* block end */
-			} 	x_fcn;
+			}	x_fcn;
 			struct			/* if ISARY, up to 4 dimen. */
 			{
 				unsigned short	x_dimen[DIMNUM];
-			} 	x_ary;
+			}	x_ary;
 		}		x_fcnary;
 		unsigned short  x_tvndx;		/* tv index */
-	} 	x_sym;
+	}	x_sym;
 	struct
 	{
 		char	x_fname[FILNMLEN];
-	} 	x_file;
+	}	x_file;
 	struct
 	{
 		long		x_scnlen;	/* section length */
diff --git a/usr/src/head/synch.h b/usr/src/head/synch.h
index dda7fa0a3c..d7afffd58d 100644
--- a/usr/src/head/synch.h
+++ b/usr/src/head/synch.h
@@ -53,7 +53,7 @@ typedef struct _sema {
 	uint16_t	type;
 	uint16_t	magic;
 	upad64_t	pad1[3];	/* reserved for a mutex_t */
-	upad64_t 	pad2[2];	/* reserved for a cond_t */
+	upad64_t	pad2[2];	/* reserved for a cond_t */
 } sema_t;
 
 /*
diff --git a/usr/src/head/thread_db.h b/usr/src/head/thread_db.h
index f4c9643414..d3d5b51ffb 100644
--- a/usr/src/head/thread_db.h
+++ b/usr/src/head/thread_db.h
@@ -27,8 +27,6 @@
 #ifndef _THREAD_DB_H
 #define	_THREAD_DB_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*
  *
  *  Description:
@@ -95,7 +93,7 @@ typedef struct td_thr_events {
 
 #define	td_event_emptyset(setp)				\
 	{								\
-		int _i_; 						\
+		int _i_;						\
 		_i_ = TD_EVENTSIZE;					\
 		while (_i_) (setp)->event_bits[--_i_] = 0;	\
 	}
@@ -466,7 +464,7 @@ td_ta_tsd_iter(const td_thragent_t *, td_key_iter_f *, void *);
  */
 td_err_e
 td_ta_thr_iter(const td_thragent_t *, td_thr_iter_f *, void *,
-	td_thr_state_e, int, sigset_t *, unsigned);
+    td_thr_state_e, int, sigset_t *, unsigned);
 
 /*
  * Iterate over a process's known synchronization objects.
diff --git a/usr/src/head/utmp.h b/usr/src/head/utmp.h
index d9b3c6f31a..dd7458fcc9 100644
--- a/usr/src/head/utmp.h
+++ b/usr/src/head/utmp.h
@@ -78,7 +78,7 @@ struct ut_exit_status {
  */
 struct utmp {
 	char ut_user[8];		/* User login name */
-	char ut_id[4]; 			/* /etc/inittab id(usually line #) */
+	char ut_id[4];			/* /etc/inittab id(usually line #) */
 	char ut_line[12];		/* device name (console, lnxx) */
 	short ut_pid;			/* short for compat. - process id */
 	short ut_type;			/* type of entry */
diff --git a/usr/src/head/xti.h b/usr/src/head/xti.h
index 43d408876d..0ce140dae4 100644
--- a/usr/src/head/xti.h
+++ b/usr/src/head/xti.h
@@ -140,7 +140,7 @@ extern int t_errno;
 #endif				/* Should be <= IOV_MAX */
 
 #ifndef _SC_T_IOV_MAX
-#define	_SC_T_IOV_MAX 	79	/* Should be same in <unistd.h> for use by */
+#define	_SC_T_IOV_MAX	79	/* Should be same in <unistd.h> for use by */
 #endif				/* sysconf() */
 
 struct t_iovec {
@@ -352,7 +352,7 @@ struct t_unitdata {
  */
 struct t_uderr {
 	struct netbuf	addr;		/* address		*/
-	struct netbuf	opt;		/* options 		*/
+	struct netbuf	opt;		/* options		*/
 	t_scalar_t	error;		/* error code		*/
 };
 
@@ -385,7 +385,7 @@ struct t_uderr {
 #define	T_UNINIT	0		/* uninitialized		*/
 #define	T_UNBND		1		/* unbound			*/
 #define	T_IDLE		2		/* idle				*/
-#define	T_OUTCON	3		/* outgoing connection pending 	*/
+#define	T_OUTCON	3		/* outgoing connection pending	*/
 #define	T_INCON		4		/* incoming connection pending	*/
 #define	T_DATAXFER	5		/* data transfer		*/
 #define	T_OUTREL	6		/* outgoing release pending	*/
@@ -443,7 +443,7 @@ struct t_uderr {
  *     Get aligned start of data part after option header
  *
  * struct t_opthdr *T_OPT_NEXTHDR(struct netbuf *nbp, struct t_opthdr *tohp):
- * 	Skip to next option header
+ *	Skip to next option header
  */
 
 #define	T_OPT_FIRSTHDR(nbp)    \