summaryrefslogtreecommitdiffstats
path: root/src/util
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2014-11-29 10:10:30 +0100
committerJakub Hrozek <jhrozek@redhat.com>2015-01-15 10:32:48 +0100
commitdc7d8ab0f796239338ea67cf6698e0bc6b619174 (patch)
tree382efc8b9070ca69d8095d01a946b90d5f5227f2 /src/util
parentfd52e9e51bdfe00e035e0ab08ce9a6a5d6b7a974 (diff)
downloadsssd-dc7d8ab0f796239338ea67cf6698e0bc6b619174.tar.gz
sssd-dc7d8ab0f796239338ea67cf6698e0bc6b619174.tar.xz
sssd-dc7d8ab0f796239338ea67cf6698e0bc6b619174.zip
UTIL: Make two child_common.c functions static
Two functions were only used internally, makes no sense to keep them in the child_common module API. Reviewed-by: Pavel Březina <pbrezina@redhat.com>
Diffstat (limited to 'src/util')
-rw-r--r--src/util/child_common.c29
-rw-r--r--src/util/child_common.h11
2 files changed, 20 insertions, 20 deletions
diff --git a/src/util/child_common.c b/src/util/child_common.c
index d632cd4ec..78f1bfa17 100644
--- a/src/util/child_common.c
+++ b/src/util/child_common.c
@@ -46,6 +46,13 @@ struct sss_child_ctx {
struct sss_sigchild_ctx *sigchld_ctx;
};
+static void sss_child_handler(struct tevent_context *ev,
+ struct tevent_signal *se,
+ int signum,
+ int count,
+ void *siginfo,
+ void *private_data);
+
errno_t sss_sigchld_init(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct sss_sigchild_ctx **child_ctx)
@@ -177,12 +184,12 @@ static void sss_child_invoke_cb(struct tevent_context *ev,
talloc_free(imm);
}
-void sss_child_handler(struct tevent_context *ev,
- struct tevent_signal *se,
- int signum,
- int count,
- void *siginfo,
- void *private_data)
+static void sss_child_handler(struct tevent_context *ev,
+ struct tevent_signal *se,
+ int signum,
+ int count,
+ void *siginfo,
+ void *private_data)
{
struct sss_sigchild_ctx *sigchld_ctx;
struct tevent_immediate *imm;
@@ -262,6 +269,10 @@ struct sss_child_ctx_old {
void *pvt;
};
+static void child_sig_handler(struct tevent_context *ev,
+ struct tevent_signal *sige, int signum,
+ int count, void *__siginfo, void *pvt);
+
int child_handler_setup(struct tevent_context *ev, int pid,
sss_child_callback_t cb, void *pvt,
struct sss_child_ctx_old **_child_ctx)
@@ -533,9 +544,9 @@ void fd_nonblocking(int fd)
static void child_invoke_callback(struct tevent_context *ev,
struct tevent_immediate *imm,
void *pvt);
-void child_sig_handler(struct tevent_context *ev,
- struct tevent_signal *sige, int signum,
- int count, void *__siginfo, void *pvt)
+static void child_sig_handler(struct tevent_context *ev,
+ struct tevent_signal *sige, int signum,
+ int count, void *__siginfo, void *pvt)
{
int ret, err;
struct sss_child_ctx_old *child_ctx;
diff --git a/src/util/child_common.h b/src/util/child_common.h
index 369de71a1..f1b41ace9 100644
--- a/src/util/child_common.h
+++ b/src/util/child_common.h
@@ -68,13 +68,6 @@ errno_t sss_child_register(TALLOC_CTX *mem_ctx,
void *pvt,
struct sss_child_ctx **child_ctx);
-void sss_child_handler(struct tevent_context *ev,
- struct tevent_signal *se,
- int signum,
- int count,
- void *siginfo,
- void *private_data);
-
/* Callback to be invoked when a sigchld handler is called.
* The tevent_signal * associated with the handler will be
* freed automatically when this function returns.
@@ -107,10 +100,6 @@ int read_pipe_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
/* The pipes to communicate with the child must be nonblocking */
void fd_nonblocking(int fd);
-void child_sig_handler(struct tevent_context *ev,
- struct tevent_signal *sige, int signum,
- int count, void *__siginfo, void *pvt);
-
/* Never returns EOK, ether returns an error, or doesn't return on success */
errno_t exec_child_ex(TALLOC_CTX *mem_ctx,
int *pipefd_to_child, int *pipefd_from_child,