diff options
| author | araujo <araujo@FreeBSD.org> | 2016-04-22 06:25:32 +0000 |
|---|---|---|
| committer | araujo <araujo@FreeBSD.org> | 2016-04-22 06:25:32 +0000 |
| commit | b61063c3bac9349949d71178bcff6dc9e19ef270 (patch) | |
| tree | 2f2a83cfb4c7e86ca4972127dd53ed2f82526299 /usr.sbin | |
| parent | c81163a574f725505781606157ce03ec6f30addc (diff) | |
| download | FreeBSD-src-b61063c3bac9349949d71178bcff6dc9e19ef270.zip FreeBSD-src-b61063c3bac9349949d71178bcff6dc9e19ef270.tar.gz | |
Use MIN()/MAX() macros from sys/param.h.
Reviewed by: grehan
Differential Revision: https://reviews.freebsd.org/D6054
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/bhyve/fwctl.c | 2 | ||||
| -rw-r--r-- | usr.sbin/bhyve/pci_ahci.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/bhyve/fwctl.c b/usr.sbin/bhyve/fwctl.c index 4b6164b..9e90c1a 100644 --- a/usr.sbin/bhyve/fwctl.c +++ b/usr.sbin/bhyve/fwctl.c @@ -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); diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index 2ef60b7..9acb0da 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -741,7 +741,7 @@ read_prdt(struct ahci_port *p, int slot, uint8_t *cfis, 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, uint8_t *cfis, 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; |
