s3: pthreadpool_sig_fd->pthreadpool_signal_fd

(cherry picked from commit f4a0f856f31291dd316a937f8060d2f205e8d4d6)

diff --git a/source3/lib/fncall.c b/source3/lib/fncall.c
index bd06be2cd8c09fc720529995394fba4057fd899b..91377e01488bf07fcfeab42d814471543cec7026 100644 (file)
--- 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 4605538cf28b99a85ce63d247bb1906fad4f282f..2a75a5255778a3ef66c529cadf539b50a5bc856e 100644 (file)
--- 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 9608e7ff9ce792a43a20562a0aea31cd6f1d803e..255393377fd8491a7204ab42084cce3e617431a1 100644 (file)
--- 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 d365fbd5b676ce3e94c44e6d231dea0bf884d563..667ee01784e74feb29e304ef66d90e8cbef5113d 100644 (file)
--- 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;
        }