From: Rusty Russell <rusty@rustcorp.com.au>
Date: Wed, 23 Mar 2011 05:00:37 +0000 (+1030)
Subject: tdb2: avoid C++ reserved words (ie. private)
X-Git-Url: http://git.ozlabs.org/?p=ccan;a=commitdiff_plain;h=f1069e4a2d5a8115695fb8ea3e78dbdcf389aead

tdb2: avoid C++ reserved words (ie. private)
---

diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c
index 57708668..ad736c68 100644
--- a/ccan/tdb2/check.c
+++ b/ccan/tdb2/check.c
@@ -759,8 +759,8 @@ static enum TDB_ERROR check_linear(struct tdb_context *tdb,
 
 enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
 			  enum TDB_ERROR (*check)(TDB_DATA key, TDB_DATA data,
-						  void *private),
-			  void *private)
+						  void *private_data),
+			  void *private_data)
 {
 	tdb_off_t *fr = NULL, *used = NULL, ft, recovery;
 	size_t num_free = 0, num_used = 0, num_found = 0, num_ftables = 0;
@@ -801,7 +801,8 @@ enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
 	}
 
 	/* FIXME: Check key uniqueness? */
-	ecode = check_hash(tdb, used, num_used, num_ftables, check, private);
+	ecode = check_hash(tdb, used, num_used, num_ftables, check,
+			   private_data);
 	if (ecode != TDB_SUCCESS)
 		goto out;
 
diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 52c234f1..84228bdc 100644
--- a/ccan/tdb2/tdb2.h
+++ b/ccan/tdb2/tdb2.h
@@ -462,7 +462,7 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb);
  * tdb_check - check a TDB for consistency
  * @tdb: the tdb context returned from tdb_open()
  * @check: function to check each key/data pair (or NULL)
- * @private: argument for @check, must match type.
+ * @private_data: argument for @check, must match type.
  *
  * This performs a consistency check of the open database, optionally calling
  * a check() function on each record so you can do your own data consistency
@@ -471,18 +471,18 @@ enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb);
  *
  * Returns TDB_SUCCESS or an error.
  */
-#define tdb_check(tdb, check, private)					\
+#define tdb_check(tdb, check, private_data)				\
 	tdb_check_((tdb), typesafe_cb_preargs(enum TDB_ERROR,		\
-					      (check), (private),	\
+					      (check), (private_data),	\
 					      struct tdb_data,		\
 					      struct tdb_data),		\
-		   (private))
+		   (private_data))
 
 enum TDB_ERROR tdb_check_(struct tdb_context *tdb,
 			  enum TDB_ERROR (*check)(struct tdb_data key,
 						  struct tdb_data data,
-						  void *private),
-			  void *private);
+						  void *private_data),
+			  void *private_data);
 
 /**
  * tdb_error - get the last error (not threadsafe)