rename client.id to client.messenger_id to make the purpose of the field more obvious

(This used to be ctdb commit 350f14909d5dba6cd9d76d221e263933926cea6c)

diff --git a/ctdb/common/ctdb_daemon.c b/ctdb/common/ctdb_daemon.c
index cfc283ce5a2ba06c5b5fa3f4d132a5b38f970f03..ee1eaad54943e6fd1e4ba15d90b1abff811f2eb1 100644 (file)
--- a/ctdb/common/ctdb_daemon.c
+++ b/ctdb/common/ctdb_daemon.c
@@ -58,7 +58,7 @@ static void set_non_blocking(int fd)
 struct ctdb_client {
        struct ctdb_context *ctdb;
        int fd;
-       uint32_t id;
+       uint32_t messenger_id;
        struct ctdb_queue *queue;
 };
 
@@ -145,7 +145,7 @@ static void client_request_call(struct ctdb_client *client, struct ctdb_req_call
  */
 static void client_register_message(struct ctdb_client *client, struct ctdb_register_call *r)
 {
-       client->id = *((uint32_t *)r->data);
+       client->messenger_id = *((uint32_t *)r->data);
 }
 
 
@@ -589,7 +589,7 @@ struct ctdb_call_state *ctdbd_call_send(struct ctdb_db_context *ctdb_db, struct
        return state;
 }
 
-int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t id)
+int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t messenger_id)
 {
        int res;
        struct ctdb_register_call rc;
@@ -608,7 +608,7 @@ int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t id)
        rc.hdr.ctdb_version = CTDB_VERSION;
        rc.hdr.operation = CTDB_REGISTER_CALL;
        rc.datalen=4;
-       *((uint32_t *)rc.data) = id;
+       *((uint32_t *)rc.data) = messenger_id;
        rc.hdr.length = offsetof(struct ctdb_register_call, data) + rc.datalen;
 
 /*XXX need to handle the case of partial writes    logic for partial writes in tcp/ctdb_tcp_node_write */

diff --git a/ctdb/include/ctdb.h b/ctdb/include/ctdb.h
index 74735a77b290609d0108808ce02afb76c879e452..7f70d5430d6b76c30652342939e41deba2a38b6e 100644 (file)
--- a/ctdb/include/ctdb.h
+++ b/ctdb/include/ctdb.h
@@ -184,7 +184,7 @@ int ctdb_record_store(struct ctdb_record_handle *rec, TDB_DATA data);
    ctdb daemon what its local identifier is.
    when in non-daemon mode this is a noop.
  */
-int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t id);
+int ctdb_register_message_local_id(struct ctdb_context *ctdb, uint32_t messenger_id);
  
 
 #endif