]> git.sur5r.net Git - openldap/commitdiff
ITS#7191 more alignment tweaks
authorHoward Chu <hyc@symas.com>
Fri, 9 Mar 2012 05:28:24 +0000 (21:28 -0800)
committerQuanah Gibson-Mount <quanah@openldap.org>
Fri, 9 Mar 2012 19:21:27 +0000 (11:21 -0800)
Revealed when gcc optimization is enabled

libraries/libmdb/mdb.c

index 1249e58596d50560e50f79cb147086b5b7878fdd..88970e2a10f3feeb922cb6e8026777051af5ea89 100644 (file)
@@ -4245,7 +4245,6 @@ new_sub:
                 * DB are all zero size.
                 */
                if (do_sub) {
-                       MDB_db *db;
                        int xflags;
 put_sub:
                        xdata.mv_size = 0;
@@ -4279,7 +4278,7 @@ put_sub:
                        xflags |= (flags & MDB_APPEND);
                        rc = mdb_cursor_put(&mc->mc_xcursor->mx_cursor, data, &xdata, xflags);
                        if (flags & F_SUBDATA) {
-                               db = NODEDATA(leaf);
+                               void *db = NODEDATA(leaf);
                                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 (leaf->mn_flags & F_SUBDATA) {
                                        /* update subDB info */
-                                       MDB_db *db = NODEDATA(leaf);
+                                       void *db = NODEDATA(leaf);
                                        memcpy(db, &mc->mc_xcursor->mx_db, sizeof(MDB_db));
                                } else {
                                        /* shrink fake page */