svn commit: r298911 - head/usr.sbin/makefs/ffs

[Marcelo Araujo]

Author: araujo
Date: Mon May  2 01:47:13 2016
New Revision: 298911
URL: https://svnweb.freebsd.org/changeset/base/298911

Log:
  Use MIN/MAX macros from sys/param.h.
  
  MFC after:	2 weeks.

Modified:
  head/usr.sbin/makefs/ffs/mkfs.c

Modified: head/usr.sbin/makefs/ffs/mkfs.c
==============================================================================
--- head/usr.sbin/makefs/ffs/mkfs.c	Mon May  2 01:45:52 2016	(r298910)
+++ head/usr.sbin/makefs/ffs/mkfs.c	Mon May  2 01:47:13 2016	(r298911)
@@ -610,8 +610,7 @@ initcg(int cylno, time_t utime, const fs
 	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_fragshift;
@@ -730,7 +729,7 @@ initcg(int cylno, time_t utime, const fs
 	 * 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);
 	memcpy(&iobuf[start], &acg, sblock.fs_cgsize);
 	if (fsopts->needswap)
 		ffs_cg_swap(&acg, (struct cg*)&iobuf[start], &sblock);