summaryrefslogtreecommitdiffstats
path: root/cddl/compat
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-01-23 00:54:56 +0000
committerdelphij <delphij@FreeBSD.org>2015-01-23 00:54:56 +0000
commitfb31f7e88b7e2fdedda30a82110a080b8e71fc0e (patch)
treecea0649eb4d1c0ba031825d0e92f86dff4a3bcc2 /cddl/compat
parentf0b1164b8b304dfdd74cda37997e4eef0692c077 (diff)
downloadFreeBSD-src-fb31f7e88b7e2fdedda30a82110a080b8e71fc0e.zip
FreeBSD-src-fb31f7e88b7e2fdedda30a82110a080b8e71fc0e.tar.gz
MFC r275595:
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.
Diffstat (limited to 'cddl/compat')
-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