summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/fncall.c2
-rw-r--r--source3/lib/pthreadpool/pthreadpool.c2
-rw-r--r--source3/lib/pthreadpool/pthreadpool.h6
-rw-r--r--source3/lib/pthreadpool/tests.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c
index bd06be2cd8..91377e0148 100644
--- a/source3/lib/fncall.c
+++ b/source3/lib/fncall.c
@@ -86,7 +86,7 @@ struct fncall_context *fncall_context_init(TALLOC_CTX *mem_ctx,
}
talloc_set_destructor(ctx, fncall_context_destructor);
- ctx->sig_fd = pthreadpool_sig_fd(ctx->pool);
+ ctx->sig_fd = pthreadpool_signal_fd(ctx->pool);
if (ctx->sig_fd == -1) {
TALLOC_FREE(ctx);
return NULL;
diff --git a/source3/lib/pthreadpool/pthreadpool.c b/source3/lib/pthreadpool/pthreadpool.c
index 4605538cf2..2a75a52557 100644
--- a/source3/lib/pthreadpool/pthreadpool.c
+++ b/source3/lib/pthreadpool/pthreadpool.c
@@ -250,7 +250,7 @@ static void pthreadpool_prep_atfork(void)
* finished
*/
-int pthreadpool_sig_fd(struct pthreadpool *pool)
+int pthreadpool_signal_fd(struct pthreadpool *pool)
{
return pool->sig_pipe[0];
}
diff --git a/source3/lib/pthreadpool/pthreadpool.h b/source3/lib/pthreadpool/pthreadpool.h
index 9608e7ff9c..255393377f 100644
--- a/source3/lib/pthreadpool/pthreadpool.h
+++ b/source3/lib/pthreadpool/pthreadpool.h
@@ -73,18 +73,18 @@ int pthreadpool_add_job(struct pthreadpool *pool, int job_id,
* @brief Get the signalling fd from a pthreadpool
*
* Completion of a job is indicated by readability of the fd retuned
- * by pthreadpool_sig_fd().
+ * by pthreadpool_signal_fd().
*
* @param[in] pool The pool in question
* @return The fd to listen on for readability
*/
-int pthreadpool_sig_fd(struct pthreadpool *pool);
+int pthreadpool_signal_fd(struct pthreadpool *pool);
/**
* @brief Get the job_id of a finished job
*
* This blocks until a job has finished unless the fd returned by
- * pthreadpool_sig_fd() is readable.
+ * pthreadpool_signal_fd() is readable.
*
* @param[in] pool The pool to query for finished jobs
* @return The job_id of the finished job
diff --git a/source3/lib/pthreadpool/tests.c b/source3/lib/pthreadpool/tests.c
index d365fbd5b6..667ee01784 100644
--- a/source3/lib/pthreadpool/tests.c
+++ b/source3/lib/pthreadpool/tests.c
@@ -120,7 +120,7 @@ static int test_busydestroy(void)
return -1;
}
- pfd.fd = pthreadpool_sig_fd(p);
+ pfd.fd = pthreadpool_signal_fd(p);
pfd.events = POLLIN|POLLERR;
poll(&pfd, 1, -1);
@@ -202,7 +202,7 @@ static int test_threaded_addjob(int num_pools, int num_threads, int poolsize,
strerror(ret));
return -1;
}
- pfds[i].fd = pthreadpool_sig_fd(pools[i]);
+ pfds[i].fd = pthreadpool_signal_fd(pools[i]);
pfds[i].events = POLLIN|POLLHUP;
}