diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-02 10:00:58 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-06-02 10:00:58 +1000 |
| commit | f1b8bd94bbb90703cdba9354944997e43272a03f (patch) | |
| tree | bc8828eb5f319b8a6807e2fb3c6ff3ff30cf7b12 | |
| parent | bc208bc916780cc19f40902f28e519b80ae2844c (diff) | |
| download | samba-f1b8bd94bbb90703cdba9354944997e43272a03f.tar.gz samba-f1b8bd94bbb90703cdba9354944997e43272a03f.tar.xz samba-f1b8bd94bbb90703cdba9354944997e43272a03f.zip | |
rename ctdb_message_fn_t to ctdb_msg_fn_t to avoid a conflict with the type of the same name used in libctdb
(This used to be ctdb commit 49e23f8329649e4d9eefab47c9b158fcc7210d07)
| -rw-r--r-- | ctdb/client/ctdb_client.c | 2 | ||||
| -rw-r--r-- | ctdb/common/ctdb_message.c | 2 | ||||
| -rw-r--r-- | ctdb/include/ctdb_client.h | 6 | ||||
| -rw-r--r-- | ctdb/include/ctdb_private.h | 6 |
4 files changed, 6 insertions, 10 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 9ce5c020ac7..87774d0c68e 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/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/ctdb/common/ctdb_message.c b/ctdb/common/ctdb_message.c index 41eae517eb1..326b5572d49 100644 --- a/ctdb/common/ctdb_message.c +++ b/ctdb/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/ctdb/include/ctdb_client.h b/ctdb/include/ctdb_client.h index 6777b4900c7..2bee621c56f 100644 --- a/ctdb/include/ctdb_client.h +++ b/ctdb/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/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 7b752c5726a..27148459b29 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/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); |