From 7254edcfafdac8a8fcaca4e23c6d87011337700e Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 29 Oct 1999 19:03:18 +0000 Subject: [PATCH] Don't test boolean return against != 1. Don't needlessly assign the error variable in an if statement. --- sys/dev/pci/pci.c | 8 ++++---- sys/pci/pci.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index a78903e903a8..9a756a873a50 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -662,8 +662,8 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) /* * Check the user's buffer to make sure it's readable. */ - if ((error = useracc((caddr_t)cio->patterns, - cio->pat_buf_len, B_READ)) != 1){ + if (!useracc((caddr_t)cio->patterns, + cio->pat_buf_len, B_READ)) { printf("pci_ioctl: pattern buffer %p, " "length %u isn't user accessible for" " READ\n", cio->patterns, @@ -698,8 +698,8 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) /* * Make sure we can write to the match buffer. */ - if ((error = useracc((caddr_t)cio->matches, cio->match_buf_len, - B_WRITE)) != 1) { + if (!useracc((caddr_t)cio->matches, + cio->match_buf_len, B_WRITE)) { printf("pci_ioctl: match buffer %p, length %u " "isn't user accessible for WRITE\n", cio->matches, cio->match_buf_len); diff --git a/sys/pci/pci.c b/sys/pci/pci.c index a78903e903a8..9a756a873a50 100644 --- a/sys/pci/pci.c +++ b/sys/pci/pci.c @@ -662,8 +662,8 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) /* * Check the user's buffer to make sure it's readable. */ - if ((error = useracc((caddr_t)cio->patterns, - cio->pat_buf_len, B_READ)) != 1){ + if (!useracc((caddr_t)cio->patterns, + cio->pat_buf_len, B_READ)) { printf("pci_ioctl: pattern buffer %p, " "length %u isn't user accessible for" " READ\n", cio->patterns, @@ -698,8 +698,8 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p) /* * Make sure we can write to the match buffer. */ - if ((error = useracc((caddr_t)cio->matches, cio->match_buf_len, - B_WRITE)) != 1) { + if (!useracc((caddr_t)cio->matches, + cio->match_buf_len, B_WRITE)) { printf("pci_ioctl: match buffer %p, length %u " "isn't user accessible for WRITE\n", cio->matches, cio->match_buf_len);