[SCM] CTDB repository - branch master updated - ctdb-1.0.114-160-g1f453aa

[Ronnie Sahlberg]

The branch, master has been updated
       via  1f453aa4b5e749468c7788afac09c6f0900ea18f (commit)
      from  f26b59d8b96a70baa80ab1bad406ee6a21330b68 (commit)

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


- Log -----------------------------------------------------------------
commit 1f453aa4b5e749468c7788afac09c6f0900ea18f
Author: Evan Kinney <evan.kinney at sas.com>
Date:   Wed Jul 28 22:48:46 2010 -0400

    ctdb: Fixed use of reserved word "private" in typedefs
    
    In include/ctdb.h, ctdb_callback_t and ctdb_rrl_callback_t were
    defined with a void *private variable. The variable name was
    changed to void *private_data to avoid issues encountered in
    the Samba autoconf script.
    
    Evan Kinney <evan.kinney at sas.com>

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

Summary of changes:
 include/ctdb.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb.h b/include/ctdb.h
index e4aff86..13e6448 100644
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -177,7 +177,7 @@ void ctdb_request_free(struct ctdb_connection *ctdb, struct ctdb_request *req);
  * actual private parameter.
  */
 typedef void (*ctdb_callback_t)(struct ctdb_connection *ctdb,
-				struct ctdb_request *req, void *private);
+				struct ctdb_request *req, void *private_data);
 
 /**
  * struct ctdb_db - connection to a particular open TDB
@@ -247,7 +247,7 @@ struct ctdb_lock;
 typedef void (*ctdb_rrl_callback_t)(struct ctdb_db *ctdb_db,
 				    struct ctdb_lock *lock,
 				    TDB_DATA data,
-				    void *private);
+				    void *private_data);
 
 /**
  * ctdb_readrecordlock_async - read and lock a record


-- 
CTDB repository