mdb integer type cleanup: Use MDB_dbi consistently.

This changes the prototype of mdb_env_set_maxdbs().

diff --git a/libraries/libmdb/mdb.c b/libraries/libmdb/mdb.c
index 19977cab1defda6e2e1c03e2fa50b3f009054b6c..db4db98116f7c66f2c2a4846e300b27293abcd39 100644 (file)
--- a/libraries/libmdb/mdb.c
+++ b/libraries/libmdb/mdb.c
@@ -689,7 +689,7 @@ struct MDB_txn {
        /**     Number of DB records in use. This number only ever increments;
         *      we don't decrement it when individual DB handles are closed.
         */
-       unsigned int    mt_numdbs;
+       MDB_dbi         mt_numdbs;
 
 #define MDB_TXN_RDONLY         0x01            /**< read-only transaction */
 #define MDB_TXN_ERROR          0x02            /**< an error has occurred */
@@ -772,8 +772,8 @@ struct MDB_env {
        uint32_t        me_flags;
        uint32_t        me_extrapad;    /**< unused for now */
        unsigned int    me_maxreaders;  /**< size of the reader table */
-       unsigned int    me_numdbs;              /**< number of DBs opened */
-       unsigned int    me_maxdbs;              /**< size of the DB table */
+       MDB_dbi         me_numdbs;              /**< number of DBs opened */
+       MDB_dbi         me_maxdbs;              /**< size of the DB table */
        char            *me_path;               /**< path to the DB files */
        char            *me_map;                /**< the memory map of the data file */
        MDB_txninfo     *me_txns;               /**< the memory map of the lock file */
@@ -1250,6 +1250,7 @@ mdb_txn_reset0(MDB_txn *txn)
        } else {
                MDB_oldpages *mop;
                MDB_page *dp;
+               MDB_dbi dbi;
                unsigned int i;
 
                /* return all dirty pages to dpage list */
@@ -1270,8 +1271,8 @@ mdb_txn_reset0(MDB_txn *txn)
                }
 
                env->me_txn = NULL;
-               for (i=2; i<env->me_numdbs; i++)
-                       env->me_dbxs[i].md_dirty = 0;
+               for (dbi=2; dbi<env->me_numdbs; dbi++)
+                       env->me_dbxs[dbi].md_dirty = 0;
                /* The writer mutex was locked in mdb_txn_begin. */
                UNLOCK_MUTEX_W(env);
        }
@@ -1412,6 +1413,7 @@ mdb_txn_commit(MDB_txn *txn)
         * touched so this is all in-place and cannot fail.
         */
        {
+               MDB_dbi i;
                MDB_val data;
                data.mv_size = sizeof(MDB_db);
 
@@ -1545,6 +1547,7 @@ done:
        {
                int toggle = !env->me_db_toggle;
                MDB_db *ip, *jp;
+               MDB_dbi i;
 
                ip = &env->me_dbs[toggle][2];
                jp = &txn->mt_dbs[2];
@@ -1813,7 +1816,7 @@ mdb_env_set_mapsize(MDB_env *env, size_t size)
 }
 
 int
-mdb_env_set_maxdbs(MDB_env *env, int dbs)
+mdb_env_set_maxdbs(MDB_env *env, MDB_dbi dbs)
 {
        if (env->me_map)
                return EINVAL;

diff --git a/libraries/libmdb/mdb.h b/libraries/libmdb/mdb.h
index 8e7d297c3be650a633dd7f86451e0ed1a4ca2a4d..ce3137ce1fc43e1468a6b9ac06e332b5960bbf16 100644 (file)
--- a/libraries/libmdb/mdb.h
+++ b/libraries/libmdb/mdb.h
@@ -440,7 +440,7 @@ int  mdb_env_get_maxreaders(MDB_env *env, unsigned int *readers);
         *      <li>EINVAL - an invalid parameter was specified, or the environment is already open.
         * </ul>
         */
-int  mdb_env_set_maxdbs(MDB_env *env, int dbs);
+int  mdb_env_set_maxdbs(MDB_env *env, MDB_dbi dbs);
 
        /** Create a transaction for use with the environment.
         * The transaction handle may be discarded using #mdb_txn_abort() or #mdb_txn_commit().