remove mpool_getf

bouyer-socketcan
christos 2016-09-24 21:18:09 +00:00
parent bb0514ffb3
commit 2b55b3112e
2 changed files with 5 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: mpool.h,v 1.15 2016/09/24 20:11:43 christos Exp $ */
/* $NetBSD: mpool.h,v 1.16 2016/09/24 21:18:09 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -102,8 +102,7 @@ void mpool_filter(MPOOL *, void (*)(void *, pgno_t, void *),
void *mpool_new(MPOOL *, pgno_t *);
void *mpool_newf(MPOOL *, pgno_t *, unsigned int);
int mpool_delete(MPOOL *, void *);
void *mpool_get(MPOOL *, pgno_t);
void *mpool_getf(MPOOL *, pgno_t, unsigned int);
void *mpool_get(MPOOL *, pgno_t, unsigned int);
int mpool_put(MPOOL *, void *, unsigned int);
int mpool_sync(MPOOL *);
int mpool_close(MPOOL *);

View File

@ -1,4 +1,4 @@
/* $NetBSD: h_db.c,v 1.2 2016/09/24 20:12:33 christos Exp $ */
/* $NetBSD: h_db.c,v 1.3 2016/09/24 21:18:22 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1992, 1993, 1994\
#if 0
static char sccsid[] = "@(#)dbtest.c 8.17 (Berkeley) 9/1/94";
#else
__RCSID("$NetBSD: h_db.c,v 1.2 2016/09/24 20:12:33 christos Exp $");
__RCSID("$NetBSD: h_db.c,v 1.3 2016/09/24 21:18:22 christos Exp $");
#endif
#endif /* not lint */
@ -529,7 +529,7 @@ unlinkpg(DB *dbp)
for (pg = P_ROOT; pg < t->bt_mp->npages;
mpool_put(t->bt_mp, h, 0), pg++) {
if ((h = mpool_getf(t->bt_mp, pg, 0)) == NULL)
if ((h = mpool_get(t->bt_mp, pg, 0)) == NULL)
break;
/* Look for a nonempty leaf page that has both left
* and right siblings. */