12111 syseventd: cast between incompatible function types

Reviewed by: Matthias Scheler <mscheler@tintri.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@fingolfin.org>

4 files changed, 20 insertions, 22 deletions

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;