rename ctdb_remove_message_handler to ctdb_client_remove_message_handler

to avoid conflict with the function of the same name in libctdb

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 87774d0c68eff1808a790f4710f379bb08c516ac..ad7aa4f8dcbf3e639a13c332a59a9cb4652997d3 100644 (file)
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -496,7 +496,7 @@ int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
 /*
   tell the daemon we no longer want a srvid
 */
-int ctdb_remove_message_handler(struct ctdb_context *ctdb, uint64_t srvid, void *private_data)
+int ctdb_client_remove_message_handler(struct ctdb_context *ctdb, uint64_t srvid, void *private_data)
 {
        int res;
        int32_t status;
@@ -1866,7 +1866,7 @@ int ctdb_traverse(struct ctdb_db_context *ctdb_db, ctdb_traverse_func fn, void *
                           data, NULL, NULL, &status, NULL, NULL);
        if (ret != 0 || status != 0) {
                DEBUG(DEBUG_ERR,("ctdb_traverse_all failed\n"));
-               ctdb_remove_message_handler(ctdb_db->ctdb, srvid, &state);
+               ctdb_client_remove_message_handler(ctdb_db->ctdb, srvid, &state);
                return -1;
        }
 
@@ -1874,7 +1874,7 @@ int ctdb_traverse(struct ctdb_db_context *ctdb_db, ctdb_traverse_func fn, void *
                event_loop_once(ctdb_db->ctdb->ev);
        }
 
-       ret = ctdb_remove_message_handler(ctdb_db->ctdb, srvid, &state);
+       ret = ctdb_client_remove_message_handler(ctdb_db->ctdb, srvid, &state);
        if (ret != 0) {
                DEBUG(DEBUG_ERR,("Failed to remove ctdb_traverse handler\n"));
                return -1;

diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index 2bee621c56f6831ffcaf4f590d8dbb0200075b96..4bb14e960ee9aa6f3ce74d75bdc4cf0b32726fd6 100644 (file)
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -157,6 +157,8 @@ typedef void (*ctdb_msg_fn_t)(struct ctdb_context *, uint64_t srvid,
 int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
                             ctdb_msg_fn_t handler,
                             void *private_data);
+int ctdb_client_remove_message_handler(struct ctdb_context *ctdb,
+                                      uint64_t srvid, void *private_data);
 
 
 int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call);