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

diff --git a/ccan/tdb2/check.c b/ccan/tdb2/check.c
index 577086689f373f75c1774d9be2fd1175180af950..ad736c6829a7a5d6d64297553235d892dfad61aa 100644 (file)
--- 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,
 
 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;
 {
        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? */
        }
 
        /* 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;
 
        if (ecode != TDB_SUCCESS)
                goto out;
 

diff --git a/ccan/tdb2/tdb2.h b/ccan/tdb2/tdb2.h
index 52c234f1c8b77ea7b542c09219e412f99db5b872..84228bdcb95eb66292e30cb40e5ba9713cc099a6 100644 (file)
--- 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)
  * 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
  *
  * 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.
  */
  *
  * 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,           \
        tdb_check_((tdb), typesafe_cb_preargs(enum TDB_ERROR,           \

-                                             (check), (private),       \
+                                             (check), (private_data),  \

                                              struct tdb_data,          \
                                              struct tdb_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,
 
 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)
 
 /**
  * tdb_error - get the last error (not threadsafe)