[illumos-gate merge]

commit 2c961aef81d7897b809d5e7c1c8a2e2c81495125
    12100 libadutils: cast between incompatible function types
commit efc1649758e28daa4ec68b64786909347dbe528a
    12096 pylibbe: cast between incompatible function types
commit d6913e077df3706d8fe5649c00430704087fc6a2
    12115 snoop: cast between incompatible function types
commit 934b4812e2e03b8d7610bb247316af9a8a8998e4
    12129 make: this statement may fall through
commit c3232c9513a02e659ae9307db0fc93d9730704f6
    12092 s10_brand: cast between incompatible function types
commit 88f236be915e7011e2e34d380f6538ccdb24885f
    12097 sun_fc: control reaches end of non-void function

9 files changed, 45 insertions, 34 deletions

diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h
index fc63d3987f..81add827e6 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop.h
@@ -264,7 +264,7 @@ extern int interpret_ntp(int, struct ntpdata *, int);
 extern void interpret_netbios_ns(int, uchar_t *, int);
 extern void interpret_netbios_datagram(int, uchar_t *, int);
 extern void interpret_netbios_ses(int, uchar_t *, int);
-extern void interpret_slp(int, void *, int);
+extern int interpret_slp(int, void *, int);
 struct rip;
 extern int interpret_rip(int, struct rip *, int);
 struct rip6;
diff --git a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_slp.c b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_slp.c
index fc0cd87522..2228bfa155 100644
--- a/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_slp.c
+++ b/usr/src/cmd/cmd-inet/usr.sbin/snoop/snoop_slp.c
@@ -158,7 +158,9 @@ static char *slpv1_charset(unsigned short);
  * The only external entry point to the SLP interpreter. This function
  * simply dispatches the packet based on the version.
  */
-void interpret_slp(int flags, void *slp, int fraglen) {
+int
+interpret_slp(int flags, void *slp, int fraglen)
+{
 	extern int dst_port, curr_proto;
 	struct tcp_cont *tce = NULL;
 	char *s;
@@ -169,21 +171,22 @@ void interpret_slp(int flags, void *slp, int fraglen) {
 
 	/* check if this is a TCP continuation */
 	if (flags & F_DTAIL && curr_proto == IPPROTO_TCP) {
-	    tce = find_tcp_cont(dst_port);
-	    if (tce) {
-		if (add_tcp_cont(tce, slp, fraglen)) {
-		    slp = tce->msg;
-		    fraglen = tce->curr_offset;
-		    tcp_continuation = B_TRUE;
+		tce = find_tcp_cont(dst_port);
+		if (tce) {
+			if (add_tcp_cont(tce, slp, fraglen)) {
+				slp = tce->msg;
+				fraglen = tce->curr_offset;
+				tcp_continuation = B_TRUE;
+			}
 		}
-	    }
 	}
 	if (*(char *)slp == 2 || tce)
-	    interpret_slp_v2(flags, slp, fraglen);
+		interpret_slp_v2(flags, slp, fraglen);
 	else
-	    interpret_slp_v1(flags, slp, fraglen);
+		interpret_slp_v1(flags, slp, fraglen);
 
 	tcp_continuation = B_FALSE;
+	return (0);
 }
 
 /*
@@ -697,7 +700,7 @@ static int interpret_slp_v2(int flags, struct slpv2_hdr *slp, int fraglen) {
 	if (curr_proto == IPPROTO_UDP &&
 	    dst_port == 427 &&
 	    src_port != 427) {
-	    add_transient(src_port, (int (*)())interpret_slp);
+	    add_transient(src_port, interpret_slp);
 	}
 
 	/* parse the header */
@@ -1418,7 +1421,7 @@ static int interpret_slp_v1(int flags, struct slpv1_hdr *slp, int fraglen) {
 	if (curr_proto == IPPROTO_UDP &&
 	    dst_port == 427 &&
 	    src_port != 427)
-		add_transient(src_port, (int (*)())interpret_slp);
+		add_transient(src_port, interpret_slp);
 
 	/* parse the header */
 	if (v1_header(flags, slp, fraglen)) {
diff --git a/usr/src/cmd/make/bin/read.cc b/usr/src/cmd/make/bin/read.cc
index 1ab20fd20e..9d697c6ced 100644
--- a/usr/src/cmd/make/bin/read.cc
+++ b/usr/src/cmd/make/bin/read.cc
@@ -1397,7 +1397,7 @@ case scan_name_state:
 				/* Start reading that name */
 				goto resume_name_scan;
 			}
-			/* Fall into */
+			/* FALLTHROUGH */
 		case equal_char:
 			if (paren_count + brace_count > 0) {
 				break;
diff --git a/usr/src/lib/brand/shared/brand/sys/brand_misc.h b/usr/src/lib/brand/shared/brand/sys/brand_misc.h
index 483c8976f1..680d01efa9 100644
--- a/usr/src/lib/brand/shared/brand/sys/brand_misc.h
+++ b/usr/src/lib/brand/shared/brand/sys/brand_misc.h
@@ -161,7 +161,7 @@ extern "C" {
 #define	brand_assert(ex)	(void)((ex) || \
 				(_brand_abort(0, #ex, __FILE__, __LINE__), 0))
 #define	brand_abort(err, msg)	_brand_abort((err), (msg), __FILE__, __LINE__)
-#define	EMULATE(cb, args)	{ (sysent_cb_t)(cb), (args) }
+#define	EMULATE(cb, args)	{ (sysent_cb_t)(uintptr_t)(cb), (args) }
 #define	NOSYS			EMULATE(brand_unimpl, (0 | RV_DEFAULT))
 
 typedef long (*sysent_cb_t)();
diff --git a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
index 6409c299ca..e854260a30 100644
--- a/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
+++ b/usr/src/lib/brand/solaris10/s10_brand/common/s10_brand.c
@@ -1695,7 +1695,7 @@ s10_lwp_private(sysret_t *rval, int cmd, int which, uintptr_t base)
 		 * Manual," Volume 3A for more details.
 		 */
 		brand_sysent_table[SYS_lwp_create].st_callc =
-		    (sysent_cb_t)s10_lwp_create_correct_fs;
+		    (sysent_cb_t)(uintptr_t)s10_lwp_create_correct_fs;
 		return (__systemcall(rval, SYS_brand + 1024,
 		    B_S10_FSREGCORRECTION));
 	}
diff --git a/usr/src/lib/libadutils/common/adutils_threadfuncs.c b/usr/src/lib/libadutils/common/adutils_threadfuncs.c
index 21b2d87b03..c86a6f5f90 100644
--- a/usr/src/lib/libadutils/common/adutils_threadfuncs.c
+++ b/usr/src/lib/libadutils/common/adutils_threadfuncs.c
@@ -46,6 +46,7 @@ struct adutils_lderrno {
 	char *le_errmsg;
 };
 
+static void *adutils_threadid(void);
 static void *adutils_mutex_alloc(void);
 static void adutils_mutex_free(void *mutexp);
 static int adutils_get_errno(void);
@@ -70,10 +71,9 @@ static struct ldap_thread_fns thread_fns = {
 };
 
 struct ldap_extra_thread_fns extra_thread_fns = {
-	.ltf_threadid_fn = (void * (*)(void))pthread_self
+	.ltf_threadid_fn = adutils_threadid
 };
 
-
 /*
  * Set up thread management functions for the specified LDAP session.
  * Returns either LDAP_SUCCESS or -1.
@@ -112,6 +112,12 @@ adutils_set_thread_functions(LDAP *ld)
 	return (rc);
 }
 
+static void *
+adutils_threadid(void)
+{
+	return ((void *)(uintptr_t)pthread_self());
+}
+
 /*
  * Allocate a mutex.
  */
diff --git a/usr/src/lib/pylibbe/common/libbe_py.c b/usr/src/lib/pylibbe/common/libbe_py.c
index 37e801a571..6e35228128 100644
--- a/usr/src/lib/pylibbe/common/libbe_py.c
+++ b/usr/src/lib/pylibbe/common/libbe_py.c
@@ -1059,7 +1059,7 @@ beMapLibbePyErrorToString(int errCode)
 	switch (errCode) {
 	case BE_PY_ERR_APPEND:
 		return ("Unable to append a dictionary to a list "
-		    "of dictinaries.");
+		    "of dictionaries.");
 	case BE_PY_ERR_DICT:
 		return ("Creation of a Python dictionary failed.");
 	case BE_PY_ERR_LIST:
@@ -1080,24 +1080,24 @@ beMapLibbePyErrorToString(int errCode)
 /* Private python initialization structure */
 
 static struct PyMethodDef libbeMethods[] = {
-	{"beCopy", (PyCFunction)beCopy, METH_VARARGS, "Create/Copy a BE."},
-	{"beCreateSnapshot", (PyCFunction)beCreateSnapshot, METH_VARARGS,
+	{"beCopy", beCopy, METH_VARARGS, "Create/Copy a BE."},
+	{"beCreateSnapshot", beCreateSnapshot, METH_VARARGS,
 	    "Create a snapshot."},
-	{"beDestroy", (PyCFunction)beDestroy, METH_VARARGS, "Destroy a BE."},
-	{"beDestroySnapshot", (PyCFunction)beDestroySnapshot, METH_VARARGS,
+	{"beDestroy", beDestroy, METH_VARARGS, "Destroy a BE."},
+	{"beDestroySnapshot", beDestroySnapshot, METH_VARARGS,
 	    "Destroy a snapshot."},
-	{"beMount", (PyCFunction)beMount, METH_VARARGS, "Mount a BE."},
-	{"beUnmount", (PyCFunction)beUnmount, METH_VARARGS, "Unmount a BE."},
-	{"beList", (PyCFunction)beList, METH_VARARGS | METH_KEYWORDS,
+	{"beMount", beMount, METH_VARARGS, "Mount a BE."},
+	{"beUnmount", beUnmount, METH_VARARGS, "Unmount a BE."},
+	{"beList", (PyCFunction)(uintptr_t)beList, METH_VARARGS | METH_KEYWORDS,
 	    "List BE info."},
-	{"beRename", (PyCFunction)beRename, METH_VARARGS, "Rename a BE."},
-	{"beActivate", (PyCFunction)beActivate, METH_VARARGS, "Activate a BE."},
-	{"beRollback", (PyCFunction)beRollback, METH_VARARGS, "Rollback a BE."},
-	{"bePrintErrors", (PyCFunction)bePrintErrors, METH_VARARGS,
+	{"beRename", beRename, METH_VARARGS, "Rename a BE."},
+	{"beActivate", beActivate, METH_VARARGS, "Activate a BE."},
+	{"beRollback", beRollback, METH_VARARGS, "Rollback a BE."},
+	{"bePrintErrors", bePrintErrors, METH_VARARGS,
 	    "Enable/disable error printing."},
-	{"beGetErrDesc", (PyCFunction)beGetErrDesc, METH_VARARGS,
+	{"beGetErrDesc", beGetErrDesc, METH_VARARGS,
 	    "Map Error codes to strings."},
-	{"beVerifyBEName", (PyCFunction)beVerifyBEName, METH_VARARGS,
+	{"beVerifyBEName", beVerifyBEName, METH_VARARGS,
 	    "Verify BE name."},
 	{NULL, NULL, 0, NULL}
 };
diff --git a/usr/src/lib/sun_fc/common/Sun_fcScsiInquiryV2.cc b/usr/src/lib/sun_fc/common/Sun_fcScsiInquiryV2.cc
index 577a62b722..235c29596a 100644
--- a/usr/src/lib/sun_fc/common/Sun_fcScsiInquiryV2.cc
+++ b/usr/src/lib/sun_fc/common/Sun_fcScsiInquiryV2.cc
@@ -53,7 +53,7 @@ extern "C" {
  * @param	    responseBuffer User-allocated response buffer
  * @param	    responseSize Size of User-allocated response buffer
  * @param	    scsiStatus User-allocated scsi status byte
- * 
+ *
  * @doc		    This routine will attempt a limited number of retries
  *		    When busy or again errors are encountered.
  */
@@ -91,6 +91,7 @@ Sun_fcScsiInquiryV2(HBA_HANDLE handle, HBA_WWN portWWN, HBA_WWN targetPortWWN,
 		return (HBA_STATUS_ERROR);
 	    }
 	}
+	return (HBA_STATUS_ERROR_TRY_AGAIN);
 }
 #ifdef	__cplusplus
 }
diff --git a/usr/src/lib/sun_fc/common/Sun_fcScsiReadCapacityV2.cc b/usr/src/lib/sun_fc/common/Sun_fcScsiReadCapacityV2.cc
index e9e4969d16..6590e951c4 100644
--- a/usr/src/lib/sun_fc/common/Sun_fcScsiReadCapacityV2.cc
+++ b/usr/src/lib/sun_fc/common/Sun_fcScsiReadCapacityV2.cc
@@ -50,7 +50,7 @@ extern "C" {
  * @param	    responseBuffer User-allocated response buffer
  * @param	    responseSize Size of User-allocated response buffer
  * @param	    scsiStatus User-allocated scsi status byte
- * 
+ *
  * @doc		    This routine will attempt a limited number of retries
  *		    When busy or again errors are encountered.
  */
@@ -87,6 +87,7 @@ Sun_fcScsiReadCapacityV2(HBA_HANDLE handle, HBA_WWN portWWN,
 		return (HBA_STATUS_ERROR);
 	    }
 	}
+	return (HBA_STATUS_ERROR_TRY_AGAIN);
 }
 #ifdef	__cplusplus
 }