Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nadezhda Ivanova
OpenLDAP
Commits
90f6fc4b
Commit
90f6fc4b
authored
Jul 19, 2015
by
Hallvard Furuseth
Browse files
ITS#8200 Fix mdb_midl_shrink() usage, return void
parent
91fc43f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
libraries/liblmdb/mdb.c
View file @
90f6fc4b
...
...
@@ -2947,8 +2947,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
;
...
...
@@ -3533,8 +3533,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
);
...
...
libraries/liblmdb/midl.c
View file @
90f6fc4b
...
...
@@ -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
)
...
...
libraries/liblmdb/midl.h
View file @
90f6fc4b
...
...
@@ -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.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment