9 files changed, 25 insertions(+), 20 deletions(-)

M ip/icmp.c
M pc/ether82543gc.c
M pc/etherelnk3.c
M pc/sdata.c
M pc/vgact65545.c
M pc/vgaet4000.c
M pc/vgamach64xx.c
M port/devns16552.c
M port/portfns.h

@@ 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);
 

@@ 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);

@@ 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:

@@ 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;

@@ 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

@@ 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

@@ 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);
 		}

@@ 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 */

@@ 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);