Unify use of BDB lockers

[openldap] / servers / slapd / back-bdb / nextid.c

diff --git a/servers/slapd/back-bdb/nextid.c b/servers/slapd/back-bdb/nextid.c
index 5f2b6e30a5cc9a95eb4491244b50c6793dd7a9b5..c87c2b68f7dd1d0ab4c16160081ae04069a7df32 100644 (file)
--- a/servers/slapd/back-bdb/nextid.c
+++ b/servers/slapd/back-bdb/nextid.c
@@ -1,8 +1,17 @@
 /* init.c - initialize bdb backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2007 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -28,13 +37,14 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
        struct bdb_info *bdb = (struct bdb_info *) be->be_private;
        int rc;
        ID id = 0;
+       unsigned char idbuf[sizeof(ID)];
        DBT key, data;
        DBC *cursor;
 
        DBTzero( &key );
        key.flags = DB_DBT_USERMEM;
-       key.data = (char *) &id;
-       key.ulen = sizeof( id );
+       key.data = (char *) idbuf;
+       key.ulen = sizeof( idbuf );
 
        DBTzero( &data );
        data.flags = DB_DBT_USERMEM | DB_DBT_PARTIAL;
@@ -43,20 +53,17 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
        rc = bdb->bi_id2entry->bdi_db->cursor( bdb->bi_id2entry->bdi_db,
                tid, &cursor, 0 );
 
-       while (rc == 0) {
+       if (rc == 0) {
                rc = cursor->c_get(cursor, &key, &data, DB_LAST);
                cursor->c_close(cursor);
-               if (rc != 0)
-                       break;
-               break;
        }
 
        switch(rc) {
        case DB_NOTFOUND:
-               id = 0;
                rc = 0;
-               /* FALLTHROUGH */
+               break;
        case 0:
+               BDB_DISK2ID( idbuf, &id );
                break;
 
        default: