From 459d4a2cc5e6111860f2c6a86117a230d98dd4e9 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Thu, 6 May 1999 18:44:42 +0000
Subject: Fix up a few easy 'assignment used as truth value' and 'suggest
 parens around && within ||' type warnings.  I'm pretty sure I have not masked
 any problems here, I've committed real problem fixes seperately.

---
 sys/dev/rp/rp.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'sys/dev/rp')

diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 39972dd..410a857 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: rp.c,v 1.23 1999/04/24 20:26:12 billf Exp $
+ *	$Id: rp.c,v 1.24 1999/04/27 11:15:12 phk Exp $
  */
 
 /* 
@@ -1555,10 +1555,9 @@ rpwrite(dev, uio, flag)
 	tp = rp->rp_tty;
 	while(rp->rp_disable_writes) {
 		rp->rp_waiting = 1;
-		if(error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH,
-					"rp_write", 0)) {
+		error = ttysleep(tp, (caddr_t)rp, TTOPRI|PCATCH, "rp_write", 0);
+		if (error)
 			return(error);
-		}
 	}
 
 	error = (*linesw[tp->t_line].l_write)(tp, uio, flag);
@@ -1661,7 +1660,7 @@ rpioctl(dev, cmd, data, flag, p)
 		dt->c_lflag = (tp->t_lflag & lt->c_lflag)
 				| (dt->c_lflag & ~lt->c_lflag);
 		for(cc = 0; cc < NCCS; ++cc)
-			if(lt->c_cc[cc] = tp->t_cc[cc])
+			if((lt->c_cc[cc] = tp->t_cc[cc]) != 0)
 				dt->c_cc[cc] = tp->t_cc[cc];
 		if(lt->c_ispeed != 0)
 			dt->c_ispeed = tp->t_ispeed;
-- 
cgit v1.1