From 9a4a264bb0c904805d0e914655b3a1d6b4852705 Mon Sep 17 00:00:00 2001 From: araujo Date: Mon, 2 May 2016 00:45:46 +0000 Subject: [PATCH] Use MIN()/MAX() macros from sys/param.h. Reviewed by: trasz MFC after: 2 weeks. Differential Revision: https://reviews.freebsd.org/D6118 --- sbin/newfs/mkfs.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sbin/newfs/mkfs.c b/sbin/newfs/mkfs.c index ee6ed96da1a..b7369784993 100644 --- a/sbin/newfs/mkfs.c +++ b/sbin/newfs/mkfs.c @@ -613,8 +613,7 @@ mkfs(struct partition *pp, char *fsys) } for (i = 0; i < sblock.fs_cssize; i += sblock.fs_bsize) wtfs(fsbtodb(&sblock, sblock.fs_csaddr + numfrags(&sblock, i)), - sblock.fs_cssize - i < sblock.fs_bsize ? - sblock.fs_cssize - i : sblock.fs_bsize, + MIN(sblock.fs_cssize - i, sblock.fs_bsize), ((char *)fscs) + i); /* * Update information about this partition in pack @@ -660,8 +659,7 @@ initcg(int cylno, time_t utime) acg.cg_magic = CG_MAGIC; acg.cg_cgx = cylno; acg.cg_niblk = sblock.fs_ipg; - acg.cg_initediblk = sblock.fs_ipg < 2 * INOPB(&sblock) ? - sblock.fs_ipg : 2 * INOPB(&sblock); + acg.cg_initediblk = MIN(sblock.fs_ipg, 2 * INOPB(&sblock)); acg.cg_ndblk = dmax - cbase; if (sblock.fs_contigsumsize > 0) acg.cg_nclusterblks = acg.cg_ndblk / sblock.fs_frag; @@ -771,7 +769,7 @@ initcg(int cylno, time_t utime) * Write out the duplicate super block, the cylinder group map * and two blocks worth of inodes in a single write. */ - start = sblock.fs_bsize > SBLOCKSIZE ? sblock.fs_bsize : SBLOCKSIZE; + start = MAX(sblock.fs_bsize, SBLOCKSIZE); bcopy((char *)&acg, &iobuf[start], sblock.fs_cgsize); start += sblock.fs_bsize; dp1 = (struct ufs1_dinode *)(&iobuf[start]); -- 2.45.2