diff options
5 files changed, 13 insertions, 17 deletions
diff --git a/usr/src/cmd/syseventd/daemons/syseventconfd/syseventconfd.c b/usr/src/cmd/syseventd/daemons/syseventconfd/syseventconfd.c index 8812c6d8ab..e2d6c05b54 100644 --- a/usr/src/cmd/syseventd/daemons/syseventconfd/syseventconfd.c +++ b/usr/src/cmd/syseventd/daemons/syseventconfd/syseventconfd.c @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * syseventconfd - The sysevent conf daemon * @@ -183,8 +181,8 @@ main(int argc, char **argv) (void) thr_sigsetmask(SIG_BLOCK, &set, NULL); /* Create signal catching thread */ - if (thr_create(NULL, NULL, (void *(*)(void *))sigwait_thr, - (void *)NULL, 0, NULL) < 0) { + if (thr_create(NULL, 0, (void *(*)(void *))sigwait_thr, + NULL, 0, NULL) < 0) { syserrmsg(INIT_THR_CREATE_ERR, strerror(errno)); exit(2); } @@ -287,7 +285,7 @@ exec_cmd(struct cmd *cmd) arg_t *args; pid_t pid; char *lp; - char *p; + char *p; int i; sigset_t set, prior_set; diff --git a/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c b/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c index eac85c38b2..ccabc81635 100644 --- a/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c +++ b/usr/src/cmd/syseventd/daemons/syseventd/syseventd.c @@ -83,7 +83,7 @@ static int door_upcall_retval; /* Kernel event posting return value */ static int fini_pending = 0; /* fini pending flag */ static int deliver_buf = 0; /* Current event buffer from kernel */ static int dispatch_buf = 0; /* Current event buffer dispatched */ -static sysevent_t **eventbuf; /* Global array of event buffers */ +static sysevent_t **eventbuf; /* Global array of event buffers */ static struct ev_completion *event_compq; /* Event completion queue */ static mutex_t ev_comp_lock; /* Event completion queue lock */ static mutex_t err_mutex; /* error logging lock */ @@ -453,19 +453,19 @@ main(int argc, char **argv) syseventd_exit(2); } - if (thr_create(NULL, NULL, (void *(*)(void *))dispatch_message, + if (thr_create(NULL, 0, (void *(*)(void *))dispatch_message, (void *)0, 0, NULL) < 0) { syseventd_err_print(INIT_THR_CREATE_ERR, strerror(errno)); syseventd_exit(2); } - if (thr_create(NULL, NULL, + if (thr_create(NULL, 0, (void *(*)(void *))event_completion_thr, NULL, THR_BOUND, NULL) != 0) { syseventd_err_print(INIT_THR_CREATE_ERR, strerror(errno)); syseventd_exit(2); } /* Create signal catching thread */ - if (thr_create(NULL, NULL, (void *(*)(void *))sigwait_thr, + if (thr_create(NULL, 0, (void *(*)(void *))sigwait_thr, NULL, 0, NULL) < 0) { syseventd_err_print(INIT_THR_CREATE_ERR, strerror(errno)); syseventd_exit(2); 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 08d424f6ba..0ec386dca6 100644 --- a/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c +++ b/usr/src/cmd/syseventd/modules/devfsadmd_mod/devfsadmd_mod.c @@ -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, NULL, (void *(*)(void *))devfsadmd_deliver_thr, + if (thr_create(NULL, 0, (void *(*)(void *))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 3aee5c6c51..eae8050d41 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 @@ -96,7 +96,7 @@ static int first_event; /* first event since init */ static conftab_t *conftab = NULL; static syseventtab_t *syseventtab = NULL; static syseventtab_t *syseventtab_tail = NULL; -static sysevent_handle_t *confd_handle = NULL; +static sysevent_handle_t *confd_handle = NULL; /* * The cmd queue is a queue of commands ready to be sent @@ -1659,7 +1659,7 @@ queue_event(sysevent_t *ev, syseventtab_t *sep, sysevent_hdr_info_t *hdr) { str_t *line; nvlist_t *nvlist; - char *argv0; + char *argv0; sysevent_t *cmd_event; nvlist_t *cmd_nvlist; cmdqueue_t *new_cmd; @@ -2207,8 +2207,8 @@ slm_init() /* * Create thread to flush cmd queue */ - if ((err = thr_create(NULL, NULL, (void *(*)(void*))queue_flush_thr, - (void *)NULL, 0, &cmdq_thr_id)) != 0) { + if ((err = thr_create(NULL, 0, (void *(*)(void*))queue_flush_thr, + NULL, 0, &cmdq_thr_id)) != 0) { syslog(LOG_ERR, THR_CREATE_ERR, strerror(err)); sysevent_close_channel(confd_handle); confd_handle = NULL; 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 146badfd43..b8492764b4 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 @@ -24,8 +24,6 @@ * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <unistd.h> #include <stdlib.h> #include <string.h> @@ -232,7 +230,7 @@ slm_init() (void) mutex_init(&evq_lock, USYNC_THREAD, NULL); (void) cond_init(&evq_cv, USYNC_THREAD, NULL); - if (thr_create(NULL, NULL, (void *(*)(void *))subscriber_deliver_thr, + if (thr_create(NULL, 0, (void *(*)(void *))subscriber_deliver_thr, NULL, 0, &deliver_thr_id) != 0) { syseventd_err_print(INIT_SUB_THR_CREATE_ERR, strerror(errno)); return (NULL); |