[SCM] CTDB repository - branch master updated - ctdb-1.0.114-116-g636ed76

[Ronnie Sahlberg]

The branch, master has been updated
       via  636ed76d04c8c499a911eb0d72d54b71b0a73d31 (commit)
       via  49e23f8329649e4d9eefab47c9b158fcc7210d07 (commit)
      from  41dbdd4fc0ab560420fb0e24a3179ff7c94c5bb7 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 636ed76d04c8c499a911eb0d72d54b71b0a73d31
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jun 2 10:05:58 2010 +1000

    rename ctdb_remove_message_handler to ctdb_client_remove_message_handler
    to avoid conflict with the function of the same name in libctdb

commit 49e23f8329649e4d9eefab47c9b158fcc7210d07
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Jun 2 10:00:58 2010 +1000

    rename ctdb_message_fn_t to ctdb_msg_fn_t to avoid a conflict with the type of the same name used in libctdb

-----------------------------------------------------------------------

Summary of changes:
 client/ctdb_client.c   |    8 ++++----
 common/ctdb_message.c  |    2 +-
 include/ctdb_client.h  |    8 +++++---
 include/ctdb_private.h |    6 +-----
 4 files changed, 11 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 9ce5c02..ad7aa4f 100644
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -475,7 +475,7 @@ int ctdb_call(struct ctdb_db_context *ctdb_db, struct ctdb_call *call)
   handler function in the client
 */
 int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
-			     ctdb_message_fn_t handler,
+			     ctdb_msg_fn_t handler,
 			     void *private_data)
 				    
 {
@@ -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/common/ctdb_message.c b/common/ctdb_message.c
index 41eae51..326b557 100644
--- a/common/ctdb_message.c
+++ b/common/ctdb_message.c
@@ -74,7 +74,7 @@ static int message_handler_destructor(struct ctdb_message_list *m)
 int ctdb_register_message_handler(struct ctdb_context *ctdb, 
 				  TALLOC_CTX *mem_ctx,
 				  uint64_t srvid,
-				  ctdb_message_fn_t handler,
+				  ctdb_msg_fn_t handler,
 				  void *private_data)
 {
 	struct ctdb_message_list *m;
diff --git a/include/ctdb_client.h b/include/ctdb_client.h
index 6777b49..4bb14e9 100644
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -152,11 +152,13 @@ uint32_t ctdb_get_pnn(struct ctdb_context *ctdb);
 uint32_t ctdb_get_num_nodes(struct ctdb_context *ctdb);
 
 /* setup a handler for ctdb messages */
-typedef void (*ctdb_message_fn_t)(struct ctdb_context *, uint64_t srvid,
+typedef void (*ctdb_msg_fn_t)(struct ctdb_context *, uint64_t srvid,
 				  TDB_DATA data, void *);
 int ctdb_client_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid,
-			     ctdb_message_fn_t handler,
+			     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);
@@ -184,7 +186,7 @@ int ctdb_fetch(struct ctdb_db_context *ctdb_db, TALLOC_CTX *mem_ctx,
 int ctdb_register_message_handler(struct ctdb_context *ctdb,
 				  TALLOC_CTX *mem_ctx,
 				  uint64_t srvid,
-				  ctdb_message_fn_t handler,
+				  ctdb_msg_fn_t handler,
 				  void *private_data);
 
 struct ctdb_db_context *find_ctdb_db(struct ctdb_context *ctdb, uint32_t id);
diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 7b752c5..2714845 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -272,7 +272,7 @@ struct ctdb_message_list {
 	struct ctdb_context *ctdb;
 	struct ctdb_message_list *next, *prev;
 	uint64_t srvid;
-	ctdb_message_fn_t message_handler;
+	ctdb_msg_fn_t message_handler;
 	void *message_private;
 };
 
@@ -725,10 +725,6 @@ struct ctdb_call_state *ctdb_client_call_send(struct ctdb_db_context *ctdb_db,
 */
 int ctdb_client_call_recv(struct ctdb_call_state *state, struct ctdb_call *call);
 
-int ctdb_daemon_set_message_handler(struct ctdb_context *ctdb, uint64_t srvid, 
-			     ctdb_message_fn_t handler,
-			     void *private_data);
-
 int ctdb_client_send_message(struct ctdb_context *ctdb, uint32_t vnn,
 			     uint64_t srvid, TDB_DATA data);
 


-- 
CTDB repository