messaging: Remove messaging_handler_send

This did not really take off, notifyd was the only user

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jul  7 05:11:48 CEST 2017 on sn-devel-144

diff --git a/source3/include/messages.h b/source3/include/messages.h
index 46dc6c05854e5a098572df624644fd7dc320b108..970dc381acfbe1e49fe0a5d707ec2b28d0f9c9d7 100644 (file)
--- a/source3/include/messages.h
+++ b/source3/include/messages.h
@@ -133,14 +133,6 @@ struct tevent_req *messaging_read_send(TALLOC_CTX *mem_ctx,
 int messaging_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
                        struct messaging_rec **presult);
 
-struct tevent_req *messaging_handler_send(
-       TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-       struct messaging_context *msg_ctx, uint32_t msg_type,
-       bool (*handler)(struct messaging_context *msg_ctx,
-                       struct messaging_rec **rec, void *private_data),
-       void *private_data);
-int messaging_handler_recv(struct tevent_req *req);
-
 int messaging_cleanup(struct messaging_context *msg_ctx, pid_t pid);
 
 bool messaging_parent_dgm_cleanup_init(struct messaging_context *msg);

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index da13a1edf34f0570d5a220686362a535a1f03cb7..b94a6965eb888ea4df0bc35e755f63b71a04f2d2 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -906,87 +906,6 @@ int messaging_read_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
        return 0;
 }
 
-struct messaging_handler_state {
-       struct tevent_context *ev;
-       struct messaging_context *msg_ctx;
-       uint32_t msg_type;
-       bool (*handler)(struct messaging_context *msg_ctx,
-                       struct messaging_rec **rec, void *private_data);
-       void *private_data;
-};
-
-static void messaging_handler_got_msg(struct tevent_req *subreq);
-
-struct tevent_req *messaging_handler_send(
-       TALLOC_CTX *mem_ctx, struct tevent_context *ev,
-       struct messaging_context *msg_ctx, uint32_t msg_type,
-       bool (*handler)(struct messaging_context *msg_ctx,
-                       struct messaging_rec **rec, void *private_data),
-       void *private_data)
-{
-       struct tevent_req *req, *subreq;
-       struct messaging_handler_state *state;
-
-       req = tevent_req_create(mem_ctx, &state,
-                               struct messaging_handler_state);
-       if (req == NULL) {
-               return NULL;
-       }
-       state->ev = ev;
-       state->msg_ctx = msg_ctx;
-       state->msg_type = msg_type;
-       state->handler = handler;
-       state->private_data = private_data;
-
-       subreq = messaging_read_send(state, state->ev, state->msg_ctx,
-                                    state->msg_type);
-       if (tevent_req_nomem(subreq, req)) {
-               return tevent_req_post(req, ev);
-       }
-       tevent_req_set_callback(subreq, messaging_handler_got_msg, req);
-       return req;
-}
-
-static void messaging_handler_got_msg(struct tevent_req *subreq)
-{
-       struct tevent_req *req = tevent_req_callback_data(
-               subreq, struct tevent_req);
-       struct messaging_handler_state *state = tevent_req_data(
-               req, struct messaging_handler_state);
-       struct messaging_rec *rec;
-       int ret;
-       bool ok;
-
-       ret = messaging_read_recv(subreq, state, &rec);
-       TALLOC_FREE(subreq);
-       if (tevent_req_error(req, ret)) {
-               return;
-       }
-
-       subreq = messaging_read_send(state, state->ev, state->msg_ctx,
-                                    state->msg_type);
-       if (tevent_req_nomem(subreq, req)) {
-               return;
-       }
-       tevent_req_set_callback(subreq, messaging_handler_got_msg, req);
-
-       ok = state->handler(state->msg_ctx, &rec, state->private_data);
-       TALLOC_FREE(rec);
-       if (ok) {
-               /*
-                * Next round
-                */
-               return;
-       }
-       TALLOC_FREE(subreq);
-       tevent_req_done(req);
-}
-
-int messaging_handler_recv(struct tevent_req *req)
-{
-       return tevent_req_simple_recv_unix(req);
-}
-
 static bool messaging_append_new_waiters(struct messaging_context *msg_ctx)
 {
        if (msg_ctx->num_new_waiters == 0) {