svn commit: r298454 - head/usr.sbin/bhyve

[Marcelo Araujo]

Author: araujo
Date: Fri Apr 22 06:25:32 2016
New Revision: 298454
URL: https://svnweb.freebsd.org/changeset/base/298454

Log:
  Use MIN()/MAX() macros from sys/param.h.
  
  Reviewed by:	grehan
  Differential Revision:	https://reviews.freebsd.org/D6054

Modified:
  head/usr.sbin/bhyve/fwctl.c
  head/usr.sbin/bhyve/pci_ahci.c

Modified: head/usr.sbin/bhyve/fwctl.c
==============================================================================
--- head/usr.sbin/bhyve/fwctl.c	Fri Apr 22 06:23:23 2016	(r298453)
+++ head/usr.sbin/bhyve/fwctl.c	Fri Apr 22 06:25:32 2016	(r298454)
@@ -348,7 +348,7 @@ fwctl_request_data(uint32_t value)
 
 	/* Make sure remaining size is >= 0 */
 	rinfo.req_size -= sizeof(uint32_t);
-	remlen = (rinfo.req_size > 0) ? rinfo.req_size: 0;
+	remlen = MAX(rinfo.req_size, 0);
 
 	(*rinfo.req_op->op_data)(value, remlen);
 

Modified: head/usr.sbin/bhyve/pci_ahci.c
==============================================================================
--- head/usr.sbin/bhyve/pci_ahci.c	Fri Apr 22 06:23:23 2016	(r298453)
+++ head/usr.sbin/bhyve/pci_ahci.c	Fri Apr 22 06:25:32 2016	(r298454)
@@ -741,7 +741,7 @@ read_prdt(struct ahci_port *p, int slot,
 
 		dbcsz = (prdt->dbc & DBCMASK) + 1;
 		ptr = paddr_guest2host(ahci_ctx(p->pr_sc), prdt->dba, dbcsz);
-		sublen = len < dbcsz ? len : dbcsz;
+		sublen = MIN(len, dbcsz);
 		memcpy(to, ptr, sublen);
 		len -= sublen;
 		to += sublen;
@@ -847,7 +847,7 @@ write_prdt(struct ahci_port *p, int slot
 
 		dbcsz = (prdt->dbc & DBCMASK) + 1;
 		ptr = paddr_guest2host(ahci_ctx(p->pr_sc), prdt->dba, dbcsz);
-		sublen = len < dbcsz ? len : dbcsz;
+		sublen = MIN(len, dbcsz);
 		memcpy(ptr, from, sublen);
 		len -= sublen;
 		from += sublen;