diff options
author | delphij <delphij@FreeBSD.org> | 2009-03-05 00:57:01 +0000 |
---|---|---|
committer | delphij <delphij@FreeBSD.org> | 2009-03-05 00:57:01 +0000 |
commit | 02654885c3218680f7784a94dec913420f7a033e (patch) | |
tree | dca880f0029284c8bf3480757527c76481cbab7e /lib/libc/db/btree/bt_utils.c | |
parent | 1b605ed6f8f06715dccab8708ba5d26251cde30a (diff) | |
download | FreeBSD-src-02654885c3218680f7784a94dec913420f7a033e.zip FreeBSD-src-02654885c3218680f7784a94dec913420f7a033e.tar.gz |
Our realloc(3) and reallocf(3) can handle NULL, which turns it into a
malloc(3) call, so don't test if a pointer is NULL.
Obtained from: OpenBSD (in spirit)
Diffstat (limited to 'lib/libc/db/btree/bt_utils.c')
-rw-r--r-- | lib/libc/db/btree/bt_utils.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/libc/db/btree/bt_utils.c b/lib/libc/db/btree/bt_utils.c index 77ab916..92b76ba 100644 --- a/lib/libc/db/btree/bt_utils.c +++ b/lib/libc/db/btree/bt_utils.c @@ -84,8 +84,7 @@ __bt_ret(BTREE *t, EPG *e, DBT *key, DBT *rkey, DBT *data, DBT *rdata, int copy) key->data = rkey->data; } else if (copy || F_ISSET(t, B_DB_LOCK)) { if (bl->ksize > rkey->size) { - p = (void *)(rkey->data == NULL ? - malloc(bl->ksize) : realloc(rkey->data, bl->ksize)); + p = realloc(rkey->data, bl->ksize); if (p == NULL) return (RET_ERROR); rkey->data = p; @@ -111,9 +110,7 @@ dataonly: } else if (copy || F_ISSET(t, B_DB_LOCK)) { /* Use +1 in case the first record retrieved is 0 length. */ if (bl->dsize + 1 > rdata->size) { - p = (void *)(rdata->data == NULL ? - malloc(bl->dsize + 1) : - realloc(rdata->data, bl->dsize + 1)); + p = realloc(rdata->data, bl->dsize + 1); if (p == NULL) return (RET_ERROR); rdata->data = p; |