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

Merge remote branch 'origin/mdb.master'

Browse Source
This commit is contained in:
Howard Chu 2012-03-08 21:39:01 -08:00
commit cfa8dd6884
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/libmdb/mdb.c
View File

@ -4245,7 +4245,6 @@ new_sub:
* DB are all zero size. * DB are all zero size.
*/ */
if (do_sub) { if (do_sub) {
MDB_db *db;
int xflags; int xflags;
put_sub: put_sub:
xdata.mv_size = 0; xdata.mv_size = 0;
@ -4279,7 +4278,7 @@ put_sub:
xflags |= (flags & MDB_APPEND); xflags |= (flags & MDB_APPEND);
rc = mdb_cursor_put(&mc->mc_xcursor->mx_cursor, data, &xdata, xflags); rc = mdb_cursor_put(&mc->mc_xcursor->mx_cursor, data, &xdata, xflags);
if (flags & F_SUBDATA) { if (flags & F_SUBDATA) {
db = NODEDATA(leaf); void *db = NODEDATA(leaf);
memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db)); memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db));
} }
} }
@ -4329,7 +4328,7 @@ mdb_cursor_del(MDB_cursor *mc, unsigned int flags)
if (mc->mc_xcursor->mx_db.md_entries) { if (mc->mc_xcursor->mx_db.md_entries) {
if (leaf->mn_flags & F_SUBDATA) { if (leaf->mn_flags & F_SUBDATA) {
/* update subDB info */ /* update subDB info */
MDB_db *db = NODEDATA(leaf); void *db = NODEDATA(leaf);
memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db)); memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db));
} else { } else {
/* shrink fake page */ /* shrink fake page */