From 689e8fdddcba12c9948e9496df2ac0d6ab838958 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Fri, 18 May 2001 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2001-05-18

---
 ip/icmp.c         |  2 +-
 pc/ether82543gc.c |  5 +++--
 pc/etherelnk3.c   | 10 ++++++----
 pc/sdata.c        |  5 +++--
 pc/vgact65545.c   |  5 +++--
 pc/vgaet4000.c    |  5 +++--
 pc/vgamach64xx.c  |  5 +++--
 port/devns16552.c |  6 ++----
 port/portfns.h    |  2 +-
 9 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ip/icmp.c b/ip/icmp.c
index f74a3fa72ef88c57b0453059adbb080a7d8a2447..1bab0c58cb46baa5d0837955a16230670f986f45 100644
--- a/ip/icmp.c
+++ b/ip/icmp.c
@@ -130,7 +130,7 @@ icmpannounce(Conv *c, char **argv, int argc)
 	char *e;
 
 	e = Fsstdannounce(c, argv, argc);
-	if(e != nil);
+	if(e != nil)
 		return e;
 	Fsconnected(c, nil);
 
diff --git a/pc/ether82543gc.c b/pc/ether82543gc.c
index 9d9234a834f4b19c2ad05c53b9b2385a6f080696..a8dae02e2d0f7e12beb7d4bcc4d70997c0764df4 100644
--- a/pc/ether82543gc.c
+++ b/pc/ether82543gc.c
@@ -545,8 +545,9 @@ gc82543replenish(Ctlr* ctlr)
 	rdt = ctlr->rdt;
 	while(NEXT(rdt, Nrdesc) != ctlr->rdh){
 		rdesc = &ctlr->rdba[rdt];
-		if(ctlr->rb[rdt] != nil)
-			;
+		if(ctlr->rb[rdt] != nil){
+			/* nothing to do */
+		}
 		else if((bp = iallocb(2048)) != nil){
 			ctlr->rb[rdt] = bp;
 			rdesc->addr[0] = PCIWADDR(bp->rp);
diff --git a/pc/etherelnk3.c b/pc/etherelnk3.c
index 86a2a04c30663d8c4dd74129fc83a884462514e0..e20615388b76c35141a516b1360108013cab45a2 100644
--- a/pc/etherelnk3.c
+++ b/pc/etherelnk3.c
@@ -1905,14 +1905,16 @@ etherelnk3reset(Ether* ether)
 			ether->mbps = 100;
 			setfullduplex(port);
 		}
-		else if(anar & 0x0200)		/* 100BASE-T4 */
-			;
+		else if(anar & 0x0200){		/* 100BASE-T4 */
+			/* nothing to do */
+		}
 		else if(anar & 0x0080)		/* 100BASE-TX */
 			ether->mbps = 100;
 		else if(anar & 0x0040)		/* 10BASE-TFD */
 			setfullduplex(port);
-		else				/* 10BASE-T */
-			;
+		else{				/* 10BASE-T */
+			/* nothing to do */
+		}
 		break;
 
 	case xcvr100BaseTX:
diff --git a/pc/sdata.c b/pc/sdata.c
index 69969bc29bbb5c119bac65e60e89986169027aeb..aae76241bd67582434a6b5fa6304f28a6fa4ab3e 100644
--- a/pc/sdata.c
+++ b/pc/sdata.c
@@ -369,8 +369,9 @@ ataready(int cmdport, int ctlport, int dev, int reset, int ready, int micro)
 		 * can be used as a test for !Bsy.
 		 */
 		as = inb(ctlport+As);
-		if(as & reset)
-			;
+		if(as & reset){
+			/* nothing to do */
+		}
 		else if(dev){
 			outb(cmdport+Dh, dev);
 			dev = 0;
diff --git a/pc/vgact65545.c b/pc/vgact65545.c
index 1f8f92b9bf311e8f3a31fdf7afe8febfbc93f011..9a1467ac919fa0d94c1274ef27792c6c07861768 100644
--- a/pc/vgact65545.c
+++ b/pc/vgact65545.c
@@ -66,8 +66,9 @@ ct65545initcursor(VGAscr* scr, int xo, int yo, int index)
 		and = 0;
 		xor = 0;
 		for(i = 0; i < 16; i++){
-			if(set & (1<<i))
-				;
+			if(set & (1<<i)){
+				/* nothing to do */
+			}
 			else if(clr & (1<<i))
 				xor |= 1<<i;
 			else
diff --git a/pc/vgaet4000.c b/pc/vgaet4000.c
index 069806d766e28247729b038d01dea2592773909b..f3ede446f6f85162fd10884417c1d2b605ada464 100644
--- a/pc/vgaet4000.c
+++ b/pc/vgaet4000.c
@@ -168,8 +168,9 @@ et4000load(VGAscr *scr, Cursor *c)
 
 				p = 0x0000;
 				for(i = 0; i < 8; i++){
-					if(p1 & (1<<(7-i)))
-						;
+					if(p1 & (1<<(7-i))){
+						/* nothing to do */
+					}
 					else if(p0 & (1<<(7-i)))
 						p |= 0x01<<(2*i);
 					else
diff --git a/pc/vgamach64xx.c b/pc/vgamach64xx.c
index 44967cd2ca0fbe9692b7b23edb447d47875f64b9..7a7b7da523ca54caf7a69a7a37087244b8e2277b 100644
--- a/pc/vgamach64xx.c
+++ b/pc/vgamach64xx.c
@@ -510,8 +510,9 @@ mach64xxcurload(VGAscr* scr, Cursor* curs)
 		for(i = 0; i < 16; i++){
 			if(s & (1<<(15-i)))
 				m |= 0x01<<(2*i);
-			else if(c & (1<<(15-i)))
-				;
+			else if(c & (1<<(15-i))){
+				/* noting to do */
+			}
 			else
 				m |= 0x02<<(2*i);
 		}
diff --git a/port/devns16552.c b/port/devns16552.c
index 1878a90bc36a624dd20a775dadcd77c81cf6f2b7..89f484ca80e3826089e0ebb1570afef9b4c55d0a 100644
--- a/port/devns16552.c
+++ b/port/devns16552.c
@@ -311,10 +311,8 @@ ns16552fifo(Uart *p, int n)
 
 	/* empty buffer and interrupt conditions */
 	for(i = 0; i < 16; i++){
-		if(uartrdreg(p, Istat))
-			;
-		if(uartrdreg(p, Data))
-			;
+		uartrdreg(p, Istat);
+		uartrdreg(p, Data);
 	}
 
 	/* turn on fifo */
diff --git a/port/portfns.h b/port/portfns.h
index ab1eec41606796cc752549a22ba8d3034f075e0f..60465091d2a83e3e0a29c0dc33f96170d49845cd 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -7,7 +7,7 @@ void		alarmkproc(void*);
 Block*		allocb(int);
 int		anyhigher(void);
 int		anyready(void);
-#define	assert(x)	if(x);else panic("assert(x) failed");
+#define	assert(x)	if(x){}else panic("assert(x) failed");
 void		_assert(char*);
 Image*		attachimage(int, Chan*, ulong, ulong);
 long		authcheck(Chan*, char*, int);