upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-20 22:59:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#7775 Drop <assert.h>, drop/replace assert()s.

Browse source 
db_mid2l_insert(): Move assert to mdb.c.
mdb_cursor_set(): Previous assert cannot fail now.
mdb_cursor_put(): Check mc/key and return EINVAL.
mdb_cursor_dbi(): No error return, so just segfault if cursor==NULL.
This commit is contained in:
Hallvard Furuseth 2014-01-06 23:21:54 +01:00
parent 6fb561d33e
commit 5bda3565a9
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
libraries/liblmdb/mdb.c
View file

@ -65,7 +65,6 @@
#include <fcntl.h> #include <fcntl.h>
#endif #endif
#include <assert.h>
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stddef.h> #include <stddef.h>
@ -1701,7 +1700,7 @@ static void
mdb_page_dirty(MDB_txn *txn, MDB_page *mp) mdb_page_dirty(MDB_txn *txn, MDB_page *mp)
{ {
MDB_ID2 mid; MDB_ID2 mid;
int (*insert)(MDB_ID2L, MDB_ID2 *); int rc, (*insert)(MDB_ID2L, MDB_ID2 *);
if (txn->mt_env->me_flags & MDB_WRITEMAP) { if (txn->mt_env->me_flags & MDB_WRITEMAP) {
insert = mdb_mid2l_append; insert = mdb_mid2l_append;
@ -1710,7 +1709,8 @@ mdb_page_dirty(MDB_txn *txn, MDB_page *mp)
} }
mid.mid = mp->mp_pgno; mid.mid = mp->mp_pgno;
mid.mptr = mp; mid.mptr = mp;
insert(txn->mt_u.dirty_list, &mid); rc = insert(txn->mt_u.dirty_list, &mid);
mdb_tassert(txn, rc == 0);
txn->mt_dirty_room--; txn->mt_dirty_room--;
} }
@ -2032,7 +2032,8 @@ mdb_page_touch(MDB_cursor *mc)
return ENOMEM; return ENOMEM;
mid.mid = pgno; mid.mid = pgno;
mid.mptr = np; mid.mptr = np;
mdb_mid2l_insert(dl, &mid); rc = mdb_mid2l_insert(dl, &mid);
mdb_cassert(mc, rc == 0);
} else { } else {
return 0; return 0;
} }
@ -5279,8 +5280,6 @@ mdb_cursor_set(MDB_cursor *mc, MDB_val *key, MDB_val *data,
MDB_node *leaf = NULL; MDB_node *leaf = NULL;
DKBUF; DKBUF;
assert(mc);
mdb_cassert(mc, key);
if (key->mv_size == 0) if (key->mv_size == 0)
return MDB_BAD_VALSIZE; return MDB_BAD_VALSIZE;
@ -5749,7 +5748,7 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
unsigned int flags) unsigned int flags)
{ {
enum { MDB_NO_ROOT = MDB_LAST_ERRCODE+10 }; /* internal code */ enum { MDB_NO_ROOT = MDB_LAST_ERRCODE+10 }; /* internal code */
MDB_env *env = mc->mc_txn->mt_env; MDB_env *env;
MDB_node *leaf = NULL; MDB_node *leaf = NULL;
MDB_page *fp, *mp; MDB_page *fp, *mp;
uint16_t fp_flags; uint16_t fp_flags;
@ -5762,6 +5761,11 @@ mdb_cursor_put(MDB_cursor *mc, MDB_val *key, MDB_val *data,
unsigned int nflags; unsigned int nflags;
DKBUF; DKBUF;
if (mc == NULL || key == NULL)
return EINVAL;
env = mc->mc_txn->mt_env;
/* Check this first so counter will always be zero on any /* Check this first so counter will always be zero on any
* early failures. * early failures.
*/ */
@ -6072,7 +6076,8 @@ current:
return ENOMEM; return ENOMEM;
id2.mid = pg; id2.mid = pg;
id2.mptr = np; id2.mptr = np;
mdb_mid2l_insert(mc->mc_txn->mt_u.dirty_list, &id2); rc = mdb_mid2l_insert(mc->mc_txn->mt_u.dirty_list, &id2);
mdb_cassert(mc, rc == 0);
if (!(flags & MDB_RESERVE)) { if (!(flags & MDB_RESERVE)) {
/* Copy end of page, adjusting alignment so /* Copy end of page, adjusting alignment so
* compiler may copy words instead of bytes. * compiler may copy words instead of bytes.
@ -6835,7 +6840,6 @@ mdb_cursor_txn(MDB_cursor *mc)
MDB_dbi MDB_dbi
mdb_cursor_dbi(MDB_cursor *mc) mdb_cursor_dbi(MDB_cursor *mc)
{ {
assert(mc != NULL);
return mc->mc_dbi; return mc->mc_dbi;
} }

2
libraries/liblmdb/midl.c
View file

@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <sys/types.h> #include <sys/types.h>
#include <assert.h>
#include "midl.h" #include "midl.h"
/** @defgroup internal MDB Internals /** @defgroup internal MDB Internals
@ -306,7 +305,6 @@ int mdb_mid2l_insert( MDB_ID2L ids, MDB_ID2 *id )
unsigned x, i; unsigned x, i;
x = mdb_mid2l_search( ids, id->mid ); x = mdb_mid2l_search( ids, id->mid );
assert( x > 0 );
if( x < 1 ) { if( x < 1 ) {
/* internal error */ /* internal error */