mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-27 03:20:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2013-03-25 12:16:49 -07:00
commit faf077bd5c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/liblmdb/mdb.c
View File

@ -6403,7 +6403,7 @@ mdb_rebalance(MDB_cursor *mc)
static int
mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
{
int rc;
int rc, eof;
/* add overflow pages to free list */
if (!IS_LEAF2(mc->mc_pg[mc->mc_top]) && F_ISSET(leaf->mn_flags, F_BIGDATA)) {
@ -6421,9 +6421,12 @@ mdb_cursor_del0(MDB_cursor *mc, MDB_node *leaf)
}
mdb_node_del(mc->mc_pg[mc->mc_top], mc->mc_ki[mc->mc_top], mc->mc_db->md_pad);
mc->mc_db->md_entries--;
eof = mc->mc_flags & C_EOF;
rc = mdb_rebalance(mc);
if (rc != MDB_SUCCESS)
mc->mc_txn->mt_flags |= MDB_TXN_ERROR;
else if (eof)
mc->mc_flags &= ~C_INITIALIZED;
return rc;
}

8
libraries/liblmdb/midl.c
View File

@ -117,7 +117,7 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id )
}
#endif
MDB_IDL mdb_midl_alloc()
MDB_IDL mdb_midl_alloc(void)
{
MDB_IDL ids = malloc((MDB_IDL_UM_MAX+1) * sizeof(MDB_ID));
*ids++ = MDB_IDL_UM_MAX;
@ -192,7 +192,7 @@ mdb_midl_sort( MDB_IDL ids )
int i,j,k,l,ir,jstack;
MDB_ID a, itmp;
ir = ids[0];
ir = (int)ids[0];
l = 1;
jstack = 0;
for(;;) {
@ -255,7 +255,7 @@ unsigned mdb_mid2l_search( MDB_ID2L ids, MDB_ID id )
unsigned base = 0;
unsigned cursor = 1;
int val = 0;
unsigned n = ids[0].mid;
unsigned n = (unsigned)ids[0].mid;
while( 0 < n ) {
unsigned pivot = n >> 1;
@ -304,7 +304,7 @@ int mdb_mid2l_insert( MDB_ID2L ids, MDB_ID2 *id )
} else {
/* insert id */
ids[0].mid++;
for (i=ids[0].mid; i>x; i--)
for (i=(unsigned)ids[0].mid; i>x; i--)
ids[i] = ids[i-1];
ids[x] = *id;
}

2
libraries/liblmdb/midl.h
View File

@ -118,7 +118,7 @@ int mdb_midl_insert( MDB_IDL ids, MDB_ID id );
* Allocates memory for an IDL of a default size.
* @return IDL on success, NULL on failure.
*/
MDB_IDL mdb_midl_alloc();
MDB_IDL mdb_midl_alloc(void);
/** Free an IDL.
* @param[in] ids The IDL to free.