diff options
| author |   otto <otto@openbsd.org> | 2005-10-12 07:24:28 +0000 |
|---|---|---|
| committer | otto <otto@openbsd.org> | 2005-10-12 07:24:28 +0000 |
| commit | e86d6fa16b6ad580b0cf47f1829509b390dbe847 (patch) | |
| tree | 8030eb15e242d4f6141db36292ad5f2320feacf2 /lib/libc/db/mpool/mpool.c | |
| parent | also handle network device bootpaths. also tested by drahn and kettenis (diff) | |
| download | wireguard-openbsd-e86d6fa16b6ad580b0cf47f1829509b390dbe847.tar.xz wireguard-openbsd-e86d6fa16b6ad580b0cf47f1829509b390dbe847.zip | |
Use queue macros instead of directly accessing fields. ok millert@
Diffstat (limited to 'lib/libc/db/mpool/mpool.c')
| -rw-r--r-- | lib/libc/db/mpool/mpool.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/libc/db/mpool/mpool.c b/lib/libc/db/mpool/mpool.c index 83791ee37a2..e78c3082478 100644 --- a/lib/libc/db/mpool/mpool.c +++ b/lib/libc/db/mpool/mpool.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpool.c,v 1.15 2005/10/10 19:23:41 otto Exp $ */ +/* $OpenBSD: mpool.c,v 1.16 2005/10/12 07:25:13 otto Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -309,8 +309,7 @@ mpool_sync(MPOOL *mp) BKT *bp; /* Walk the lru chain, flushing any dirty pages to disk. */ - for (bp = mp->lqh.cqh_first; - bp != (void *)&mp->lqh; bp = bp->q.cqe_next) + CIRCLEQ_FOREACH(bp, &mp->lqh, q) if (bp->flags & MPOOL_DIRTY && mpool_write(mp, bp) == RET_ERROR) return (RET_ERROR); @@ -339,8 +338,7 @@ mpool_bkt(MPOOL *mp) * off any lists. If we don't find anything we grow the cache anyway. * The cache never shrinks. */ - for (bp = mp->lqh.cqh_first; - bp != (void *)&mp->lqh; bp = bp->q.cqe_next) + CIRCLEQ_FOREACH(bp, &mp->lqh, q) if (!(bp->flags & MPOOL_PINNED)) { /* Flush if dirty. */ if (bp->flags & MPOOL_DIRTY && @@ -421,7 +419,7 @@ mpool_look(MPOOL *mp, pgno_t pgno) BKT *bp; head = &mp->hqh[HASHKEY(pgno)]; - for (bp = head->cqh_first; bp != (void *)head; bp = bp->hq.cqe_next) + CIRCLEQ_FOREACH(bp, head, hq) if ((bp->pgno == pgno) && ((bp->flags & MPOOL_INUSE) == MPOOL_INUSE)) { #ifdef STATISTICS @@ -465,8 +463,7 @@ mpool_stat(MPOOL *mp) sep = ""; cnt = 0; - for (bp = mp->lqh.cqh_first; - bp != (void *)&mp->lqh; bp = bp->q.cqe_next) { + CIRCLEQ_FOREACH(bp, &mp->lqh, q) { (void)fprintf(stderr, "%s%d", sep, bp->pgno); if (bp->flags & MPOOL_DIRTY) (void)fprintf(stderr, "d"); |