ITS#8200 Fix mdb_midl_shrink() usage, return void

diff --git a/libraries/liblmdb/mdb.c b/libraries/liblmdb/mdb.c
index eeab972a82aa48093547de8512916194a1f3409a..adc20f893b9136c3e5d05bfcb162a05fda2e9b4a 100644 (file)
--- a/libraries/liblmdb/mdb.c
+++ b/libraries/liblmdb/mdb.c
@@ -2822,8 +2822,8 @@ mdb_txn_reset0(MDB_txn *txn, const char *act)
                }
 
                if (!txn->mt_parent) {
-                       if (mdb_midl_shrink(&txn->mt_free_pgs))
-                               env->me_free_pgs = txn->mt_free_pgs;
+                       mdb_midl_shrink(&txn->mt_free_pgs);
+                       env->me_free_pgs = txn->mt_free_pgs;
                        /* me_pgstate: */
                        env->me_pghead = NULL;
                        env->me_pglast = 0;
@@ -3409,8 +3409,8 @@ mdb_txn_commit(MDB_txn *txn)
 
        mdb_midl_free(env->me_pghead);
        env->me_pghead = NULL;
-       if (mdb_midl_shrink(&txn->mt_free_pgs))
-               env->me_free_pgs = txn->mt_free_pgs;
+       mdb_midl_shrink(&txn->mt_free_pgs);
+       env->me_free_pgs = txn->mt_free_pgs;
 
 #if (MDB_DEBUG) > 2
        mdb_audit(txn);

diff --git a/libraries/liblmdb/midl.c b/libraries/liblmdb/midl.c
index 16782dcafc1c7fc99559b4cb1af62bd790af1968..57a9d4920e94d9c555dc6bcdac407af7195e2fd1 100644 (file)
--- a/libraries/liblmdb/midl.c
+++ b/libraries/liblmdb/midl.c
@@ -116,7 +116,7 @@ void mdb_midl_free(MDB_IDL ids)
                free(ids-1);
 }
 
-int mdb_midl_shrink( MDB_IDL *idp )
+void mdb_midl_shrink( MDB_IDL *idp )
 {
        MDB_IDL ids = *idp;
        if (*(--ids) > MDB_IDL_UM_MAX &&
@@ -124,9 +124,7 @@ int mdb_midl_shrink( MDB_IDL *idp )
        {
                *ids++ = MDB_IDL_UM_MAX;
                *idp = ids;
-               return 1;
        }
-       return 0;
 }
 
 static int mdb_midl_grow( MDB_IDL *idp, int num )

diff --git a/libraries/liblmdb/midl.h b/libraries/liblmdb/midl.h
index 9b041d72d190357d64ac7fb26ef3966e20649c84..2331e7839847d0629bfaea95981aa59d8866e187 100644 (file)
--- a/libraries/liblmdb/midl.h
+++ b/libraries/liblmdb/midl.h
@@ -98,9 +98,8 @@ void mdb_midl_free(MDB_IDL ids);
        /** Shrink an IDL.
         * Return the IDL to the default size if it has grown larger.
         * @param[in,out] idp   Address of the IDL to shrink.
-        * @return      0 on no change, non-zero if shrunk.
         */
-int mdb_midl_shrink(MDB_IDL *idp);
+void mdb_midl_shrink(MDB_IDL *idp);
 
        /** Make room for num additional elements in an IDL.
         * @param[in,out] idp   Address of the IDL.