summaryrefslogtreecommitdiffstats
path: root/cddl
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2014-12-08 06:10:47 +0000
committerdelphij <delphij@FreeBSD.org>2014-12-08 06:10:47 +0000
commit7c43dd3e09ad7453fd14aae04f43a7505077948b (patch)
tree40ae615d9dc7a05f741313e157ee9f218d851b8f /cddl
parent713658ad35682fd7cbff15b3ccc4aca5a0394589 (diff)
downloadFreeBSD-src-7c43dd3e09ad7453fd14aae04f43a7505077948b.zip
FreeBSD-src-7c43dd3e09ad7453fd14aae04f43a7505077948b.tar.gz
Use calloc() instead of malloc() + bzero(). This also gets rid of a warning
because bzero is defined by strings.h which is not included in thread_pool.c. MFC after: 2 weeks
Diffstat (limited to 'cddl')
-rw-r--r--cddl/compat/opensolaris/misc/thread_pool.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/cddl/compat/opensolaris/misc/thread_pool.c b/cddl/compat/opensolaris/misc/thread_pool.c
index a6a834f..6ae0055 100644
--- a/cddl/compat/opensolaris/misc/thread_pool.c
+++ b/cddl/compat/opensolaris/misc/thread_pool.c
@@ -233,12 +233,11 @@ tpool_create(uint_t min_threads, uint_t max_threads, uint_t linger,
return (NULL);
}
- tpool = malloc(sizeof (*tpool));
+ tpool = calloc(1, sizeof (*tpool));
if (tpool == NULL) {
errno = ENOMEM;
return (NULL);
}
- bzero(tpool, sizeof(*tpool));
(void) pthread_mutex_init(&tpool->tp_mutex, NULL);
(void) pthread_cond_init(&tpool->tp_busycv, NULL);
(void) pthread_cond_init(&tpool->tp_workcv, NULL);
@@ -267,9 +266,8 @@ tpool_dispatch(tpool_t *tpool, void (*func)(void *), void *arg)
{
tpool_job_t *job;
- if ((job = malloc(sizeof (*job))) == NULL)
+ if ((job = calloc(1, sizeof (*job))) == NULL)
return (-1);
- bzero(job, sizeof(*job));
job->tpj_next = NULL;
job->tpj_func = func;
job->tpj_arg = arg;
OpenPOWER on IntegriCloud