From 968c0b406d3d8ddc896002c0aba96f76d4a0d38d Mon Sep 17 00:00:00 2001 From: "Pedro F. Giffuni" Date: Tue, 26 Apr 2016 01:17:05 +0000 Subject: [PATCH] libc: make more use of the howmany() macro when available. We have a howmany() macro in the header that is convenient to re-use as it makes things easier to read. --- lib/libc/db/btree/bt_open.c | 2 +- lib/libc/db/hash/hash.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/libc/db/btree/bt_open.c b/lib/libc/db/btree/bt_open.c index 051fc28e93f6..640a6699a4d8 100644 --- a/lib/libc/db/btree/bt_open.c +++ b/lib/libc/db/btree/bt_open.c @@ -277,7 +277,7 @@ __bt_open(const char *fname, int flags, int mode, const BTREEINFO *openinfo, int b.cachesize = b.psize * MINCACHE; /* Calculate number of pages to cache. */ - ncache = (b.cachesize + t->bt_psize - 1) / t->bt_psize; + ncache = howmany(b.cachesize, t->bt_psize); /* * The btree data structure requires that at least two keys can fit on diff --git a/lib/libc/db/hash/hash.c b/lib/libc/db/hash/hash.c index f7b14276000c..c7dc4e78b595 100644 --- a/lib/libc/db/hash/hash.c +++ b/lib/libc/db/hash/hash.c @@ -160,8 +160,7 @@ __hash_open(const char *file, int flags, int mode, * maximum bucket number, so the number of buckets is * max_bucket + 1. */ - nsegs = (hashp->MAX_BUCKET + 1 + hashp->SGSIZE - 1) / - hashp->SGSIZE; + nsegs = howmany(hashp->MAX_BUCKET + 1, hashp->SGSIZE); if (alloc_segs(hashp, nsegs)) /* * If alloc_segs fails, table will have been destroyed