change ...generic_callback to ...control_callback

diff --git a/include/ctdb.h b/include/ctdb.h
index dc24499e4837a640c71605815d09d617ddd8b8c6..33551d43b5cc4bebeec593079919c59e87004403 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -77,7 +77,7 @@ int ctdb_service(struct ctdb_context *ctdb);
 typedef void ctdb_handle;
 
 
-typedef void (*ctdb_generic_callback)(int32_t status, struct ctdb_context *ctdb, ctdb_handle *, void *private_data);
+typedef void (*ctdb_control_callback)(int32_t status, struct ctdb_context *ctdb, ctdb_handle *, void *private_data);
 
 
 /*
@@ -294,7 +294,7 @@ int ctdb_send_message(struct ctdb_context *ctdb, uint32_t pnn, uint64_t srvid, T
 ctdb_handle *
 ctdb_getpnn_send(struct ctdb_context *ctdb,
                 uint32_t destnode,
-                ctdb_generic_callback callback,
+                ctdb_control_callback callback,
                 void *private_data);
 int ctdb_getpnn_recv(struct ctdb_context *ctdb,
                     ctdb_handle *handle,
@@ -312,7 +312,7 @@ int ctdb_getpnn(struct ctdb_context *ctdb,
 ctdb_handle *
 ctdb_getrecmaster_send(struct ctdb_context *ctdb,
                        uint32_t destnode,
-                       ctdb_generic_callback callback,
+                       ctdb_control_callback callback,
                        void *private_data);
 int ctdb_getrecmaster_recv(struct ctdb_context *ctdb,
                        ctdb_handle *handle,

diff --git a/libctdb/libctdb.c b/libctdb/libctdb.c
index c9cc4d8fbeab021a209b16a448d39b97d195afdf..b6df7e7175f20da2a807acb8fe58452a06a323b2 100644 (file)
--- a/libctdb/libctdb.c
+++ b/libctdb/libctdb.c
@@ -45,7 +45,7 @@ static void
 ctdb_control_cb(struct ctdb_client_control_state *state)
 {
        struct ctdb_control_cb_data *cb_data = state->async.private_data;
-       ctdb_generic_callback callback = (ctdb_generic_callback)cb_data->callback;
+       ctdb_control_callback callback = (ctdb_control_callback)cb_data->callback;
 
        /* dont recurse */
        state->async.fn = NULL;
@@ -64,7 +64,7 @@ ctdb_control_cb(struct ctdb_client_control_state *state)
  * This function is used to set the callback action for a handle
  */
 static int
-ctdb_set_generic_callback(ctdb_handle *handle, ctdb_generic_callback callback, void *private_data)
+ctdb_set_control_callback(ctdb_handle *handle, ctdb_control_callback callback, void *private_data)
 {
        struct ctdb_client_control_state *control_state = talloc_get_type(handle, struct ctdb_client_control_state);
 
@@ -242,7 +242,7 @@ int ctdb_free(ctdb_handle *handle)
 ctdb_handle *
 ctdb_getpnn_send(struct ctdb_context *ctdb,
                        uint32_t destnode,
-                       ctdb_generic_callback callback,
+                       ctdb_control_callback callback,
                        void *private_data)
 {
        struct ctdb_client_control_state *state;
@@ -257,7 +257,7 @@ ctdb_getpnn_send(struct ctdb_context *ctdb,
        }
 
        if (callback != NULL) {
-               ctdb_set_generic_callback(state, callback, private_data);
+               ctdb_set_control_callback(state, callback, private_data);
        }
 
        return (ctdb_handle *)state;
@@ -306,7 +306,7 @@ int ctdb_getpnn(struct ctdb_context *ctdb, uint32_t destnode, uint32_t *pnn)
 ctdb_handle *
 ctdb_getrecmaster_send(struct ctdb_context *ctdb,
                        uint32_t destnode,
-                       ctdb_generic_callback callback,
+                       ctdb_control_callback callback,
                        void *private_data)
 {
        struct ctdb_client_control_state *state;
@@ -321,7 +321,7 @@ ctdb_getrecmaster_send(struct ctdb_context *ctdb,
        }
 
        if (callback != NULL) {
-               ctdb_set_generic_callback(state, callback, private_data);
+               ctdb_set_control_callback(state, callback, private_data);
        }
 
        return (ctdb_handle *)state;