Commit 90f6fc4b authored by Hallvard Furuseth's avatar Hallvard Furuseth
Browse files

ITS#8200 Fix mdb_midl_shrink() usage, return void

parent 91fc43f1
...@@ -2947,8 +2947,8 @@ mdb_txn_reset0(MDB_txn *txn, const char *act) ...@@ -2947,8 +2947,8 @@ mdb_txn_reset0(MDB_txn *txn, const char *act)
} }
if (!txn->mt_parent) { if (!txn->mt_parent) {
if (mdb_midl_shrink(&txn->mt_free_pgs)) mdb_midl_shrink(&txn->mt_free_pgs);
env->me_free_pgs = txn->mt_free_pgs; env->me_free_pgs = txn->mt_free_pgs;
/* me_pgstate: */ /* me_pgstate: */
env->me_pghead = NULL; env->me_pghead = NULL;
env->me_pglast = 0; env->me_pglast = 0;
...@@ -3533,8 +3533,8 @@ mdb_txn_commit(MDB_txn *txn) ...@@ -3533,8 +3533,8 @@ mdb_txn_commit(MDB_txn *txn)
mdb_midl_free(env->me_pghead); mdb_midl_free(env->me_pghead);
env->me_pghead = NULL; env->me_pghead = NULL;
if (mdb_midl_shrink(&txn->mt_free_pgs)) mdb_midl_shrink(&txn->mt_free_pgs);
env->me_free_pgs = txn->mt_free_pgs; env->me_free_pgs = txn->mt_free_pgs;
#if (MDB_DEBUG) > 2 #if (MDB_DEBUG) > 2
mdb_audit(txn); mdb_audit(txn);
......
...@@ -116,7 +116,7 @@ void mdb_midl_free(MDB_IDL ids) ...@@ -116,7 +116,7 @@ void mdb_midl_free(MDB_IDL ids)
free(ids-1); free(ids-1);
} }
int mdb_midl_shrink( MDB_IDL *idp ) void mdb_midl_shrink( MDB_IDL *idp )
{ {
MDB_IDL ids = *idp; MDB_IDL ids = *idp;
if (*(--ids) > MDB_IDL_UM_MAX && if (*(--ids) > MDB_IDL_UM_MAX &&
...@@ -124,9 +124,7 @@ int mdb_midl_shrink( MDB_IDL *idp ) ...@@ -124,9 +124,7 @@ int mdb_midl_shrink( MDB_IDL *idp )
{ {
*ids++ = MDB_IDL_UM_MAX; *ids++ = MDB_IDL_UM_MAX;
*idp = ids; *idp = ids;
return 1;
} }
return 0;
} }
static int mdb_midl_grow( MDB_IDL *idp, int num ) static int mdb_midl_grow( MDB_IDL *idp, int num )
......
...@@ -98,9 +98,8 @@ void mdb_midl_free(MDB_IDL ids); ...@@ -98,9 +98,8 @@ void mdb_midl_free(MDB_IDL ids);
/** Shrink an IDL. /** Shrink an IDL.
* Return the IDL to the default size if it has grown larger. * Return the IDL to the default size if it has grown larger.
* @param[in,out] idp Address of the IDL to shrink. * @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. /** Make room for num additional elements in an IDL.
* @param[in,out] idp Address of the IDL. * @param[in,out] idp Address of the IDL.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment