diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-11-18 15:15:16 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2016-02-24 08:44:38 +0100 |
| commit | fbd3fd343bd0d1c6c03f8ae82ae79ad5580af421 (patch) | |
| tree | 8fe3807055f17b5f7f19d6713320dbfb858c580a /ctdb/client/client_message.c | |
| parent | d23c5a6c2f365b249233f9a1c6d42d220b2b7c67 (diff) | |
| download | samba-fbd3fd343bd0d1c6c03f8ae82ae79ad5580af421.tar.gz | |
ctdb-client: Remove TALLOC_CTX argument from sync functions
There is no allocated memory returned from these functions.
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/client/client_message.c')
| -rw-r--r-- | ctdb/client/client_message.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/ctdb/client/client_message.c b/ctdb/client/client_message.c index c316f42ff33..d5338420cd4 100644 --- a/ctdb/client/client_message.c +++ b/ctdb/client/client_message.c @@ -371,16 +371,22 @@ bool ctdb_client_remove_message_handler_recv(struct tevent_req *req, int *perr) return true; } -int ctdb_client_set_message_handler(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, +int ctdb_client_set_message_handler(struct tevent_context *ev, struct ctdb_client_context *client, uint64_t srvid, srvid_handler_fn handler, void *private_data) { + TALLOC_CTX *mem_ctx; int ret; + mem_ctx = talloc_new(client); + if (mem_ctx == NULL) { + return ENOMEM; + } + ret = ctdb_ctrl_register_srvid(mem_ctx, ev, client, client->pnn, tevent_timeval_zero(), srvid); + talloc_free(mem_ctx); if (ret != 0) { return ret; } @@ -389,15 +395,21 @@ int ctdb_client_set_message_handler(TALLOC_CTX *mem_ctx, handler, private_data); } -int ctdb_client_remove_message_handler(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, +int ctdb_client_remove_message_handler(struct tevent_context *ev, struct ctdb_client_context *client, uint64_t srvid, void *private_data) { + TALLOC_CTX *mem_ctx; int ret; + mem_ctx = talloc_new(client); + if (mem_ctx == NULL) { + return ENOMEM; + } + ret = ctdb_ctrl_deregister_srvid(mem_ctx, ev, client, client->pnn, tevent_timeval_zero(), srvid); + talloc_free(mem_ctx); if (ret != 0) { return ret; } |