From: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Date: Wed, 2 Jun 2010 00:00:58 +0000 (+1000)
Subject: rename ctdb_message_fn_t to ctdb_msg_fn_t to avoid a conflict with the type of the... 
X-Git-Tag: ctdb-1.9.1~52
X-Git-Url: http://git.samba.org/?p=rusty%2Fctdb.git;a=commitdiff_plain;h=49e23f8329649e4d9eefab47c9b158fcc7210d07

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

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index 9ce5c020..87774d0c 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)
 				    
 {
diff --git a/common/ctdb_message.c b/common/ctdb_message.c
index 41eae517..326b5572 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 6777b490..2bee621c 100644
--- a/include/ctdb_client.h
+++ b/include/ctdb_client.h
@@ -152,10 +152,10 @@ 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);
 
 
@@ -184,7 +184,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 7b752c57..27148459 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);