--- a/usr/src/cmd/auditreduce/option.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/cmd/auditreduce/option.c	Thu May 03 05:27:43 2012 -0500
@@ -342,7 +342,6 @@
 			return (-1);
 		}
 		return (0);
-		/* NOTREACHED */
 	case OBJ_SOCK:
 		if (!a_isnum(obj_val, TRUE)) {
 			obj_id = atol(obj_val);
@@ -389,41 +388,34 @@
 		freehostent(he);
 		socket_flag = SOCKFLG_MACHINE;
 		return (0);
-		break;
 	case OBJ_MSG:
 	case OBJ_SEM:
 	case OBJ_SHM:
 	case OBJ_PROC:
 		obj_id = atol(obj_val);
 		return (0);
-		/* NOTREACHED */
 	case OBJ_FGROUP:
 	case OBJ_MSGGROUP:
 	case OBJ_SEMGROUP:
 	case OBJ_SHMGROUP:
 	case OBJ_PGROUP:
 		return (proc_group(obj_val, &obj_group));
-		/* NOTREACHED */
 	case OBJ_FOWNER:
 	case OBJ_MSGOWNER:
 	case OBJ_SEMOWNER:
 	case OBJ_SHMOWNER:
 	case OBJ_POWNER:
 		return (proc_user(obj_val, &obj_owner));
-		/* NOTREACHED */
 	case OBJ_FMRI:
 		return (proc_fmri(obj_val));
-		/* NOTREACHED */
 	case OBJ_USER:
 		return (proc_user(obj_val, &obj_user));
-		/* NOTREACHED */
 	case OBJ_LP: /* lp objects have not yet been defined */
 	default: /* impossible */
 		(void) sprintf(errbuf, gettext("invalid object type (%s)"),
 		    obj_str);
 		error_str = errbuf;
 		return (-1);
-		/* NOTREACHED */
 	} /* switch */
 	/*NOTREACHED*/
 }
@@ -538,7 +530,6 @@
 		}
 		flags |= M_USERE;
 		return (proc_user(optstr, &m_usere));
-		/* NOTREACHED */
 	case 'f': 		/* effective group id */
 		if (flags & M_GROUPE) {
 			error_str = gettext(
@@ -547,7 +538,6 @@
 		}
 		flags |= M_GROUPE;
 		return (proc_group(optstr, &m_groupe));
-		/* NOTREACHED */
 	case 'r': 		/* real user id */
 		if (flags & M_USERR) {
 			error_str = gettext(
@@ -556,7 +546,6 @@
 		}
 		flags |= M_USERR;
 		return (proc_user(optstr, &m_userr));
-		/* NOTREACHED */
 	case 'u': 		/* audit user id */
 		if (flags & M_USERA) {
 			error_str = gettext(
@@ -565,7 +554,6 @@
 		}
 		flags |= M_USERA;
 		return (proc_user(optstr, &m_usera));
-		/* NOTREACHED */
 	case 'g': 		/* real group id */
 		if (flags & M_GROUPR) {
 			error_str = gettext(
@@ -574,12 +562,10 @@
 		}
 		flags |= M_GROUPR;
 		return (proc_group(optstr, &m_groupr));
-		/* NOTREACHED */
 	default: 		/* impossible */
 		(void) sprintf(errbuf, gettext("'%c' unknown option"), opt);
 		error_str = errbuf;
 		return (-1);
-		/* NOTREACHED */
 	}
 	/*NOTREACHED*/
 }

--- a/usr/src/cmd/cmd-inet/usr.bin/rcp.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/cmd/cmd-inet/usr.bin/rcp.c	Thu May 03 05:27:43 2012 -0500
@@ -1508,7 +1508,7 @@
 				error("%s\n", cp);
 				exit(1);
 			}
-			SCREWUP("expected control record");
+			SCREWUP("expected control record")
 		}
 		mode = 0;
 		for (++cp; cp < buf + 5; cp++) {

--- a/usr/src/cmd/genmsg/genmsg.l	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/cmd/genmsg/genmsg.l	Thu May 03 05:27:43 2012 -0500
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <limits.h>
@@ -322,7 +320,7 @@
 
 -((([ \t]+)1)|1) {	/* -1 */
 			if (end_of_cat == FALSE) {
-				REJECT;
+				REJECT
 			} else if (IsActiveMode(ReplaceMode)) {
 				if (IsActiveMode(PreProcessMode)) {
 					int id = get_linemsgid(lineno);

--- a/usr/src/cmd/mpathadm/mpathadm.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/cmd/mpathadm/mpathadm.c	Thu May 03 05:27:43 2012 -0500
@@ -3144,7 +3144,7 @@
 
 	for (i = 0; i < numChars; i++) {
 		if (L'\0' != arrayToDisplay[i]) {
-			(void) fprintf(stdout, "%wc", arrayToDisplay[i]);
+			(void) fprintf(stdout, "%wc", (int)arrayToDisplay[i]);
 		}
 	}
 }

--- a/usr/src/lib/fm/topo/modules/common/ses/ses.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/lib/fm/topo/modules/common/ses/ses.c	Thu May 03 05:27:43 2012 -0500
@@ -545,19 +545,19 @@
 			/* if this is the negend, then abandon the contract */
 			ses_ct_print("got contract negend");
 			if (stp->set_ctid) {
-				snprintf(buf, sizeof (buf),
+				(void) snprintf(buf, sizeof (buf),
 				    "abandon old contract %d", stp->set_ctid);
 				ses_ct_print(buf);
 				stp->set_ctid = NULL;
 			}
 			(void) ct_ctl_abandon(ctlfd);
 		}
-		close(ctlfd);
+		(void) close(ctlfd);
 		(void) pthread_mutex_unlock(&stp->set_lock);
 		ct_event_free(ev);
 		(void) pthread_mutex_unlock(&ses_sslmt);
 	}
-	close(efd);
+	(void) close(efd);
 	return (NULL);
 }
 
@@ -692,7 +692,7 @@
 		topo_mod_dprintf(mod, "failed to create ctid rval = %d", rval);
 	else
 		topo_mod_dprintf(mod, "created ctid=%d", stp->set_ctid);
-	close(tfd);
+	(void) close(tfd);
 }
 
 static void
@@ -715,8 +715,8 @@
 			(void) snprintf(path, PATH_MAX,
 			    CTFS_ROOT "/device/%ld/ctl", stp->set_ctid);
 			ctlfd = open64(path, O_WRONLY);
-			ct_ctl_abandon(ctlfd);
-			close(ctlfd);
+			(void) ct_ctl_abandon(ctlfd);
+			(void) close(ctlfd);
 			stp->set_ctid = NULL;
 		}
 		(void) pthread_mutex_unlock(&stp->set_lock);

--- a/usr/src/lib/libc/port/gen/privlib.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/lib/libc/port/gen/privlib.c	Thu May 03 05:27:43 2012 -0500
@@ -757,7 +757,7 @@
 int
 priv_getbyname(const char *name)
 {
-	WITHPRIVLOCKED(int, -1, __priv_getbyname(GETPRIVDATA(), name));
+	WITHPRIVLOCKED(int, -1, __priv_getbyname(GETPRIVDATA(), name))
 }
 
 int
@@ -806,7 +806,7 @@
 const char *
 priv_getbynum(int num)
 {
-	WITHPRIVLOCKED(const char *, NULL, __priv_getbynum(GETPRIVDATA(), num));
+	WITHPRIVLOCKED(const char *, NULL, __priv_getbynum(GETPRIVDATA(), num))
 }
 
 const char *

--- a/usr/src/lib/libidmap/common/idmap_api.c	Wed May 09 15:05:14 2012 -0700
+++ b/usr/src/lib/libidmap/common/idmap_api.c	Thu May 03 05:27:43 2012 -0500
@@ -20,6 +20,7 @@
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright Milan Jurik 2012. All rights reserved.
  */
 
 
@@ -65,17 +66,6 @@
 	itera->limit = 1024;\
 	itera->arg = argu;
 
-
-#define	__ITER_ERR_RETURN(itera, argu, xdr_argu, iretcod)\
-	if (argu) {\
-		xdr_free(xdr_argu, (caddr_t)argu);\
-		free(argu);\
-	}\
-	if (itera)\
-		free(itera);\
-	return (iretcod);
-
-
 #define	__ITER_CHECK(itera, ityp)\
 	if (itera == NULL) {\
 		errno = EINVAL;\
@@ -606,8 +596,14 @@
 	return (IDMAP_SUCCESS);
 
 errout:
-	__ITER_ERR_RETURN(tmpiter, arg,
-	    xdr_idmap_list_namerules_1_argument, retcode);
+	if (arg) {
+		xdr_free(xdr_idmap_list_namerules_1_argument, (char *)arg);
+		free(arg);
+	}
+	if (tmpiter)
+		free(tmpiter);
+
+	return (retcode);
 }