Rename ctdb_control_destructor() to ctdb_client_control_destructor()

This avoids a name clash with a slightly different function in
ctdb_control.c.

This is in the context of wanting to run CCAN-style tests where most
of the ctdbd code is just included in the test program.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 82f6108bfbc7e48ca88650297c6a1c6ede0e1c9c)

diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c
index 9705c28858f14c18b958f0af9a316c31a12c512c..73c68a4d8c7eec92b7b7f3eaa95a62213065b1b0 100644 (file)
--- a/ctdb/client/ctdb_client.c
+++ b/ctdb/client/ctdb_client.c
@@ -978,7 +978,7 @@ static void ctdb_client_reply_control(struct ctdb_context *ctdb,
 /*
   destroy a ctdb_control in client
 */
-static int ctdb_control_destructor(struct ctdb_client_control_state *state)    
+static int ctdb_client_control_destructor(struct ctdb_client_control_state *state)
 {
        ctdb_reqid_remove(state->ctdb, state->reqid);
        return 0;
@@ -1035,7 +1035,7 @@ struct ctdb_client_control_state *ctdb_control_send(struct ctdb_context *ctdb,
        state->state      = CTDB_CONTROL_WAIT;
        state->errormsg   = NULL;
 
-       talloc_set_destructor(state, ctdb_control_destructor);
+       talloc_set_destructor(state, ctdb_client_control_destructor);
 
        len = offsetof(struct ctdb_req_control, data) + data.dsize;
        c = ctdbd_allocate_pkt(ctdb, state, CTDB_REQ_CONTROL,