#%*&*@#(@ sun

kern/Makefile

@@ -36,7 +36,6 @@ OFILES=\
 	qio.$O\
 	qlock.$O\
 	term.$O\
-	todo.$O\
 	uart.$O\
 	waserror.$O\
 	$(OS).$O

kern/dat.h

@@ -236,7 +236,7 @@ struct Dirtab
 	char	name[KNAMELEN];
 	Qid	qid;
 	vlong length;
-	long	perm;
+	ulong	perm;
 };
 
 struct Walkqid

kern/devaudio.c

@@ -45,18 +45,18 @@ static	struct
 	int	irval;
 } volumes[] =
 {
-[Vaudio]		"audio",	Fout, 		50,	50,
-[Vsynth]		"synth",	Fin|Fout,	0,	0,
-[Vcd]		"cd",		Fin|Fout,	0,	0,
-[Vline]		"line",	Fin|Fout,	0,	0,
-[Vmic]		"mic",	Fin|Fout|Fmono,	0,	0,
-[Vspeaker]	"speaker",	Fout|Fmono,	0,	0,
+	"audio",	Fout, 		50,	50,
+	"synth",	Fin|Fout,	0,	0,
+	"cd",		Fin|Fout,	0,	0,
+	"line",	Fin|Fout,	0,	0,
+	"mic",	Fin|Fout|Fmono,	0,	0,
+	"speaker",	Fout|Fmono,	0,	0,
 
-[Vtreb]		"treb",		Fout, 		50,	50,
-[Vbass]		"bass",		Fout, 		50,	50,
+	"treb",		Fout, 		50,	50,
+	"bass",		Fout, 		50,	50,
 
-[Vspeed]	"speed",	Fin|Fout|Fmono,	Speed,	Speed,
-		0
+	"speed",	Fin|Fout|Fmono,	Speed,	Speed,
+	0
 };
 
 static	char	Emode[]		= "illegal open mode";

kern/devcons.c

@@ -6,8 +6,8 @@
 
 #include 	"keyboard.h"
 
-void	(*consdebug)(void) = nil;
-void	(*screenputs)(char*, int) = nil;
+void	(*consdebug)(void) = 0;
+void	(*screenputs)(char*, int) = 0;
 
 Queue*	kbdq;			/* unprocessed console input */
 Queue*	lineq;			/* processed console input */
@@ -86,7 +86,7 @@ return0(void *v)
 void
 printinit(void)
 {
-	lineq = qopen(2*1024, 0, nil, nil);
+	lineq = qopen(2*1024, 0, 0, nil);
 	if(lineq == nil)
 		panic("printinit");
 	qnoblock(lineq, 1);
@@ -332,14 +332,14 @@ echo(char *buf, int n)
 			pagersummary();
 			return;
 		case 'd':
-			if(consdebug == nil)
+			if(consdebug == 0)
 				consdebug = rdb;
 			else
-				consdebug = nil;
+				consdebug = 0;
 			print("consdebug now 0x%p\n", consdebug);
 			return;
 		case 'D':
-			if(consdebug == nil)
+			if(consdebug == 0)
 				consdebug = rdb;
 			consdebug();
 			return;
@@ -363,7 +363,7 @@ echo(char *buf, int n)
 	qproduce(kbdq, buf, n);
 	if(kbd.raw)
 		return;
-	if(screenputs != nil)
+	if(screenputs != 0)
 		echoscreen(buf, n);
 	if(serialoq)
 		echoserialoq(buf, n);

kern/devdraw.c

@@ -1411,7 +1411,7 @@ drawmesg(Client *client, void *av, int n)
 				scrn = dscrn->screen;
 				if(repl || chan!=scrn->image->chan)
 					error("image parameters incompatible with screen");
-				reffn = nil;
+				reffn = 0;
 				switch(refresh){
 				case Refbackup:
 					break;
@@ -1554,9 +1554,9 @@ drawmesg(Client *client, void *av, int n)
 			oy = BGLONG(a+41);
 			op = drawclientop(client);
 			/* high bit indicates arc angles are present */
-			if(ox & (1<<31)){
+			if(ox & (1U<<31)){
 				if((ox & (1<<30)) == 0)
-					ox &= ~(1<<31);
+					ox &= ~(1U<<31);
 				memarc(dst, p, e0, e1, c, src, sp, ox, oy, op);
 			}else
 				memellipse(dst, p, e0, e1, c, src, sp, op);

kern/devmnt.c

@@ -216,7 +216,7 @@ mntversion(Chan *c, char *version, int msize, int returnlen)
 	m->version = nil;
 	kstrdup(&m->version, f.version);
 	m->id = mntalloc.id++;
-	m->q = qopen(10*MAXRPC, 0, nil, nil);
+	m->q = qopen(10*MAXRPC, 0, 0, nil);
 	m->msize = f.msize;
 	unlock(&mntalloc.lk);
 
@@ -970,7 +970,7 @@ mountmux(Mnt *m, Mntrpc *r)
 			}
 			q->done = 1;
 			unlock(&m->lk);
-			if(mntstats != nil)
+			if(mntstats != 0)
 				(*mntstats)(q->request.type,
 					m->c, q->stime,
 					q->reqlen + r->replen);

kern/devtls.c

@@ -467,7 +467,7 @@ tlsopen(Chan *c, int omode)
 			lock(&tr->hqlock);
 			if(tr->handq != nil)
 				error(Einuse);
-			tr->handq = qopen(2 * MaxCipherRecLen, 0, nil, nil);
+			tr->handq = qopen(2 * MaxCipherRecLen, 0, 0, nil);
 			if(tr->handq == nil)
 				error("cannot allocate handshake queue");
 			tr->hqref = 1;