summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2018-11-22 12:33:42 +0200
committerToomas Soome <tsoome@me.com>2019-12-16 18:36:25 +0200
commit55622ceb9a02ebd6f006f047a2447f46c605bb4a (patch)
tree5ccd920d5eca5e18d19285c161c9001e77211064
parent3665ce8aeee26b1a84fb98951ef011e0779e1ae2 (diff)
downloadillumos-joyent-55622ceb9a02ebd6f006f047a2447f46c605bb4a.tar.gz
11987 libevent: cast between incompatible function types
Reviewed by: C Fraire <cfraire@me.com> Approved by: Dan McDonald <danmcd@joyent.com>
-rw-r--r--usr/src/lib/libsysevent/libsysevent.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/usr/src/lib/libsysevent/libsysevent.c b/usr/src/lib/libsysevent/libsysevent.c
index 928020233f..9aa2178301 100644
--- a/usr/src/lib/libsysevent/libsysevent.c
+++ b/usr/src/lib/libsysevent/libsysevent.c
@@ -755,9 +755,10 @@ se_print(FILE *fp, sysevent_t *ev)
* It is created as a seperate thread in each subscriber
* process per subscription.
*/
-static void
-subscriber_event_handler(sysevent_handle_t *shp)
+static void *
+subscriber_event_handler(void *arg)
{
+ sysevent_handle_t *shp = arg;
subscriber_priv_t *sub_info;
sysevent_queue_t *evqp;
@@ -784,7 +785,7 @@ subscriber_event_handler(sysevent_handle_t *shp)
}
if (!SH_BOUND(shp)) {
(void) mutex_unlock(&sub_info->sp_qlock);
- return;
+ return (NULL);
}
}
@@ -2219,8 +2220,7 @@ sysevent_bind_subscriber_cmn(sysevent_handle_t *shp,
/* Create an event handler thread */
if (xsa == NULL || xsa->xs_thrcreate == NULL) {
- created = thr_create(NULL, 0,
- (void *(*)(void *))subscriber_event_handler,
+ created = thr_create(NULL, 0, subscriber_event_handler,
shp, THR_BOUND, &sub_info->sp_handler_tid) == 0;
} else {
/*
@@ -2238,8 +2238,7 @@ sysevent_bind_subscriber_cmn(sysevent_handle_t *shp,
* thread start function to stash it.
*/
- created = xsa->xs_thrcreate(NULL,
- (void *(*)(void *))subscriber_event_handler,
+ created = xsa->xs_thrcreate(NULL, subscriber_event_handler,
shp, xsa->xs_thrcreate_cookie) == 1;
}