[illumos-gate merge]

commit 7f7cea96d5057c067c283bdd0a3bd608876b3d90
    12126 truss: passing argument 1 to restrict-qualified parameter aliases with argument 4
commit f772f0f818f73daf7235ea98001eb45736057eb4
    12121 prtconf: cast between incompatible function types
commit d9a262d9c411812b053dc33b7b8ab0f230c6fb00
    12123 sendmail: cast between incompatible function types
commit 698f4ab6008be205f4362675967638572eef4f21
    12128 error: this statement may fall through
commit d6beba26494f4877120c99b5931876f56ba5dee5
    12127 auditd: cast between incompatible function types
commit 0e540600911704593d2db2a54688b06c90621822
    12122 rcm_daemon: cast between incompatible function types
commit 45057a1a493b60c956248b11e538feed43fdc7b6
    12120 power: cast between incompatible function types
commit 37395faa43a95e030f79ca75d81f5e4fdfcd2b19
    12117 nscd: cast between incompatible function types
commit 491605205e9a54b9266d0b87e470e2dc83ca0d57
    12116 idmapd: cast between incompatible function types
commit 13539f0d8047e0522b1de032e340086de35f224e
    12113 mailx: cast between incompatible function types
commit 5b784b07fc13e535c4af29e1804b0c6fa58889bf
    12111 syseventd: cast between incompatible function types
commit 1146e6b36a51a32283a4cfc8530fd73b88b79a78
    12110 audio: control reaches end of non-void function
commit 6af7a37b52615421dd8d8af372794c3399825b45
    12108 libfakekernel: passing argument 4 to restrict-qualified parameter aliases with argument 3
commit 6aa760d176ff3ceaed1f2c3f6c2b45352b83e336
    12107 libdiskmgt: cast between incompatible function types
commit 2f0b63d22a9a05291df8f83619060f9805eb7581
    12104 libkdb_ldap: bitwise comparison always evaluates to false
commit ef2333d135d7eeabe888ac20be8a501a394db591
    12102 print: cast between incompatible function types
commit cc98049dd80db1f6cbe13cbd4845c7a4f0e0c863
    12101 libsldap: cast between incompatible function types

28 files changed, 244 insertions, 242 deletions

diff --git a/usr/src/cmd/audio/include/AudioFile.h b/usr/src/cmd/audio/include/AudioFile.h
index 508bafdbf5..549e4ded5e 100644
--- a/usr/src/cmd/audio/include/AudioFile.h
+++ b/usr/src/cmd/audio/include/AudioFile.h
@@ -27,8 +27,6 @@
 #ifndef _MULTIMEDIA_AUDIOFILE_H
 #define	_MULTIMEDIA_AUDIOFILE_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef NO_EXTERN_C
 
 #ifdef __cplusplus
@@ -55,9 +53,11 @@ public:
 	    { return (type); }
 	inline operator int() {				// Cast to integer
 	    switch (type) {
-	    case NormalAccess: return (MADV_NORMAL);
 	    case RandomAccess: return (MADV_RANDOM);
 	    case SequentialAccess: return (MADV_SEQUENTIAL);
+	    case NormalAccess:
+	    default:
+		return (MADV_NORMAL);
 	    }
 	}
 };
diff --git a/usr/src/cmd/audio/include/AudioTypes.h b/usr/src/cmd/audio/include/AudioTypes.h
index c924abf76c..1eb10d92c0 100644
--- a/usr/src/cmd/audio/include/AudioTypes.h
+++ b/usr/src/cmd/audio/include/AudioTypes.h
@@ -27,8 +27,6 @@
 #ifndef _MULTIMEDIA_AUDIOTYPES_H
 #define	_MULTIMEDIA_AUDIOTYPES_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef NO_EXTERN_C
 
 #ifdef __cplusplus
@@ -108,12 +106,14 @@ public:
 	    { return (mode); }
 	inline operator int() {				// Cast to integer
 	    switch (mode) {
-	    case NoAccess: return (-1);
 	    case ReadOnly: return (O_RDONLY);
 	    case WriteOnly: return (O_WRONLY);
 	    case ReadWrite: return (O_RDWR);
 	    case AppendOnly: return (O_WRONLY | O_APPEND);
 	    case ReadAppend: return (O_RDWR | O_APPEND);
+	    case NoAccess:
+	    default:
+		return (-1);
 	    }
 	}
 	// These tests depend on the actual enum values
diff --git a/usr/src/cmd/auditd/auditd.c b/usr/src/cmd/auditd/auditd.c
index 14b1e12b28..16d4bfe572 100644
--- a/usr/src/cmd/auditd/auditd.c
+++ b/usr/src/cmd/auditd/auditd.c
@@ -115,7 +115,7 @@ static int	reset_file = 1; /* 1 to close/open binary log */
 static int	auditing_set = 0;	/* 1 if auditon(A_SETCOND, on... */
 
 static void	my_sleep();
-static void	signal_thread();
+static void	*signal_thread(void *);
 static void	loadauditlist();
 static void	block_signals();
 static int	do_sethost();
@@ -262,8 +262,7 @@ main(int argc, char *argv[])
 	/*
 	 * Set up a separate thread for signal handling.
 	 */
-	if (pthread_create(&tid, NULL, (void *(*)(void *))signal_thread,
-	    NULL)) {
+	if (pthread_create(&tid, NULL, signal_thread, NULL)) {
 		(void) fprintf(stderr, gettext(
 		    "auditd can't create a thread\n"));
 		auditd_exit(1);
@@ -725,8 +724,8 @@ block_signals()
  * The thread is created with all signals blocked.
  */
 
-static void
-signal_thread()
+static void *
+signal_thread(void *arg __unused)
 {
 	sigset_t	set;
 	int		signal_caught;
@@ -766,6 +765,7 @@ signal_thread()
 		}
 		(void) pthread_cond_signal(&(main_thr.thd_cv));
 	}
+	return (NULL);
 }
 
 /*
@@ -819,11 +819,11 @@ fail:
 static void
 conf_to_kernel(void)
 {
-	register au_event_ent_t *evp;
-	register int 		i;
+	au_event_ent_t		*evp;
+	int			i;
 	char			*msg;
-	au_evclass_map_t 	ec;
-	au_stat_t 		as;
+	au_evclass_map_t	ec;
+	au_stat_t		as;
 
 	if (auditon(A_GETSTAT, (caddr_t)&as, 0) != 0) {
 		(void) asprintf(&msg, gettext("Audit module does not appear "
diff --git a/usr/src/cmd/auditd/doorway.c b/usr/src/cmd/auditd/doorway.c
index 325e3ee066..c3fe37afe6 100644
--- a/usr/src/cmd/auditd/doorway.c
+++ b/usr/src/cmd/auditd/doorway.c
@@ -102,7 +102,7 @@ static pthread_mutex_t	b_alloc_lock;
 static pthread_mutex_t	b_refcnt_lock;
 
 static void		input(void *, void *, int, door_desc_t *, int);
-static void		process(plugin_t *);
+static void		*process(void *);
 
 static audit_q_t	*qpool_withdraw(plugin_t *);
 static void		qpool_init(plugin_t *, int);
@@ -505,8 +505,7 @@ auditd_thread_init()
 			(void) pthread_cond_init(&(p->plg_cv), NULL);
 			p->plg_waiting = 0;
 
-			if (pthread_create(&(p->plg_tid), NULL,
-			    (void *(*)(void *))process, p)) {
+			if (pthread_create(&(p->plg_tid), NULL, process, p)) {
 				report_error(INTERNAL_SYS_ERROR,
 				    gettext("thread creation failed"),
 				    p->plg_path);
@@ -787,7 +786,7 @@ bpool_return(audit_rec_t *node)
 #if DEBUG
 	audit_rec_t	*copy = node;
 #endif
-	node = audit_release(&b_refcnt_lock, node); 	/* decrement ref cnt */
+	node = audit_release(&b_refcnt_lock, node);	/* decrement ref cnt */
 
 	if (node != NULL) {	/* NULL if ref cnt is not zero */
 		audit_enqueue(&b_pool, node);
@@ -1179,15 +1178,16 @@ input_exit:
 /*
  * process() -- pass a buffer to a plugin
  */
-static void
-process(plugin_t *p)
+static void *
+process(void *arg)
 {
+	plugin_t *p		= arg;
 	int			rc;
 	audit_rec_t		*b_node;
 	audit_q_t		*q_node;
 	auditd_rc_t		plugrc;
 	char			*error_string;
-	struct timespec 	delay;
+	struct timespec		delay;
 	int			sendsignal;
 	int			queue_len;
 	struct sched_param	param;
@@ -1314,4 +1314,5 @@ plugin_removed:
 	(void) pthread_mutex_lock(&plugin_mutex);
 	(void) unload_plugin(p);
 	(void) pthread_mutex_unlock(&plugin_mutex);
+	return (NULL);
 }
diff --git a/usr/src/cmd/idmap/idmapd/adutils.c b/usr/src/cmd/idmap/idmapd/adutils.c
index 96863bdea3..dc88fc7c92 100644
--- a/usr/src/cmd/idmap/idmapd/adutils.c
+++ b/usr/src/cmd/idmap/idmapd/adutils.c
@@ -130,8 +130,8 @@ static pthread_t	reaperid = 0;
  */
 /*ARGSUSED*/
 static
-void
-adreaper(void *arg)
+void *
+adreaper(void *arg __unused)
 {
 	timespec_t	ts;
 
@@ -146,6 +146,7 @@ adreaper(void *arg)
 		(void) nanosleep(&ts, NULL);
 		adutils_reap_idle_connections();
 	}
+	return (NULL);
 }
 
 /*
@@ -163,8 +164,7 @@ idmap_add_ds(adutils_ad_t *ad, const char *host, int port)
 
 	/* Start reaper if it doesn't exist */
 	if (ret == 0 && reaperid == 0)
-		(void) pthread_create(&reaperid, NULL,
-		    (void *(*)(void *))adreaper, (void *)NULL);
+		(void) pthread_create(&reaperid, NULL, adreaper, NULL);
 	return (ret);
 }
 
@@ -193,8 +193,8 @@ map_adrc2idmaprc(adutils_rc adrc)
 
 idmap_retcode
 idmap_lookup_batch_start(adutils_ad_t *ad, int nqueries,
-	int directory_based_mapping, const char *default_domain,
-	idmap_query_state_t **state)
+    int directory_based_mapping, const char *default_domain,
+    idmap_query_state_t **state)
 {
 	idmap_query_state_t	*new_state;
 	adutils_rc		rc;
@@ -232,7 +232,7 @@ idmap_lookup_batch_start(adutils_ad_t *ad, int nqueries,
  */
 void
 idmap_lookup_batch_set_unixattr(idmap_query_state_t *state,
-		const char *unixuser_attr, const char *unixgroup_attr)
+    const char *unixuser_attr, const char *unixgroup_attr)
 {
 	state->ad_unixuser_attr = unixuser_attr;
 	state->ad_unixgroup_attr = unixgroup_attr;
@@ -385,7 +385,7 @@ idmap_bv_objclass2sidtype(BerValue **bvalues, int *sid_type)
 static
 void
 idmap_extract_object(idmap_query_state_t *state, idmap_q_t *q,
-	LDAPMessage *res, LDAP *ld)
+    LDAPMessage *res, LDAP *ld)
 {
 	BerValue		**bvalues;
 	const char		*attr = NULL;
@@ -503,7 +503,7 @@ out:
 
 void
 idmap_ldap_res_search_cb(LDAP *ld, LDAPMessage **res, int rc, int qid,
-		void *argp)
+    void *argp)
 {
 	idmap_query_state_t	*state = (idmap_query_state_t *)argp;
 	idmap_q_t		*q = &(state->queries[qid]);
@@ -588,12 +588,12 @@ idmap_lookup_batch_end(idmap_query_state_t **state)
 static
 idmap_retcode
 idmap_batch_add1(idmap_query_state_t *state, const char *filter,
-	char *ecanonname, char *edomain, idmap_id_type esidtype,
-	char **dn, char **attr, char **value,
-	char **canonname, char **dname,
-	char **sid, rid_t *rid, idmap_id_type *sid_type, char **unixname,
-	posix_id_t *pid,
-	idmap_retcode *rc)
+    char *ecanonname, char *edomain, idmap_id_type esidtype,
+    char **dn, char **attr, char **value,
+    char **canonname, char **dname,
+    char **sid, rid_t *rid, idmap_id_type *sid_type, char **unixname,
+    posix_id_t *pid,
+    idmap_retcode *rc)
 {
 	adutils_rc	ad_rc;
 	int		qid, i;
@@ -695,11 +695,11 @@ idmap_batch_add1(idmap_query_state_t *state, const char *filter,
 
 idmap_retcode
 idmap_name2sid_batch_add1(idmap_query_state_t *state,
-	const char *name, const char *dname, idmap_id_type esidtype,
-	char **dn, char **attr, char **value,
-	char **canonname, char **sid, rid_t *rid,
-	idmap_id_type *sid_type, char **unixname,
-	posix_id_t *pid, idmap_retcode *rc)
+    const char *name, const char *dname, idmap_id_type esidtype,
+    char **dn, char **attr, char **value,
+    char **canonname, char **sid, rid_t *rid,
+    idmap_id_type *sid_type, char **unixname,
+    posix_id_t *pid, idmap_retcode *rc)
 {
 	idmap_retcode	retcode;
 	char		*filter, *s_name;
@@ -768,10 +768,10 @@ idmap_name2sid_batch_add1(idmap_query_state_t *state,
 
 idmap_retcode
 idmap_sid2name_batch_add1(idmap_query_state_t *state,
-	const char *sid, const rid_t *rid, idmap_id_type esidtype,
-	char **dn, char **attr, char **value,
-	char **name, char **dname, idmap_id_type *sid_type,
-	char **unixname, posix_id_t *pid, idmap_retcode *rc)
+    const char *sid, const rid_t *rid, idmap_id_type esidtype,
+    char **dn, char **attr, char **value,
+    char **name, char **dname, idmap_id_type *sid_type,
+    char **unixname, posix_id_t *pid, idmap_retcode *rc)
 {
 	idmap_retcode	retcode;
 	int		ret;
@@ -809,10 +809,10 @@ idmap_sid2name_batch_add1(idmap_query_state_t *state,
 
 idmap_retcode
 idmap_unixname2sid_batch_add1(idmap_query_state_t *state,
-	const char *unixname, int is_user, int is_wuser,
-	char **dn, char **attr, char **value,
-	char **sid, rid_t *rid, char **name,
-	char **dname, idmap_id_type *sid_type, idmap_retcode *rc)
+    const char *unixname, int is_user, int is_wuser,
+    char **dn, char **attr, char **value,
+    char **sid, rid_t *rid, char **name,
+    char **dname, idmap_id_type *sid_type, idmap_retcode *rc)
 {
 	idmap_retcode	retcode;
 	char		*filter, *s_unixname;
@@ -858,10 +858,10 @@ idmap_unixname2sid_batch_add1(idmap_query_state_t *state,
 
 idmap_retcode
 idmap_pid2sid_batch_add1(idmap_query_state_t *state,
-	posix_id_t pid, int is_user,
-	char **dn, char **attr, char **value,
-	char **sid, rid_t *rid, char **name,
-	char **dname, idmap_id_type *sid_type, idmap_retcode *rc)
+    posix_id_t pid, int is_user,
+    char **dn, char **attr, char **value,
+    char **sid, rid_t *rid, char **name,
+    char **dname, idmap_id_type *sid_type, idmap_retcode *rc)
 {
 	idmap_retcode	retcode;
 	char		*filter;
diff --git a/usr/src/cmd/mailx/cmdtab.c b/usr/src/cmd/mailx/cmdtab.c
index aa62dcb06a..89e484dcb4 100644
--- a/usr/src/cmd/mailx/cmdtab.c
+++ b/usr/src/cmd/mailx/cmdtab.c
@@ -20,7 +20,7 @@
  * CDDL HEADER END
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
-/*	  All Rights Reserved  	*/
+/*	  All Rights Reserved	*/
 
 /*
  * University Copyright- Copyright (c) 1982, 1986, 1988
@@ -32,8 +32,6 @@
  * contributors.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include "def.h"
 
 /*
@@ -51,7 +49,7 @@
  * command procedures to expect an argument of type void *,
  * the following cast "makes it all work".  Yes, it's ugly.
  */
-#define	C	(int (*)(void *))
+#define	C	(int (*)(void *))(uintptr_t)
 
 const struct cmd cmdtab[] = {
 	"next",		C next,		NDMLIST,	0,	MMNDEL,
@@ -67,7 +65,7 @@ const struct cmd cmdtab[] = {
 	"delete",	C delm,		W|P|MSGLIST,	0,	MMNDEL,
 	"dp",		C deltype,	W|MSGLIST,	0,	MMNDEL,
 	"dt",		C deltype,	W|MSGLIST,	0,	MMNDEL,
-	"undelete",	C undelete,	P|MSGLIST,	MDELETED,MMNDEL,
+	"undelete",	C undelete,	P|MSGLIST,	MDELETED, MMNDEL,
 	"unset",	C unset,	M|RAWLIST,	1,	1000,
 	"mail",		C sendm,	R|M|I|STRLIST,	0,	0,
 	"Mail",		C Sendm,	R|M|I|STRLIST,	0,	0,
@@ -114,7 +112,7 @@ const struct cmd cmdtab[] = {
 	"replysender",	C replysender,	R|I|MSGLIST,	0,	MMNDEL,
 	"edit",		C editor,	I|MSGLIST,	0,	MMNORM,
 	"echo",		C echo,		M|RAWLIST,	0,	1000,
-	"quit",		C edstop,	NOLIST, 	0,	0,
+	"quit",		C edstop,	NOLIST,		0,	0,
 	"list",		C pcmdlist,	M|NOLIST,	0,	0,
 	"load",		C loadmsg,	W|STRLIST,	0,	0,
 	"xit",		C rexit,	M|NOLIST,	0,	0,
diff --git a/usr/src/cmd/mailx/lex.c b/usr/src/cmd/mailx/lex.c
index 521e0f7b4c..737f3af535 100644
--- a/usr/src/cmd/mailx/lex.c
+++ b/usr/src/cmd/mailx/lex.c
@@ -98,7 +98,7 @@ setfile(char *name, int isedit)
 				fprintf(stderr, gettext("No mail.\n"));
 			else
 				fprintf(stderr, gettext("No mail for %s\n"),
-f+1);
+				    f+1);
 		}
 		goto doret;
 	}
@@ -109,7 +109,7 @@ f+1);
 		if (isedit)
 			if (stbuf.st_size == 0L)
 				fprintf(stderr, gettext("%s: empty file\n"),
-name);
+				    name);
 			else
 				fprintf(stderr,
 				    gettext("%s: not a regular file\n"), name);
@@ -118,7 +118,7 @@ name);
 				fprintf(stderr, gettext("No mail.\n"));
 			else
 				fprintf(stderr, gettext("No mail for %s\n"),
-strrchr(name, '/') + 1);
+				    strrchr(name, '/') + 1);
 		}
 		fclose(ibuf);
 		goto doret;
@@ -135,7 +135,7 @@ strrchr(name, '/') + 1);
 		if (exitflg)
 			goto doexit;	/* no mail, return error */
 		fprintf(stderr, gettext("Your mail is being forwarded to %s"),
-fortest+11);
+		    fortest+11);
 		fclose(ibuf);
 		goto doret;
 	}
@@ -197,7 +197,7 @@ fortest+11);
 #endif
 	mailsize = fsize(ibuf);
 	if ((fd = open(tempMesg, O_RDWR|O_CREAT|O_EXCL, 0600)) < 0 ||
-	(otf = fdopen(fd, "w")) == NULL) {
+	    (otf = fdopen(fd, "w")) == NULL) {
 		perror(tempMesg);
 		if (!edit && issysmbox)
 			Verhogen();
@@ -516,7 +516,7 @@ execute(char linebuf[], int contxt)
 	 * If we are in a source file, just unstack.
 	 */
 
-	if (com->c_func == (int (*)(void *))edstop) {
+	if ((uintptr_t)com->c_func == (uintptr_t)edstop) {
 		if (sourcing) {
 			if (loading)
 				return (1);
@@ -587,7 +587,7 @@ execute(char linebuf[], int contxt)
 				*msgvec = 0;
 			else {
 				*msgvec = first(com->c_msgflag,
-					com->c_msgmask);
+				    com->c_msgmask);
 				msgvec[1] = 0;
 			}
 		if (*msgvec == 0) {
@@ -628,7 +628,7 @@ execute(char linebuf[], int contxt)
 		 * A vector of strings, in shell style.
 		 */
 		if ((c = getrawlist(cp, arglist,
-				sizeof (arglist) / sizeof (*arglist))) < 0)
+		    sizeof (arglist) / sizeof (*arglist))) < 0)
 			break;
 		if (c < com->c_minargs) {
 			fprintf(stderr,
@@ -666,7 +666,7 @@ execute(char linebuf[], int contxt)
 		return (1);
 	if (e && sourcing)
 		unstack();
-	if (com->c_func == (int (*)(void *))edstop)
+	if ((uintptr_t)com->c_func == (uintptr_t)edstop)
 		return (1);
 	if (value("autoprint") != NOSTR && com->c_argtype & P)
 		if ((dot->m_flag & MDELETED) == 0) {
@@ -684,12 +684,7 @@ execute(char linebuf[], int contxt)
  * When we wake up after ^Z, reprint the prompt.
  */
 static void
-#ifdef	__cplusplus
-contin(int)
-#else
-/* ARGSUSED */
-contin(int s)
-#endif
+contin(int s __unused)
 {
 	if (shudprompt)
 		printf("%s", prompt);
@@ -701,12 +696,7 @@ contin(int s)
  * Branch here on hangup signal and simulate quit.
  */
 void
-#ifdef	__cplusplus
-hangup(int)
-#else
-/* ARGSUSED */
-hangup(int s)
-#endif
+hangup(int s __unused)
 {
 
 	holdsigs();
@@ -898,7 +888,7 @@ newfileinfo(int start)
 		nstrcat(fname, sizeof (fname), "/");
 		if (strncmp(fname, editfile, strlen(fname)) == 0) {
 			snprintf(zname, sizeof (zname),
-				"+%s", editfile + strlen(fname));
+			    "+%s", editfile + strlen(fname));
 			ename = zname;
 		}
 	}
@@ -926,12 +916,7 @@ newfileinfo(int start)
  */
 
 int
-#ifdef	__cplusplus
-pversion(char *)
-#else
-/* ARGSUSED */
-pversion(char *s)
-#endif
+pversion(char *s __unused)
 {
 	printf("%s\n", version);
 	return (0);
diff --git a/usr/src/cmd/nscd/cache.c b/usr/src/cmd/nscd/cache.c
index 1324295c9c..bc764e692a 100644
--- a/usr/src/cmd/nscd/cache.c
+++ b/usr/src/cmd/nscd/cache.c
@@ -85,7 +85,7 @@ static void queue_dump(nsc_db_t *, time_t);
 #endif	/* NSCD_DEBUG */
 
 static int launch_update(nsc_lookup_args_t *);
-static void do_update(nsc_lookup_args_t *);
+static void *do_update(void *);
 static void getxy_keepalive(nsc_ctx_t *, nsc_db_t *, int, int);
 
 static void ctx_info(nsc_ctx_t *);
@@ -107,8 +107,8 @@ static uint_t nsc_db_int_key_gethash(nss_XbyY_key_t *, int);
 static umem_cache_t	*nsc_entry_cache;
 
 static nsc_ctx_t *init_cache_ctx(int);
-static void reaper(nsc_ctx_t *);
-static void revalidate(nsc_ctx_t *);
+static void *reaper(void *);
+static void *revalidate(void *);
 
 static nss_status_t
 dup_packed_buffer(void *src, void *dst)
@@ -1160,8 +1160,7 @@ start_threads(nsc_ctx_t *ctx)
 	 *  kick off the revalidate thread (if necessary)
 	 */
 	if (ctx->revalidate_on != nscd_true) {
-		if (thr_create(NULL, 0, (void *(*)(void *))revalidate,
-		    ctx, 0, NULL) != 0) {
+		if (thr_create(NULL, 0, revalidate, ctx, 0, NULL) != 0) {
 			errnum = errno;
 			_NSCD_LOG(NSCD_LOG_CACHE, NSCD_LOG_LEVEL_ERROR)
 			(me, "thr_create (revalidate thread for %s): %s\n",
@@ -1175,8 +1174,7 @@ start_threads(nsc_ctx_t *ctx)
 	 *  kick off the reaper thread (if necessary)
 	 */
 	if (ctx->reaper_on != nscd_true) {
-		if (thr_create(NULL, 0, (void *(*)(void *))reaper,
-		    ctx, 0, NULL) != 0) {
+		if (thr_create(NULL, 0, reaper, ctx, 0, NULL) != 0) {
 			errnum = errno;
 			_NSCD_LOG(NSCD_LOG_CACHE, NSCD_LOG_LEVEL_ERROR)
 			(me, "thr_create (reaper thread for %s): %s\n",
@@ -1843,9 +1841,11 @@ init_cache_ctx(int i)
 }
 
 
-static void
-revalidate(nsc_ctx_t *ctx)
+static void *
+revalidate(void *arg)
 {
+	nsc_ctx_t *ctx = arg;
+
 	(void) thr_setname(thr_self(), "revalidate");
 
 	for (;;) {
@@ -1871,6 +1871,7 @@ revalidate(nsc_ctx_t *ctx)
 			(void) sleep(slp);
 		}
 	}
+	return (NULL);
 }
 
 
@@ -1976,8 +1977,7 @@ launch_update(nsc_lookup_args_t *in)
 	char	*me = "launch_update";
 	int	errnum;
 
-	errnum = thr_create(NULL, 0, (void *(*)(void*))do_update,
-	    in, 0|THR_DETACHED, NULL);
+	errnum = thr_create(NULL, 0, do_update, in, 0|THR_DETACHED, NULL);
 	if (errnum != 0) {
 		_NSCD_LOG(NSCD_LOG_CACHE, NSCD_LOG_LEVEL_ERROR)
 		(me, "%s: thread creation failure (%d)\n",
@@ -1988,9 +1988,10 @@ launch_update(nsc_lookup_args_t *in)
 }
 
 
-static void
-do_update(nsc_lookup_args_t *in)
+static void *
+do_update(void *arg)
 {
+	nsc_lookup_args_t *in = arg;
 	nss_pheader_t	*phdr = (nss_pheader_t *)in->buffer;
 
 	(void) thr_setname(thr_self(), "do_update");
@@ -2002,6 +2003,7 @@ do_update(nsc_lookup_args_t *in)
 	if (in->buffer)
 		free(in->buffer);
 	free(in);
+	return (NULL);
 }
 
 
@@ -2217,9 +2219,10 @@ lookup_cache(nsc_lookup_args_t *largs, nscd_cfg_cache_t *cfgp,
 	return (NSCD_SUCCESS);
 }
 
-static void
-reaper(nsc_ctx_t *ctx)
+static void *
+reaper(void *arg)
 {
+	nsc_ctx_t	*ctx = arg;
 	uint_t		ttl, extra_sleep, total_sleep, intervals;
 	uint_t		nodes_per_interval, seconds_per_interval;
 	ulong_t		nsc_entries;
@@ -2282,6 +2285,7 @@ reaper(nsc_ctx_t *ctx)
 		if (extra_sleep > 0)
 			(void) sleep(extra_sleep);
 	}
+	return (NULL);
 }
 
 
diff --git a/usr/src/cmd/power/powerd.c b/usr/src/cmd/power/powerd.c
index 185d7caf3c..0e4f1765ff 100644
--- a/usr/src/cmd/power/powerd.c
+++ b/usr/src/cmd/power/powerd.c
@@ -149,13 +149,13 @@ static void set_alarm(time_t);
 static int poweroff(const char *, char **);
 static int is_ok2shutdown(time_t *);
 static int get_prom(int, prom_node_t, char *, char *, size_t);
-static void power_button_monitor(void *);
+static void *power_button_monitor(void *);
 static int open_pidfile(char *);
 static int write_pidfile(int, pid_t);
 static int read_cpr_config(void);
-static void system_activity_monitor(void);
+static void *system_activity_monitor(void *);
 #ifdef __x86
-static void autos3_monitor(void);
+static void *autos3_monitor(void *);
 #endif
 static void do_attach(void);
 static void *attach_devices(void *);
@@ -308,8 +308,7 @@ main(int argc, char *argv[])
 	if ((pb_fd = open(PB, O_RDONLY)) != -1) {
 		if (powerd_debug)
 			logerror("powerd starting power button monitor.");
-		if (thr_create(NULL, 0,
-		    (void *(*)(void *))power_button_monitor, NULL,
+		if (thr_create(NULL, 0, power_button_monitor, NULL,
 		    THR_DAEMON, NULL) != 0) {
 			logerror("Unable to monitor system's power button.");
 		}
@@ -323,8 +322,7 @@ main(int argc, char *argv[])
 	 */
 	if (powerd_debug)
 		logerror("powerd starting system activity monitor.");
-	if (thr_create(NULL, 0,
-	    (void *(*)(void *))system_activity_monitor, NULL,
+	if (thr_create(NULL, 0, system_activity_monitor, NULL,
 	    THR_DAEMON, NULL) != 0) {
 		logerror("Unable to create thread to monitor system activity.");
 	}
@@ -335,8 +333,8 @@ main(int argc, char *argv[])
 	 */
 	if (powerd_debug)
 		logerror("powerd starting autos3 monitor.");
-	if (thr_create(NULL, 0,
-	    (void *(*)(void *))autos3_monitor, NULL, THR_DAEMON, NULL) != 0) {
+	if (thr_create(NULL, 0, autos3_monitor, NULL, THR_DAEMON,
+	    NULL) != 0) {
 		logerror("Unable to create thread to monitor autos3 activity.");
 	}
 #endif
@@ -349,8 +347,8 @@ main(int argc, char *argv[])
 	return (1);
 }
 
-static void
-system_activity_monitor(void)
+static void *
+system_activity_monitor(void *arg __unused)
 {
 	struct sigaction act;
 	sigset_t sigmask;
@@ -392,11 +390,12 @@ system_activity_monitor(void)
 	do {
 		(void) sigsuspend(&sigmask);
 	} while (errno == EINTR);
+	return (NULL);
 }
 
 #ifdef __x86
-static void
-autos3_monitor(void)
+static void *
+autos3_monitor(void *arg __unused)
 {
 	struct pollfd poll_fd;
 	srn_event_info_t srn_event;		/* contains suspend type */
@@ -454,6 +453,7 @@ autos3_monitor(void)
 		(void) poweroff("AutoS3", autoS3_cmd);
 		continue;
 	}
+	return (NULL);
 }
 #endif
 
@@ -1169,7 +1169,7 @@ get_prom(int prom_fd, prom_node_t node_name,
 #define	iseol(ch)	((ch) == '\n' || (ch) == '\r' || (ch) == '\f')
 
 /*ARGSUSED*/
-static void
+static void *
 power_button_monitor(void *arg)
 {
 	struct pollfd pfd;
@@ -1228,6 +1228,7 @@ power_button_monitor(void *arg)
 			thr_exit((void *) 0);
 		}
 	}
+	return (NULL);
 }
 
 static void
diff --git a/usr/src/cmd/prtconf/pdevinfo.c b/usr/src/cmd/prtconf/pdevinfo.c
index a187d25eca..c8b26b61b2 100644
--- a/usr/src/cmd/prtconf/pdevinfo.c
+++ b/usr/src/cmd/prtconf/pdevinfo.c
@@ -102,7 +102,7 @@ typedef struct dumpops {
 typedef struct di_args {
 	di_prom_handle_t	prom_hdl;
 	di_devlink_handle_t	devlink_hdl;
-	pcidb_hdl_t 		*pcidb_hdl;
+	pcidb_hdl_t		*pcidb_hdl;
 } di_arg_t;
 
 static const dumpops_t sysprop_dumpops = {
@@ -162,7 +162,8 @@ static int unprintable(char *, int);
 static int promopen(int);
 static void promclose();
 static di_node_t find_target_node(di_node_t);
-static void node_display_set(di_node_t);
+static void node_display_private_set(di_node_t);
+static int node_display_set(di_node_t, void *);
 static int dump_pciid(char *, int, di_node_t, pcidb_hdl_t *);
 
 void
@@ -266,7 +267,7 @@ prtconf_devinfo(void)
 		}
 
 		/* mark the target node so we display it */
-		node_display_set(target_node);
+		node_display_private_set(target_node);
 
 		if (opts.o_ancestors) {
 			/*
@@ -275,7 +276,7 @@ prtconf_devinfo(void)
 			 */
 			node = target_node;
 			while (node = di_parent_node(node))
-				node_display_set(node);
+				node_display_private_set(node);
 		} else {
 			/*
 			 * when we display device tree nodes the indentation
@@ -298,9 +299,7 @@ prtconf_devinfo(void)
 			 * them as well
 			 */
 			(void) di_walk_node(target_node, DI_WALK_CLDFIRST,
-			    (void *)1,
-			    (int (*)(di_node_t, void *))
-			    node_display_set);
+			    (void *)1, node_display_set);
 		}
 	}
 
@@ -381,13 +380,20 @@ node_display(di_node_t node)
 }
 
 static void
-node_display_set(di_node_t node)
+node_display_private_set(di_node_t node)
 {
 	long data = (long)di_node_private_get(node);
 	data |= NODE_DISPLAY;
 	di_node_private_set(node, (void *)data);
 }
 
+static int
+node_display_set(di_node_t node, void *arg __unused)
+{
+	node_display_private_set(node);
+	return (0);
+}
+
 #define	LNODE_DISPLAYED		(1<<0)
 
 static long
diff --git a/usr/src/cmd/rcm_daemon/common/rcm_subr.c b/usr/src/cmd/rcm_daemon/common/rcm_subr.c
index 4c150f3205..0523f98f74 100644
--- a/usr/src/cmd/rcm_daemon/common/rcm_subr.c
+++ b/usr/src/cmd/rcm_daemon/common/rcm_subr.c
@@ -1705,8 +1705,8 @@ clean_rsrc_tree()
 	rsrc_walk(rsrc_root, NULL, clean_node);
 }
 
-static void
-db_clean()
+static void *
+db_clean(void *arg __unused)
 {
 	extern barrier_t barrier;
 	extern void clean_dr_list();
@@ -1740,16 +1740,16 @@ db_clean()
 
 		rcmd_set_state(RCMD_NORMAL);
 	}
+	return (NULL);
 }
 
 void
-rcmd_db_clean()
+rcmd_db_clean(void)
 {
 	rcm_log_message(RCM_DEBUG,
 	    "rcm_db_clean(): launch thread to clean database\n");
 
-	if (thr_create(NULL, 0, (void *(*)(void *))db_clean,
-	    NULL, THR_DETACHED, NULL) != 0) {
+	if (thr_create(NULL, 0, db_clean, NULL, THR_DETACHED, NULL) != 0) {
 		rcm_log_message(RCM_WARNING,
 		    gettext("failed to create cleanup thread %s\n"),
 		    strerror(errno));
diff --git a/usr/src/cmd/sendmail/libsm/signal.c b/usr/src/cmd/sendmail/libsm/signal.c
index 3361ad22e8..0a272e14b1 100644
--- a/usr/src/cmd/sendmail/libsm/signal.c
+++ b/usr/src/cmd/sendmail/libsm/signal.c
@@ -7,8 +7,6 @@
  * the sendmail distribution.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sm/gen.h>
 SM_RCSID("@(#)$Id: signal.c,v 1.17 2005/06/14 23:07:20 ca Exp $")
 
@@ -54,7 +52,7 @@ sm_signal(sig, handler)
 # ifdef SA_RESTART
 	(void) memset(&n, '\0', sizeof n);
 #  if USE_SA_SIGACTION
-	n.sa_sigaction = (void(*)(int, siginfo_t *, void *)) handler;
+	n.sa_sigaction = (void(*)(int, siginfo_t *, void *))(uintptr_t) handler;
 	n.sa_flags = SA_RESTART|SA_SIGINFO;
 #  else /* USE_SA_SIGACTION */
 	n.sa_handler = handler;
diff --git a/usr/src/cmd/sgs/error/common/errortouch.c b/usr/src/cmd/sgs/error/common/errortouch.c
index dffe715fd5..6773fc0476 100644
--- a/usr/src/cmd/sgs/error/common/errortouch.c
+++ b/usr/src/cmd/sgs/error/common/errortouch.c
@@ -677,6 +677,7 @@ mustwrite(char *base, int n, FILE *preciousfile)
 			return (0);
 		case Q_NO:
 		case Q_no:
+		default:
 			(void) mustwrite(base + nwrote, n - nwrote,
 			    preciousfile);
 			return (1);
diff --git a/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c b/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c
index ccabc81635..6e1ab23e1d 100644
--- a/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c
+++ b/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c
@@ -260,8 +260,8 @@ sigusr1(int sig)
 	syseventd_exit(0);
 }
 
-static void
-sigwait_thr()
+static void *
+sigwait_thr(void *arg __unused)
 {
 	int	sig;
 	int	err;
@@ -284,7 +284,7 @@ sigwait_thr()
 			flt_handler(sig);
 		}
 	}
-	/* NOTREACHED */
+	return (NULL);
 }
 
 static void
@@ -465,8 +465,7 @@ main(int argc, char **argv)
 		syseventd_exit(2);
 	}
 	/* Create signal catching thread */
-	if (thr_create(NULL, 0, (void *(*)(void *))sigwait_thr,
-	    NULL, 0, NULL) < 0) {
+	if (thr_create(NULL, 0, sigwait_thr, NULL, 0, NULL) < 0) {
 		syseventd_err_print(INIT_THR_CREATE_ERR, strerror(errno));
 		syseventd_exit(2);
 	}
@@ -665,7 +664,7 @@ drain_eventq(struct sysevent_client *scp, int status)
  *				This thread will process any events on this
  *				client's eventq.
  */
-static void
+static void *
 client_deliver_event_thr(void *arg)
 {
 	int flag, error, i;
@@ -692,7 +691,7 @@ client_deliver_event_thr(void *arg)
 				    "exiting flags: 0X%x\n",
 				    scp->client_num, scp->client_flags);
 				(void) mutex_unlock(&scp->client_lock);
-				return;
+				return (NULL);
 			}
 
 			(void) cond_wait(&scp->client_cv, &scp->client_lock);
@@ -770,7 +769,7 @@ client_deliver_event_thr(void *arg)
 					 */
 					drain_eventq(scp, EINVAL);
 					(void) mutex_unlock(&scp->client_lock);
-					return;
+					return (NULL);
 				}
 
 				/* Event delivery retry requested */
@@ -796,7 +795,7 @@ client_deliver_event_thr(void *arg)
 		/* Return if this was a synchronous delivery */
 		if (!SE_CLIENT_IS_THR_RUNNING(scp)) {
 			(void) mutex_unlock(&scp->client_lock);
-			return;
+			return (NULL);
 		}
 
 	}
@@ -1328,9 +1327,8 @@ load_modules(char *dirname)
 		scp = sysevent_client_tbl[client_id];
 		++concurrency_level;
 		(void) thr_setconcurrency(concurrency_level);
-		if (thr_create(NULL, 0,
-		    (void *(*)(void *))client_deliver_event_thr,
-		    (void *)scp, THR_BOUND, &scp->tid) != 0) {
+		if (thr_create(NULL, 0, client_deliver_event_thr,
+		    scp, THR_BOUND, &scp->tid) != 0) {
 
 			syseventd_err_print(LOAD_MOD_ALLOC_ERR, "insert_client",
 			    strerror(errno));
diff --git a/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c b/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c
index 0ec386dca6..02409bcd11 100644
--- a/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c
+++ b/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c
@@ -211,8 +211,8 @@ devfsadmdeliver_event(sysevent_t *ev, int flag)
 static int cleanup;
 thread_t deliver_thr_id;
 
-void
-devfsadmd_deliver_thr()
+void *
+devfsadmd_deliver_thr(void *arg __unused)
 {
 	int retry = 0;
 	int msg_emitted = 0;
@@ -225,7 +225,7 @@ devfsadmd_deliver_thr()
 			if (cleanup && eventq_head == NULL) {
 				(void) cond_signal(&evq_cv);
 				(void) mutex_unlock(&evq_lock);
-				return;
+				return (NULL);
 			}
 		}
 
@@ -284,7 +284,7 @@ devfsadmd_deliver_thr()
 		if (cleanup) {
 			(void) cond_signal(&evq_cv);
 			(void) mutex_unlock(&evq_lock);
-			return;
+			return (NULL);
 		}
 	}
 
@@ -333,7 +333,7 @@ slm_init()
 	(void) mutex_init(&evq_lock, USYNC_THREAD, NULL);
 	(void) cond_init(&evq_cv, USYNC_THREAD, NULL);
 
-	if (thr_create(NULL, 0, (void *(*)(void *))devfsadmd_deliver_thr,
+	if (thr_create(NULL, 0, devfsadmd_deliver_thr,
 	    NULL, THR_BOUND, &deliver_thr_id) != 0) {
 		(void) mutex_destroy(&evq_lock);
 		(void) cond_destroy(&evq_cv);
diff --git a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
index eae8050d41..7f04ac17c9 100644
--- a/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
+++ b/usr/src/cmd/syseventd/modules/sysevent_conf_mod/sysevent_conf_mod.c
@@ -1953,8 +1953,8 @@ transport_queued_events()
 }
 
 
-static void
-queue_flush_thr()
+static void *
+queue_flush_thr(void *arg __unused)
 {
 	int	n;
 
@@ -2207,7 +2207,7 @@ slm_init()
 	/*
 	 * Create thread to flush cmd queue
 	 */
-	if ((err = thr_create(NULL, 0, (void *(*)(void*))queue_flush_thr,
+	if ((err = thr_create(NULL, 0, queue_flush_thr,
 	    NULL, 0, &cmdq_thr_id)) != 0) {
 		syslog(LOG_ERR, THR_CREATE_ERR, strerror(err));
 		sysevent_close_channel(confd_handle);
diff --git a/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c b/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c
index b8492764b4..dde27cd5f1 100644
--- a/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c
+++ b/usr/src/cmd/syseventd/modules/sysevent_reg_mod/sysevent_reg_mod.c
@@ -174,8 +174,8 @@ deliver_event(sysevent_t *ev, int flag)
 	return (0);
 }
 
-void
-subscriber_deliver_thr()
+void *
+subscriber_deliver_thr(void *arg __unused)
 {
 	ev_queue_t *evqp;
 
diff --git a/usr/src/cmd/truss/print.c b/usr/src/cmd/truss/print.c
index 06a6202e24..b0cf21d346 100644
--- a/usr/src/cmd/truss/print.c
+++ b/usr/src/cmd/truss/print.c
@@ -1610,6 +1610,8 @@ prt_pc5(private_t *pri, int raw, long val)
 void
 prt_psflags(private_t *pri, secflagset_t val)
 {
+	size_t len;
+	char *ptr;
 	char str[1024];
 
 	if (val == 0) {
@@ -1633,9 +1635,9 @@ prt_psflags(private_t *pri, secflagset_t val)
 		secflag_clear(&val, PROC_SEC_NOEXECSTACK);
 	}
 
-	if (val != 0)
-		(void) snprintf(str, sizeof (str), "%s|%#x", str, val);
-
+	len = strlen(str);
+	ptr = str + len;
+	(void) snprintf(ptr, sizeof (str) - len, "|%#x", val);
 	outstring(pri, str + 1);
 }
 
diff --git a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
index 6e498a62ac..ec6f991429 100644
--- a/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
+++ b/usr/src/lib/krb5/plugins/kdb/ldap/libkdb_ldap/ldap_misc.c
@@ -516,7 +516,7 @@ krb5_get_subtree_info(ldap_context, subtreearr, ntree)
     char                        **subtree=NULL, *realm_cont_dn=NULL;
     char                        **subtarr=NULL;
     char                        *containerref=NULL;
-    char 			**newsubtree=NULL;
+    char			**newsubtree=NULL;
 
     containerref = ldap_context->lrparams->containerref;
     subtree = ldap_context->lrparams->subtree;
@@ -2230,7 +2230,7 @@ populate_krb5_db_entry (krb5_context context,
 	    if ((st=krb5_dbe_lookup_last_pwd_change(context, entry, &last_pw_changed)) != 0)
 		goto cleanup;
 
-	    if ((mask & KDB_PWD_EXPIRE_TIME_ATTR) == 1) {
+	    if ((mask & KDB_PWD_EXPIRE_TIME_ATTR) == KDB_PWD_EXPIRE_TIME_ATTR) {
 		if ((last_pw_changed + pw_max_life) < entry->pw_expiration)
 		    entry->pw_expiration = last_pw_changed + pw_max_life;
 	    } else
diff --git a/usr/src/lib/libdiskmgt/common/events.c b/usr/src/lib/libdiskmgt/common/events.c
index 6874000bea..f401871e0a 100644
--- a/usr/src/lib/libdiskmgt/common/events.c
+++ b/usr/src/lib/libdiskmgt/common/events.c
@@ -89,11 +89,11 @@ static int			events_pending = 0;
 static int			sendevents = 0;
 
 static void		add_event_to_queue(nvlist_t *event);
-static void		cb_watch_events();
+static void		*cb_watch_events(void *);
 static void		event_handler(sysevent_t *ev);
 static void		print_nvlist(char *prefix, nvlist_t *list);
-static void		walk_devtree();
-static void		walker(void *arg);
+static void		walk_devtree(void);
+static void		*walker(void *arg);
 
 static void(*callback)(nvlist_t *, int) = NULL;
 
@@ -184,9 +184,8 @@ dm_init_event_queue(void (*cb)(nvlist_t *, int), int *errp)
 		    /* installing a cb; we didn't have one before */
 		    thread_t watch_thread;
 
-		    *errp = thr_create(NULL, 0,
-			(void *(*)(void *))cb_watch_events, NULL, THR_DAEMON,
-			&watch_thread);
+		    *errp = thr_create(NULL, 0, cb_watch_events, NULL,
+			THR_DAEMON, &watch_thread);
 		}
 	    }
 
@@ -204,8 +203,7 @@ dm_init_event_queue(void (*cb)(nvlist_t *, int), int *errp)
 
 		callback = cb;
 
-		*errp = thr_create(NULL, 0,
-		    (void *(*)(void *))cb_watch_events, NULL, THR_DAEMON,
+		*errp = thr_create(NULL, 0, cb_watch_events, NULL, THR_DAEMON,
 		    &watch_thread);
 	    }
 	}
@@ -344,8 +342,8 @@ add_event_to_queue(nvlist_t *event)
 	(void) sema_post(&semaphore);
 }
 
-static void
-cb_watch_events()
+static void *
+cb_watch_events(void *arg __unused)
 {
 	nvlist_t	*event;
 	int		error;
@@ -355,7 +353,7 @@ cb_watch_events()
 	    event = dm_get_event(&error);
 	    if (callback == NULL) {
 		/* end the thread */
-		return;
+		return (NULL);
 	    }
 	    callback(event, error);
 	}
@@ -474,7 +472,7 @@ print_nvlist(char *prefix, nvlist_t *list)
  * drive.
  */
 static void
-walk_devtree()
+walk_devtree(void)
 {
 	thread_t	walk_thread;
 
@@ -482,7 +480,7 @@ walk_devtree()
 
 	switch (walker_state) {
 	case WALK_NONE:
-	    if (thr_create(NULL, 0, (void *(*)(void *))walker, NULL,
+	    if (thr_create(NULL, 0, walker, NULL,
 		THR_DAEMON, &walk_thread) == 0) {
 		walker_state = WALK_WAITING;
 	    }
@@ -500,9 +498,8 @@ walk_devtree()
 	mutex_exit(&walker_lock);
 }
 
-/*ARGSUSED*/
-static void
-walker(void *arg)
+static void *
+walker(void *arg __unused)
 {
 	int	walk_again = 0;
 
@@ -515,7 +512,7 @@ walker(void *arg)
 		walker_state = WALK_NONE;
 		(void) cond_broadcast(&walker_cv);
 		mutex_exit(&walker_lock);
-		return;
+		return (NULL);
 	    }
 	    walker_state = WALK_RUNNING;
 	    mutex_exit(&walker_lock);
@@ -527,7 +524,7 @@ walker(void *arg)
 		walker_state = WALK_NONE;
 		(void) cond_broadcast(&walker_cv);
 		mutex_exit(&walker_lock);
-		return;
+		return (NULL);
 	    }
 
 	    if (events_pending) {
@@ -542,4 +539,5 @@ walker(void *arg)
 	    mutex_exit(&walker_lock);
 
 	} while (walk_again);
+	return (NULL);
 }
diff --git a/usr/src/lib/libdiskmgt/common/inuse_mnt.c b/usr/src/lib/libdiskmgt/common/inuse_mnt.c
index a0c921c9a7..f1defae277 100644
--- a/usr/src/lib/libdiskmgt/common/inuse_mnt.c
+++ b/usr/src/lib/libdiskmgt/common/inuse_mnt.c
@@ -63,7 +63,7 @@ static void		free_mnttab(struct mntpnt_list *listp);
 static boolean_t	in_list(struct mntpnt_list *elementp,
 			    struct mntpnt_list *listp);
 static int		load_mnttab(int send_event);
-static void		watch_mnttab();
+static void		*watch_mnttab(void *);
 
 /*
  * Search the list of devices from /etc/mnttab to find the mount point
@@ -89,7 +89,7 @@ inuse_mnt(char *slice, nvlist_t *attrs, int *errp)
 
 	    if (*errp == 0) {
 		/* start a thread to monitor the mnttab */
-		*errp = thr_create(NULL, 0, (void *(*)(void *))watch_mnttab,
+		*errp = thr_create(NULL, 0, watch_mnttab,
 		    NULL, THR_NEW_LWP | THR_DAEMON, &mnttab_thread);
 	    }
 
@@ -357,8 +357,8 @@ load_mnttab(int send_event)
  * that would cause us to flush and reload the cache of mnt entries.  Only
  * changes to /dev devices will cause the cache to be flushed and reloaded.
  */
-static void
-watch_mnttab()
+static void *
+watch_mnttab(void *arg __unused)
 {
 	struct pollfd fds[1];
 	int res;
@@ -382,4 +382,5 @@ watch_mnttab()
 		(void) lseek(fds[0].fd, 0, SEEK_SET);
 	    }
 	}
+	return (NULL);
 }
diff --git a/usr/src/lib/libfakekernel/common/callout.c b/usr/src/lib/libfakekernel/common/callout.c
index 24bb41cdff..b2e5048bab 100644
--- a/usr/src/lib/libfakekernel/common/callout.c
+++ b/usr/src/lib/libfakekernel/common/callout.c
@@ -66,7 +66,7 @@ timeout(void (*func)(void *), void *arg, clock_t delta)
 clock_t
 untimeout(timeout_id_t id_arg)
 {
-	struct itimerspec its;
+	struct itimerspec its, oits;
 	char *id_cp = id_arg;
 	clock_t delta;
 	timer_t tid;
@@ -79,11 +79,12 @@ untimeout(timeout_id_t id_arg)
 	tid = (int)(id_cp - timeout_base);
 
 	bzero(&its, sizeof (its));
-	rc = timer_settime(tid, 0, &its, &its);
+	bzero(&oits, sizeof (oits));
+	rc = timer_settime(tid, 0, &its, &oits);
 	if (rc != 0) {
 		delta = 0;
 	} else {
-		delta = TIMESTRUC_TO_TICK(&its.it_value);
+		delta = TIMESTRUC_TO_TICK(&oits.it_value);
 		if (delta < 0)
 			delta = 0;
 	}
diff --git a/usr/src/lib/libsldap/common/ns_connmgmt.c b/usr/src/lib/libsldap/common/ns_connmgmt.c
index c7aaf342c6..16ab0d4fe8 100644
--- a/usr/src/lib/libsldap/common/ns_connmgmt.c
+++ b/usr/src/lib/libsldap/common/ns_connmgmt.c
@@ -137,7 +137,8 @@ static struct ldap_error ldap_error_NULL = { LDAP_SUCCESS, NULL, NULL};
 
 /* destructor: free the ldap error data in the thread specific area */
 static void
-ns_mtckey_cleanup(void *key) {
+ns_mtckey_cleanup(void *key)
+{
 	struct ldap_error *le = (struct ldap_error *)key;
 
 	if (le == NULL)
@@ -153,7 +154,8 @@ ns_mtckey_cleanup(void *key) {
 
 /* Free/detach the thread specific data structures */
 static void
-conn_tsd_free() {
+conn_tsd_free(void)
+{
 	void	*tsd = NULL;
 	int	rc;
 
@@ -312,6 +314,12 @@ get_errno(void)
 	return (errno);
 }
 
+static void *
+ltf_threadid(void)
+{
+	return ((void *)(uintptr_t)thr_self());
+}
+
 /* set up an ldap session 'ld' for sharing among multiple threads */
 static int
 setup_mt_conn(LDAP *ld)
@@ -352,7 +360,7 @@ setup_mt_conn(LDAP *ld)
 	 */
 	(void) memset(&extrafns, '\0',
 	    sizeof (struct ldap_extra_thread_fns));
-	extrafns.ltf_threadid_fn = (void * (*)(void))thr_self;
+	extrafns.ltf_threadid_fn = ltf_threadid;
 	extrafns.ltf_mutex_trylock = NULL;
 	extrafns.ltf_sema_alloc = NULL;
 	extrafns.ltf_sema_free = NULL;
@@ -1078,7 +1086,7 @@ del_cm4cmg(ns_conn_mt_t *cm, ns_conn_mgmt_t *cmg)
  */
 static boolean_t
 is_server_cred_matched(const char *server, const ns_cred_t *cred,
-	ns_conn_mt_t *cm)
+    ns_conn_mt_t *cm)
 {
 	Connection	*cp = cm->conn;
 
@@ -1148,7 +1156,8 @@ wait_for_conn_mt(ns_conn_user_t *cu, ns_conn_mt_t *cm)
  */
 static boolean_t
 check_and_close_conn(ns_conn_mgmt_t *cmg, ns_conn_mt_t **cm,
-	ns_conn_user_t *cu) {
+    ns_conn_user_t *cu)
+{
 
 	int rc;
 	int j;
@@ -1265,8 +1274,8 @@ check_and_close_conn(ns_conn_mgmt_t *cmg, ns_conn_mt_t **cm,
  */
 static boolean_t
 match_conn_mt(ns_conn_user_t *cu, ns_conn_mt_t **cmt,
-	ns_conn_mt_state_t st, const char *server,
-	const ns_cred_t *cred)
+    ns_conn_mt_state_t st, const char *server,
+    const ns_cred_t *cred)
 {
 	boolean_t	matched = B_FALSE;
 	boolean_t	drop_conn;
@@ -1379,7 +1388,7 @@ match_conn_mt(ns_conn_user_t *cu, ns_conn_mt_t **cmt,
  */
 int
 __s_api_conn_mt_get(const char *server, const int flags, const ns_cred_t *cred,
-	Connection **session, ns_ldap_error_t **errorp, ns_conn_user_t *cu)
+    Connection **session, ns_ldap_error_t **errorp, ns_conn_user_t *cu)
 {
 	int		rc;
 	int		i;
@@ -1631,7 +1640,8 @@ __s_api_conn_mt_return(ns_conn_user_t *cu)
 
 /* save error info (rc and ns_ldap_error_t) in the conn_mt */
 static void
-err2cm(ns_conn_mt_t *cm, int rc, ns_ldap_error_t **errorp) {
+err2cm(ns_conn_mt_t *cm, int rc, ns_ldap_error_t **errorp)
+{
 	ns_ldap_error_t	*ep;
 
 	cm->ns_rc = rc;
@@ -1647,7 +1657,8 @@ err2cm(ns_conn_mt_t *cm, int rc, ns_ldap_error_t **errorp) {
 
 /* copy error info (rc and ns_ldap_error_t) from conn_mt to conn_user */
 static void
-err_from_cm(ns_conn_user_t *cu, ns_conn_mt_t *cm) {
+err_from_cm(ns_conn_user_t *cu, ns_conn_mt_t *cm)
+{
 	ns_ldap_error_t	*ep;
 
 	cu->ns_rc = cm->ns_rc;
@@ -1665,7 +1676,8 @@ err_from_cm(ns_conn_user_t *cu, ns_conn_mt_t *cm) {
 
 /* copy error info (rc and ns_ldap_error_t) from caller to conn_user */
 static void
-err_from_caller(ns_conn_user_t *cu, int rc, ns_ldap_error_t **errorp) {
+err_from_caller(ns_conn_user_t *cu, int rc, ns_ldap_error_t **errorp)
+{
 
 	cu->ns_rc = rc;
 	if (errorp != NULL) {
@@ -1733,7 +1745,7 @@ __s_api_conn_mt_remove(ns_conn_user_t *cu, int rc, ns_ldap_error_t **errorp)
  */
 int
 __s_api_check_libldap_MT_conn_support(ns_conn_user_t *cu, LDAP *ld,
-	ns_ldap_error_t **ep)
+    ns_ldap_error_t **ep)
 {
 	int		rc;
 	ns_conn_mgmt_t	*cmg;
@@ -1779,7 +1791,7 @@ __s_api_check_libldap_MT_conn_support(ns_conn_user_t *cu, LDAP *ld,
  */
 static int
 close_conn_mt(ns_conn_mt_t *cm, int rc, ns_ldap_error_t **errorp,
-	ns_conn_user_t *cu)
+    ns_conn_user_t *cu)
 {
 	ns_conn_mgmt_t	*cmg = cm->conn_mgmt;
 	ns_conn_mt_t	*m;
@@ -1992,7 +2004,7 @@ proc_server_change(ns_server_status_change_t *chg, ns_conn_mgmt_t  *cmg)
 	int		cnt, i, j, k, n;
 	boolean_t	loop = B_TRUE;
 	boolean_t	cmg_locked = B_FALSE;
-	char 		*s;
+	char		*s;
 	ns_conn_mt_t	*cm;
 	ns_conn_mgmt_t	*ocmg;
 
@@ -2278,8 +2290,8 @@ __s_api_reinit_conn_mgmt_new_config(ns_config_t *new_cfg)
  */
 int
 __s_api_setup_retry_search(ns_conn_user_t **conn_user,
-	ns_conn_user_type_t type, int *try_cnt, int *rc,
-	ns_ldap_error_t **errorp)
+    ns_conn_user_type_t type, int *try_cnt, int *rc,
+    ns_ldap_error_t **errorp)
 {
 	boolean_t	retry;
 	ns_conn_user_t	*cu = *conn_user;
@@ -2329,7 +2341,7 @@ __s_api_setup_retry_search(ns_conn_user_t **conn_user,
 /* prepare to get the next entry for an enumeration */
 int
 __s_api_setup_getnext(ns_conn_user_t *cu, int *ns_err,
-	ns_ldap_error_t **errorp)
+    ns_ldap_error_t **errorp)
 {
 	int rc;
 	ns_conn_mgmt_t	*cmg;
@@ -2616,7 +2628,8 @@ get_server_change(void *arg)
 
 /* start the thread handling the change notification from ldap_cachemgr */
 static void
-start_thread(ns_conn_mgmt_t *cmg) {
+start_thread(ns_conn_mgmt_t *cmg)
+{
 
 	int		errnum;
 
diff --git a/usr/src/lib/print/libprint/common/ns.c b/usr/src/lib/print/libprint/common/ns.c
index 2384b5c129..c36da07344 100644
--- a/usr/src/lib/print/libprint/common/ns.c
+++ b/usr/src/lib/print/libprint/common/ns.c
@@ -79,7 +79,7 @@ ns_printer_destroy(ns_printer_t *printer)
 	if (printer != NULL) {
 		if (printer->attributes != NULL) {	/* attributes */
 			list_iterate((void **)printer->attributes,
-			    (VFUNC_T)ns_kvp_destroy);
+			    ns_kvp_destroy);
 			free(printer->attributes);
 		}
 		if (printer->aliases != NULL) {		/* aliases */
diff --git a/usr/src/lib/print/libprint/common/ns.h b/usr/src/lib/print/libprint/common/ns.h
index 0171b85b4b..8cf31f7abb 100644
--- a/usr/src/lib/print/libprint/common/ns.h
+++ b/usr/src/lib/print/libprint/common/ns.h
@@ -178,7 +178,7 @@ extern int	  ns_set_value(const char *, const void *, ns_printer_t *);
 extern int	  ns_set_value_from_string(const char *, const char *,
 						ns_printer_t *);
 extern ns_kvp_t	*ns_kvp_create(const char *, const char *);
-extern void ns_kvp_destroy(ns_kvp_t *);
+extern int ns_kvp_destroy(void *, __va_list);
 
 /* for BSD bindings only */
 extern ns_bsd_addr_t *ns_bsd_addr_get_default();
@@ -194,8 +194,6 @@ extern void *string_to_value(const char *, char *);
 extern char *normalize_ns_name(char *);
 extern char *strncat_escaped(char *, char *, int, char *);
 
-
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/usr/src/lib/print/libprint/common/ns_cmn_kvp.c b/usr/src/lib/print/libprint/common/ns_cmn_kvp.c
index 3fdacd7e5d..9a36ddceac 100644
--- a/usr/src/lib/print/libprint/common/ns_cmn_kvp.c
+++ b/usr/src/lib/print/libprint/common/ns_cmn_kvp.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 /*LINTLIBRARY*/
 
 #include <stdio.h>
@@ -66,9 +64,11 @@ ns_kvp_create(const char *key, const char *value)
 	return (kvp);
 }
 
-void
-ns_kvp_destroy(ns_kvp_t *kvp)
+int
+ns_kvp_destroy(void *arg, va_list arg1 __unused)
 {
+	ns_kvp_t *kvp = arg;
+
 	if (kvp != NULL) {
 		if (kvp->key != NULL)
 			free(kvp->key);
@@ -76,6 +76,7 @@ ns_kvp_destroy(ns_kvp_t *kvp)
 			free(kvp->value);
 		free(kvp);
 	}
+	return (0);
 }
 
 
@@ -130,7 +131,7 @@ ns_r_get_value(const char *key, const ns_printer_t *printer, int level)
 
 	/* find it right here */
 	if ((kvp = list_locate((void **)printer->attributes,
-			(COMP_T)ns_kvp_match_key, (void *)key)) != NULL) {
+	    (COMP_T)ns_kvp_match_key, (void *)key)) != NULL) {
 		void *value = string_to_value(key, kvp->value);
 
 		/* fill in an empty printer for a bsdaddr */
@@ -153,13 +154,13 @@ ns_r_get_value(const char *key, const ns_printer_t *printer, int level)
 			char **printers;
 
 			for (printers = string_to_value((*attrs)->key,
-						(*attrs)->value);
+			    (*attrs)->value);
 			    printers != NULL && *printers != NULL; printers++) {
 				ns_printer_t *printer =
-					ns_printer_get_name(*printers, NULL);
+				    ns_printer_get_name(*printers, NULL);
 
-				if ((value = ns_r_get_value(key, printer,
-							    level)) != NULL)
+				value = ns_r_get_value(key, printer, level);
+				if (value != NULL)
 					return (value);
 				ns_printer_destroy(printer);
 			}
@@ -167,18 +168,18 @@ ns_r_get_value(const char *key, const ns_printer_t *printer, int level)
 			ns_printer_t **printers;
 
 			for (printers = string_to_value((*attrs)->key,
-						(*attrs)->value);
+			    (*attrs)->value);
 			    printers != NULL && *printers != NULL; printers++) {
-				if ((value = ns_r_get_value(key, *printers,
-							    level)) != NULL)
+				value = ns_r_get_value(key, *printers, level);
+				if (value != NULL)
 					return (value);
 			}
 		} else if (strcmp((*attrs)->key, NS_KEY_USE) == 0) {
 			char *string = NULL;
 			ns_printer_t *printer =
-				ns_printer_get_name((*attrs)->value, NULL);
-			if ((value = ns_r_get_value(key, printer,
-					level)) != NULL)
+			    ns_printer_get_name((*attrs)->value, NULL);
+			value = ns_r_get_value(key, printer, level);
+			if (value != NULL)
 				string = value_to_string(string, value);
 			if (string != NULL)
 				value = string_to_value(key, string);
@@ -223,7 +224,7 @@ int
 ns_set_value(const char *key, const void *value, ns_printer_t *printer)
 {
 	return (ns_set_value_from_string(key,
-			value_to_string(key, (void *)value), printer));
+	    value_to_string(key, (void *)value), printer));
 }
 
 
@@ -233,24 +234,22 @@ ns_set_value(const char *key, const void *value, ns_printer_t *printer)
  */
 int
 ns_set_value_from_string(const char *key, const char *string,
-			ns_printer_t *printer)
+    ns_printer_t *printer)
 {
 	if (printer == NULL)
 		return (-1);
 
-	if (key == NULL)
-		list_iterate((void **)printer->attributes,
-				(VFUNC_T)ns_kvp_destroy);
-	else {
+	if (key == NULL) {
+		list_iterate((void **)printer->attributes, ns_kvp_destroy);
+	} else {
 		ns_kvp_t *kvp;
 
 		if (((kvp = list_locate((void **)printer->attributes,
-					(COMP_T)ns_kvp_match_key,
-					(void *)key)) == NULL) &&
+		    (COMP_T)ns_kvp_match_key, (void *)key)) == NULL) &&
 		    ((kvp = calloc(1, sizeof (*kvp))) != NULL)) {
 			kvp->key = strdup(key);
 			printer->attributes = (ns_kvp_t **)
-				list_append((void **)printer->attributes, kvp);
+			    list_append((void **)printer->attributes, kvp);
 		}
 		if (string != NULL)
 			kvp->value = strdup(string);
diff --git a/usr/src/lib/print/libprint/common/ns_cmn_printer.c b/usr/src/lib/print/libprint/common/ns_cmn_printer.c
index 42a1fa350c..2b8e6336dc 100644
--- a/usr/src/lib/print/libprint/common/ns_cmn_printer.c
+++ b/usr/src/lib/print/libprint/common/ns_cmn_printer.c
@@ -109,17 +109,19 @@ ns_printer_match_name(ns_printer_t *printer, const char *name)
 }
 
 
-static void
-_ns_append_printer_name(const char *name, va_list ap)
+static int
+_ns_append_printer_name(void *arg, va_list ap)
 {
+	const char *name = arg;
 	char *buf = va_arg(ap, char *);
 	int bufsize = va_arg(ap, int);
 
 	if (name == NULL)
-		return;
+		return (0);
 
 	(void) strlcat(buf, name, bufsize);
 	(void) strlcat(buf, "|", bufsize);
+	return (0);
 }
 
 /*
@@ -145,7 +147,7 @@ ns_printer_name_list(const ns_printer_t *printer)
 	}
 
 	list_iterate((void **)printer->aliases,
-	    (VFUNC_T)_ns_append_printer_name, buf, sizeof (buf));
+	    _ns_append_printer_name, buf, sizeof (buf));
 
 	buf[strlen(buf) - 1] = '\0';
 
diff --git a/usr/src/lib/print/libprint/common/nss_ldap.c b/usr/src/lib/print/libprint/common/nss_ldap.c
index c2140d5048..193ba50f77 100644
--- a/usr/src/lib/print/libprint/common/nss_ldap.c
+++ b/usr/src/lib/print/libprint/common/nss_ldap.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 <unistd.h>
@@ -173,7 +171,7 @@ static void _freeList(char ***list);
 static NSL_RESULT _modAttrKVP(char *value, char ***kvpList);
 static NSL_RESULT _attrAddKVP(LDAPMod ***attrs, char **kvpList, int kvpExists);
 static int _manageReferralCredentials(LDAP *ld, char **dn, char **credp,
-					int *methodp, int freeit);
+	int *methodp, int freeit, void *);
 
 /*
  * *****************************************************************************
@@ -483,9 +481,8 @@ _connectToLDAP(ns_cred_t *cred, LDAP **ld)
 			 */
 			(void) _manageReferralCredentials(*ld,
 					&(cred->binddn), &(cred->passwd),
-					&tmpMethod, -1);
+					&tmpMethod, -1, NULL);
 			ldap_set_rebind_proc(*ld,
-			    (LDAP_REBINDPROC_CALLBACK *)
 				_manageReferralCredentials, NULL);
 
 			if (lresult != LDAP_SUCCESS)
@@ -2417,8 +2414,7 @@ _attrAddKVP(LDAPMod ***attrs, char **kvpList, int kvpExists)
  * *****************************************************************************
  */
 static int _manageReferralCredentials(LDAP *ld, char **dn, char **credp,
-					int *methodp, int freeit)
-
+    int *methodp, int freeit, void *arg __unused)
 {
 	int result = 0;
 	static char *sDN = NULL;