Squash more warnings.

We're down in less than 500 now.

Signed-off-by: Dan Cross <cross@gajendra.net>

sys/src/cmd/bind.c

@@ -35,7 +35,7 @@ main(int argc, char *argv[])
 		usage();
 	}ARGEND
 
-	if(argc != 2 || (flag&MAFTER)&&(flag&MBEFORE))
+	if(argc != 2 || ((flag&MAFTER)&&(flag&MBEFORE)))
 		usage();
 
 	if(bind(argv[0], argv[1], flag) < 0){

sys/src/cmd/cal.c

@@ -136,31 +136,31 @@ struct
 	int	val;
 } dict[] =
 {
-	"jan",		1,
-	"january",	1,
-	"feb",		2,
-	"february",	2,
-	"mar",		3,
-	"march",	3,
-	"apr",		4,
-	"april",	4,
-	"may",		5,
-	"jun",		6,
-	"june",		6,
-	"jul",		7,
-	"july",		7,
-	"aug",		8,
-	"august",	8,
-	"sep",		9,
-	"sept",		9,
-	"september",	9,
-	"oct",		10,
-	"october",	10,
-	"nov",		11,
-	"november",	11,
-	"dec",		12,
-	"december",	12,
-	0
+	{"jan",		1},
+	{"january",	1},
+	{"feb",		2},
+	{"february",	2},
+	{"mar",		3},
+	{"march",	3},
+	{"apr",		4},
+	{"april",	4},
+	{"may",		5},
+	{"jun",		6},
+	{"june",	6},
+	{"jul",		7},
+	{"july",	7},
+	{"aug",		8},
+	{"august",	8},
+	{"sep",		9},
+	{"sept",	9},
+	{"september",	9},
+	{"oct",		10},
+	{"october",	10},
+	{"nov",		11},
+	{"november",	11},
+	{"dec",		12},
+	{"december",	12},
+	{0, 0}
 };
 
 /*
@@ -174,12 +174,12 @@ number(char *str)
 	int n, c;
 	char *s;
 
-	for(n=0; s=dict[n].word; n++)
+	for(n=0; (s=dict[n].word) != nil; n++)
 		if(strcmp(s, str) == 0)
 			return -dict[n].val;
 	n = 0;
 	s = str;
-	while(c = *s++) {
+	while((c = *s++) != 0){
 		if(c<'0' || c>'9')
 			return 0;
 		n = n*10 + c-'0';

sys/src/cmd/cpu.c

@@ -195,7 +195,7 @@ main(int argc, char **argv)
 		cflag++;
 		cmd[0] = '!';
 		cmd[1] = '\0';
-		while(p = ARGF()) {
+		while((p = ARGF()) != nil) {
 			strcat(cmd, " ");
 			strcat(cmd, p);
 		}
@@ -225,7 +225,7 @@ main(int argc, char **argv)
 		system = p;
 	}
 
-	if(err = rexcall(&data, system, srvname))
+	if((err = rexcall(&data, system, srvname)) != 0)
 		fatal(1, "%s: %s", err, system);
 
 	procsetname("%s", origargs);

sys/src/cmd/nm.c

@@ -161,11 +161,12 @@ cmp(const void *vs, const void *vt)
 	const Sym **s = (const Sym**)vs;
 	const Sym **t = (const Sym**)vt;
 
-	if(nflag)
+	if(nflag){
 		if((*s)->value < (*t)->value)
 			return -1;
 		else
 			return (*s)->value > (*t)->value;
+	}
 	return strcmp((*s)->name, (*t)->name);
 }
 /*

sys/src/cmd/nntpfs.c

@@ -147,8 +147,7 @@ Nrdline(Netbuf *n)
 	p[l=Blinelen(&n->br)-1] = '\0';
 	if(l > 0 && p[l-1] == '\r')
 		p[l-1] = '\0';
-if(netdebug)
-	fprint(2, "-> %s\n", p);
+	if(netdebug) fprint(2, "-> %s\n", p);
 	return p;
 }
 
@@ -406,7 +405,7 @@ findgroup(Group *g, char *name, int mk)
 	static int ngroup;
 
 	for(p=name; *p; p=q){
-		if(q = strchr(p, '.'))
+		if((q = strchr(p, '.')) != nil)
 			*q++ = '\0';
 		else
 			q = p+strlen(p);
@@ -544,7 +543,7 @@ nntprefreshall(Netbuf *n)
 	if(nntpcmd(n, "LIST", 21) < 0)
 		return;
 
-	while(p = Nrdline(n)){
+	while((p = Nrdline(n)) != nil){
 		if(strcmp(p, ".")==0)
 			break;
 
@@ -617,7 +616,7 @@ nntppost(Netbuf *n, char *msg)
 		return n->response;
 
 	for(p=msg; *p; p=q){
-		if(q = strchr(p, '\n'))
+		if((q = strchr(p, '\n')) != nil)
 			*q++ = '\0';
 		else
 			q = p+strlen(p);
@@ -745,7 +744,7 @@ fswalk1(Fid *fid, char *name, Qid *qid)
 		}
 		for(i=0; i<Nfile; i++){ 
 			if(strcmp(name, filename[i])==0){
-				if(a->s = nntpget(net, a->g, a->n, nntpname[i])){
+				if((a->s = nntpget(net, a->g, a->n, nntpname[i])) != nil){
 					*qid = (Qid){PATH(a->g->num, a->n), Qbody, 0};
 					fid->qid = *qid;
 					a->file = i;
@@ -772,7 +771,7 @@ fswalk1(Fid *fid, char *name, Qid *qid)
 		return nil;
 	}
 
-	if(ng = findgroup(a->g, name, 0)){
+	if((ng = findgroup(a->g, name, 0)) != nil){
 		a->g = ng;
 		*qid = (Qid){PATH(a->g->num, 0), 0, QTDIR};
 		fid->qid = *qid;

sys/src/cmd/seconds.c

@@ -100,7 +100,7 @@ parsetime(char *time, Tm *tm)
 		return -1;
 
 	/* this may be considered too strict.  garbage at end of time? */
-	return *time == '\0' || isascii(*time) && isspace(*time)? 0: -1;
+	return (*time == '\0' || (isascii(*time) && isspace(*time)))? 0: -1;
 }
 
 /*
@@ -353,129 +353,129 @@ datetoktype(char *s, int *bigvalp)
  */
 static Datetok datetktbl[] = {
 /*	text		token	lexval */
-	"acsst",	Dtz,	63,	/* Cent. Australia */
-	"acst",		Tz,	57,	/* Cent. Australia */
-	"adt",		Dtz,	-18,	/* Atlantic Daylight Time */
-	"aesst",	Dtz,	66,	/* E. Australia */
-	"aest",		Tz,	60,	/* Australia Eastern Std Time */
-	"ahst",		Tz,	60,	/* Alaska-Hawaii Std Time */
-	"am",		Ampm,	AM,
-	"apr",		Month,	4,
-	"april",	Month,	4,
-	"ast",		Tz,	-24,	/* Atlantic Std Time (Canada) */
-	"at",		Ignore,	0,	/* "at" (throwaway) */
-	"aug",		Month,	8,
-	"august",	Month,	8,
-	"awsst",	Dtz,	54,	/* W. Australia */
-	"awst",		Tz,	48,	/* W. Australia */
-	"bst",		Tz,	6,	/* British Summer Time */
-	"bt",		Tz,	18,	/* Baghdad Time */
-	"cadt",		Dtz,	63,	/* Central Australian DST */
-	"cast",		Tz,	57,	/* Central Australian ST */
-	"cat",		Tz,	-60,	/* Central Alaska Time */
-	"cct",		Tz,	48,	/* China Coast */
-	"cdt",		Dtz,	-30,	/* Central Daylight Time */
-	"cet",		Tz,	6,	/* Central European Time */
-	"cetdst",	Dtz,	12,	/* Central European Dayl.Time */
-	"cst",		Tz,	-36,	/* Central Standard Time */
-	"dec",		Month,	12,
-	"decemb",	Month,	12,
-	"dnt",		Tz,	6,	/* Dansk Normal Tid */
-	"dst",		Ignore,	0,
-	"east",		Tz,	-60,	/* East Australian Std Time */
-	"edt",		Dtz,	-24,	/* Eastern Daylight Time */
-	"eet",		Tz,	12,	/* East. Europe, USSR Zone 1 */
-	"eetdst",	Dtz,	18,	/* Eastern Europe */
-	"est",		Tz,	-30,	/* Eastern Standard Time */
-	"feb",		Month,	2,
-	"februa",	Month,	2,
-	"fri",		Ignore,	5,
-	"friday",	Ignore,	5,
-	"fst",		Tz,	6,	/* French Summer Time */
-	"fwt",		Dtz,	12,	/* French Winter Time  */
-	"gmt",		Tz,	0,	/* Greenwish Mean Time */
-	"gst",		Tz,	60,	/* Guam Std Time, USSR Zone 9 */
-	"hdt",		Dtz,	-54,	/* Hawaii/Alaska */
-	"hmt",		Dtz,	18,	/* Hellas ? ? */
-	"hst",		Tz,	-60,	/* Hawaii Std Time */
-	"idle",		Tz,	72,	/* Intl. Date Line, East */
-	"idlw",		Tz,	-72,	/* Intl. Date Line, West */
-	"ist",		Tz,	12,	/* Israel */
-	"it",		Tz,	22,	/* Iran Time */
-	"jan",		Month,	1,
-	"januar",	Month,	1,
-	"jst",		Tz,	54,	/* Japan Std Time,USSR Zone 8 */
-	"jt",		Tz,	45,	/* Java Time */
-	"jul",		Month,	7,
-	"july",		Month,	7,
-	"jun",		Month,	6,
-	"june",		Month,	6,
-	"kst",		Tz,	54,	/* Korea Standard Time */
-	"ligt",		Tz,	60,	/* From Melbourne, Australia */
-	"mar",		Month,	3,
-	"march",	Month,	3,
-	"may",		Month,	5,
-	"mdt",		Dtz,	-36,	/* Mountain Daylight Time */
-	"mest",		Dtz,	12,	/* Middle Europe Summer Time */
-	"met",		Tz,	6,	/* Middle Europe Time */
-	"metdst",	Dtz,	12,	/* Middle Europe Daylight Time*/
-	"mewt",		Tz,	6,	/* Middle Europe Winter Time */
-	"mez",		Tz,	6,	/* Middle Europe Zone */
-	"mon",		Ignore,	1,
-	"monday",	Ignore,	1,
-	"mst",		Tz,	-42,	/* Mountain Standard Time */
-	"mt",		Tz,	51,	/* Moluccas Time */
-	"ndt",		Dtz,	-15,	/* Nfld. Daylight Time */
-	"nft",		Tz,	-21,	/* Newfoundland Standard Time */
-	"nor",		Tz,	6,	/* Norway Standard Time */
-	"nov",		Month,	11,
-	"novemb",	Month,	11,
-	"nst",		Tz,	-21,	/* Nfld. Standard Time */
-	"nt",		Tz,	-66,	/* Nome Time */
-	"nzdt",		Dtz,	78,	/* New Zealand Daylight Time */
-	"nzst",		Tz,	72,	/* New Zealand Standard Time */
-	"nzt",		Tz,	72,	/* New Zealand Time */
-	"oct",		Month,	10,
-	"octobe",	Month,	10,
-	"on",		Ignore,	0,	/* "on" (throwaway) */
-	"pdt",		Dtz,	-42,	/* Pacific Daylight Time */
-	"pm",		Ampm,	PM,
-	"pst",		Tz,	-48,	/* Pacific Standard Time */
-	"sadt",		Dtz,	63,	/* S. Australian Dayl. Time */
-	"sast",		Tz,	57,	/* South Australian Std Time */
-	"sat",		Ignore,	6,
-	"saturd",	Ignore,	6,
-	"sep",		Month,	9,
-	"sept",		Month,	9,
-	"septem",	Month,	9,
-	"set",		Tz,	-6,	/* Seychelles Time ?? */
-	"sst",		Dtz,	12,	/* Swedish Summer Time */
-	"sun",		Ignore,	0,
-	"sunday",	Ignore,	0,
-	"swt",		Tz,	6,	/* Swedish Winter Time  */
-	"thu",		Ignore,	4,
-	"thur",		Ignore,	4,
-	"thurs",	Ignore,	4,
-	"thursd",	Ignore,	4,
-	"tue",		Ignore,	2,
-	"tues",		Ignore,	2,
-	"tuesda",	Ignore,	2,
-	"ut",		Tz,	0,
-	"utc",		Tz,	0,
-	"wadt",		Dtz,	48,	/* West Australian DST */
-	"wast",		Tz,	42,	/* West Australian Std Time */
-	"wat",		Tz,	-6,	/* West Africa Time */
-	"wdt",		Dtz,	54,	/* West Australian DST */
-	"wed",		Ignore,	3,
-	"wednes",	Ignore,	3,
-	"weds",		Ignore,	3,
-	"wet",		Tz,	0,	/* Western Europe */
-	"wetdst",	Dtz,	6,	/* Western Europe */
-	"wst",		Tz,	48,	/* West Australian Std Time */
-	"ydt",		Dtz,	-48,	/* Yukon Daylight Time */
-	"yst",		Tz,	-54,	/* Yukon Standard Time */
-	"zp4",		Tz,	-24,	/* GMT +4  hours. */
-	"zp5",		Tz,	-30,	/* GMT +5  hours. */
-	"zp6",		Tz,	-36,	/* GMT +6  hours. */
+	{"acsst",	Dtz,	63},	/* Cent. Australia */
+	{"acst",	Tz,	57},	/* Cent. Australia */
+	{"adt",		Dtz,	-18},	/* Atlantic Daylight Time */
+	{"aesst",	Dtz,	66},	/* E. Australia */
+	{"aest",	Tz,	60},	/* Australia Eastern Std Time */
+	{"ahst",	Tz,	60},	/* Alaska-Hawaii Std Time */
+	{"am",		Ampm,	AM},
+	{"apr",		Month,	4},
+	{"april",	Month,	4},
+	{"ast",		Tz,	-24},	/* Atlantic Std Time (Canada) */
+	{"at",		Ignore,	0},	/* "at" (throwaway) */
+	{"aug",		Month,	8},
+	{"august",	Month,	8},
+	{"awsst",	Dtz,	54},	/* W. Australia */
+	{"awst",	Tz,	48},	/* W. Australia */
+	{"bst",		Tz,	6},	/* British Summer Time */
+	{"bt",		Tz,	18},	/* Baghdad Time */
+	{"cadt",	Dtz,	63},	/* Central Australian DST */
+	{"cast",	Tz,	57},	/* Central Australian ST */
+	{"cat",		Tz,	-60},	/* Central Alaska Time */
+	{"cct",		Tz,	48},	/* China Coast */
+	{"cdt",		Dtz,	-30},	/* Central Daylight Time */
+	{"cet",		Tz,	6},	/* Central European Time */
+	{"cetdst",	Dtz,	12},	/* Central European Dayl.Time */
+	{"cst",		Tz,	-36},	/* Central Standard Time */
+	{"dec",		Month,	12},
+	{"decemb",	Month,	12},
+	{"dnt",		Tz,	6},	/* Dansk Normal Tid */
+	{"dst",		Ignore,	0},
+	{"east",	Tz,	-60},	/* East Australian Std Time */
+	{"edt",		Dtz,	-24},	/* Eastern Daylight Time */
+	{"eet",		Tz,	12},	/* East. Europe, USSR Zone 1 */
+	{"eetdst",	Dtz,	18},	/* Eastern Europe */
+	{"est",		Tz,	-30},	/* Eastern Standard Time */
+	{"feb",		Month,	2},
+	{"februa",	Month,	2},
+	{"fri",		Ignore,	5},
+	{"friday",	Ignore,	5},
+	{"fst",		Tz,	6},	/* French Summer Time */
+	{"fwt",		Dtz,	12},	/* French Winter Time  */
+	{"gmt",		Tz,	0},	/* Greenwish Mean Time */
+	{"gst",		Tz,	60},	/* Guam Std Time, USSR Zone 9 */
+	{"hdt",		Dtz,	-54},	/* Hawaii/Alaska */
+	{"hmt",		Dtz,	18},	/* Hellas ? ? */
+	{"hst",		Tz,	-60},	/* Hawaii Std Time */
+	{"idle",	Tz,	72},	/* Intl. Date Line, East */
+	{"idlw",	Tz,	-72},	/* Intl. Date Line, West */
+	{"ist",		Tz,	12},	/* Israel */
+	{"it",		Tz,	22},	/* Iran Time */
+	{"jan",		Month,	1},
+	{"januar",	Month,	1},
+	{"jst",		Tz,	54},	/* Japan Std Time,USSR Zone 8 */
+	{"jt",		Tz,	45},	/* Java Time */
+	{"jul",		Month,	7},
+	{"july",	Month,	7},
+	{"jun",		Month,	6},
+	{"june",	Month,	6},
+	{"kst",		Tz,	54},	/* Korea Standard Time */
+	{"ligt",	Tz,	60},	/* From Melbourne, Australia */
+	{"mar",		Month,	3},
+	{"march",	Month,	3},
+	{"may",		Month,	5},
+	{"mdt",		Dtz,	-36},	/* Mountain Daylight Time */
+	{"mest",	Dtz,	12},	/* Middle Europe Summer Time */
+	{"met",		Tz,	6},	/* Middle Europe Time */
+	{"metdst",	Dtz,	12},	/* Middle Europe Daylight Time*/
+	{"mewt",	Tz,	6},	/* Middle Europe Winter Time */
+	{"mez",		Tz,	6},	/* Middle Europe Zone */
+	{"mon",		Ignore,	1},
+	{"monday",	Ignore,	1},
+	{"mst",		Tz,	-42},	/* Mountain Standard Time */
+	{"mt",		Tz,	51},	/* Moluccas Time */
+	{"ndt",		Dtz,	-15},	/* Nfld. Daylight Time */
+	{"nft",		Tz,	-21},	/* Newfoundland Standard Time */
+	{"nor",		Tz,	6},	/* Norway Standard Time */
+	{"nov",		Month,	11},
+	{"novemb",	Month,	11},
+	{"nst",		Tz,	-21},	/* Nfld. Standard Time */
+	{"nt",		Tz,	-66},	/* Nome Time */
+	{"nzdt",	Dtz,	78},	/* New Zealand Daylight Time */
+	{"nzst",	Tz,	72},	/* New Zealand Standard Time */
+	{"nzt",		Tz,	72},	/* New Zealand Time */
+	{"oct",		Month,	10},
+	{"octobe",	Month,	10},
+	{"on",		Ignore,	0},	/* "on" (throwaway) */
+	{"pdt",		Dtz,	-42},	/* Pacific Daylight Time */
+	{"pm",		Ampm,	PM},
+	{"pst",		Tz,	-48},	/* Pacific Standard Time */
+	{"sadt",	Dtz,	63},	/* S. Australian Dayl. Time */
+	{"sast",	Tz,	57},	/* South Australian Std Time */
+	{"sat",		Ignore,	6},
+	{"saturd",	Ignore,	6},
+	{"sep",		Month,	9},
+	{"sept",	Month,	9},
+	{"septem",	Month,	9},
+	{"set",		Tz,	-6},	/* Seychelles Time ?? */
+	{"sst",		Dtz,	12},	/* Swedish Summer Time */
+	{"sun",		Ignore,	0},
+	{"sunday",	Ignore,	0},
+	{"swt",		Tz,	6},	/* Swedish Winter Time  */
+	{"thu",		Ignore,	4},
+	{"thur",	Ignore,	4},
+	{"thurs",	Ignore,	4},
+	{"thursd",	Ignore,	4},
+	{"tue",		Ignore,	2},
+	{"tues",	Ignore,	2},
+	{"tuesda",	Ignore,	2},
+	{"ut",		Tz,	0},
+	{"utc",		Tz,	0},
+	{"wadt",	Dtz,	48},	/* West Australian DST */
+	{"wast",	Tz,	42},	/* West Australian Std Time */
+	{"wat",		Tz,	-6},	/* West Africa Time */
+	{"wdt",		Dtz,	54},	/* West Australian DST */
+	{"wed",		Ignore,	3},
+	{"wednes",	Ignore,	3},
+	{"weds",	Ignore,	3},
+	{"wet",		Tz,	0},	/* Western Europe */
+	{"wetdst",	Dtz,	6},	/* Western Europe */
+	{"wst",		Tz,	48},	/* West Australian Std Time */
+	{"ydt",		Dtz,	-48},	/* Yukon Daylight Time */
+	{"yst",		Tz,	-54},	/* Yukon Standard Time */
+	{"zp4",		Tz,	-24},	/* GMT +4  hours. */
+	{"zp5",		Tz,	-30},	/* GMT +5  hours. */
+	{"zp6",		Tz,	-36},	/* GMT +6  hours. */
 };
 static unsigned szdatetktbl = nelem(datetktbl);

sys/src/cmd/sed.c

@@ -365,7 +365,7 @@ swit:
 
 			if (*lab->uninm == L'\0')		/* no label? */
 				quit(CGMES, L":", linebuf);
-			if(lpt = search(lab)) {
+			if((lpt = search(lab)) != nil) {
 				if(lpt->address)
 					quit("Duplicate labels: %S", linebuf);
 			} else {
@@ -439,7 +439,7 @@ jtcommon:
 				cp++;
 			if(*cp == L'\0' || *cp == L';') {
 				/* no label; jump to end */
-				if(pt = ltab[0].chain) {
+				if((pt = ltab[0].chain) != nil) {
 					while((pt1 = pt->lb1) != nil)
 						pt = pt1;
 					pt->lb1 = rep;
@@ -758,7 +758,7 @@ address(Addr *ap)
 		ap->type = A_DOL;
 	else if(c == '/') {
 		seof = c;
-		if (ap->rp = compile())
+		if ((ap->rp = compile()) != nil)
 			ap->type = A_RE;
 		else
 			ap->type = A_LAST;
@@ -921,7 +921,7 @@ execute(void)
 {
 	SedCom	*ipc;
 
-	while (spend = gline(linebuf)){
+	while ((spend = gline(linebuf)) != nil){
 		for(ipc = pspace; ipc->command; ) {
 			if (!executable(ipc)) {
 				ipc++;
@@ -1057,7 +1057,7 @@ dosub(Rune *rhsbuf)
 	rp = rhsbuf;
 	while (lp < loc1)
 		*sp++ = *lp++;
-	while(c = *rp++) {
+	while((c = *rp++) != nil){
 		if (c == '&') {
 			sp = place(sp, loc1, loc2);
 			continue;
@@ -1079,12 +1079,12 @@ dosub(Rune *rhsbuf)
 	}
 	lp = loc2;
 	loc2 = sp - genbuf + linebuf;
-	while (*sp++ = *lp++)
+	while ((*sp++ = *lp++) != 0)
 		if (sp >= &genbuf[LBSIZE])
 			fprint(2, "sed: Output line too int32_t.\n");
 	lp = linebuf;
 	sp = genbuf;
-	while (*lp++ = *sp++)
+	while ((*lp++ = *sp++) != 0)
 		;
 	spend = lp - 1;
 }
@@ -1160,7 +1160,7 @@ command(SedCom *ipc)
 			}
 		}
 		p1++;
-		while(*p2++ = *p1++)
+		while((*p2++ = *p1++) != 0)
 			;
 		spend = p2 - 1;
 		jflag++;
@@ -1171,7 +1171,7 @@ command(SedCom *ipc)
 	case GCOM:
 		p1 = linebuf;
 		p2 = holdsp;
-		while(*p1++ = *p2++)
+		while((*p1++ = *p2++) != 0)
 			;
 		spend = p1 - 1;
 		break;
@@ -1179,7 +1179,7 @@ command(SedCom *ipc)
 		*spend++ = '\n';
 		p1 = spend;
 		p2 = holdsp;
-		while(*p1++ = *p2++)
+		while((*p1++ = *p2++) != 0)
 			if(p1 >= lbend)
 				break;
 		spend = p1 - 1;
@@ -1187,14 +1187,14 @@ command(SedCom *ipc)
 	case HCOM:
 		p1 = holdsp;
 		p2 = linebuf;
-		while(*p1++ = *p2++);
+		while((*p1++ = *p2++) != 0);
 		hspend = p1 - 1;
 		break;
 	case CHCOM:
 		*hspend++ = '\n';
 		p1 = hspend;
 		p2 = linebuf;
-		while(*p1++ = *p2++)
+		while((*p1++ = *p2++) != 0)
 			if(p1 >= hend)
 				break;
 		hspend = p1 - 1;
@@ -1278,11 +1278,12 @@ cpcom:
 		break;
 	case SCOM:
 		i = substitute(ipc);
-		if(i && ipc->pfl)
+		if(i && ipc->pfl){
 			if(ipc->pfl == 1)
 				putline(&fout, linebuf, spend-linebuf);
 			else
 				goto cpcom;
+		}
 		if(i && ipc->fcode)
 			goto wcom;
 		break;
@@ -1301,11 +1302,11 @@ wcom:
 	case XCOM:
 		p1 = linebuf;
 		p2 = genbuf;
-		while(*p2++ = *p1++)
+		while((*p2++ = *p1++) != 0)
 			;
 		p1 = holdsp;
 		p2 = linebuf;
-		while(*p2++ = *p1++)
+		while((*p2++ = *p1++) != 0)
 			;
 		spend = p2 - 1;
 		p1 = genbuf;

sys/src/cmd/sum.c

@@ -40,7 +40,7 @@ main(int argc, char **argv)
 	}ARGEND
 	if(*argv){
 		while(*argv)
-			if(s = sumfile(*argv++, fn))	/* assign = */
+			if((s = sumfile(*argv++, fn)) != nil)	/* assign = */
 				exitstr = s;
 	}else
 		exitstr = sumfile(0, fn);

sys/src/cmd/test.c

@@ -178,13 +178,14 @@ e3(void)
 	if(EQ(a, "-s"))
 		return(fsizep(nxtarg(0)));
 
-	if(EQ(a, "-t"))
+	if(EQ(a, "-t")){
 		if(ap>=ac)
 			return(isatty(1));
 		else if(nxtintarg(&int1))
 			return(isatty(int1));
 		else
 			synbad("not a valid file descriptor number ", "");
+	}
 
 	if(EQ(a, "-n"))
 		return(!EQ(nxtarg(0), ""));

sys/src/libstdio/dtoa.c

@@ -31,7 +31,7 @@ static double private_mem[PRIVATE_mem], *pmem_next = private_mem;
 #define DBL_MAX_10_EXP	308
 #define DBL_MAX_EXP	1024
 #define FLT_RADIX	2
-#define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+#define Storeinc(a,b,c) (*a++ = ((b << 16) | (c & 0xffff)))
 
 /* Ten_pmax = floor(P*log(2)/log(5)) */
 /* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
@@ -120,7 +120,7 @@ Balloc(int k)
 	unsigned int	len;
 
 	ACQUIRE_DTOA_LOCK(0);
-	if (rv = freelist[k]) {
+	if ((rv = freelist[k]) != nil) {
 		freelist[k] = rv->next;
 	} else {
 		x = 1 << k;
@@ -326,7 +326,7 @@ mult(Bigint *a, Bigint *b)
 	xbe = xb + wb;
 	xc0 = c->x;
 	for (; xb < xbe; xb++, xc0++) {
-		if (y = *xb & 0xffff) {
+		if ((y = *xb & 0xffff) != 0) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -339,7 +339,7 @@ mult(Bigint *a, Bigint *b)
 			} while (x < xae);
 			*xc = carry;
 		}
-		if (y = *xb >> 16) {
+		if ((y = (*xb >> 16)) != 0) {
 			x = xa;
 			xc = xc0;
 			carry = 0;
@@ -370,7 +370,7 @@ pow5mult(Bigint *b, int k)
 	static int	p05[3] = { 
 		5, 25, 125 	};
 
-	if (i = k & 3)
+	if ((i = (k & 3)) != 0)
 		b = multadd(b, p05[i-1], 0);
 
 	if (!(k >>= 2))
@@ -430,7 +430,7 @@ lshift(Bigint *b, int k)
 			*x1++ = *x << k | z;
 			z = *x++ >> k1;
 		} while (x < xe);
-		if (*x1 = z)
+		if ((*x1 = z) != 0)
 			++n1;
 	} else 
 		do
@@ -570,12 +570,12 @@ d2b(double d, int *e, int *bits)
 
 	uls = double2ulongs(d);
 	z = uls.hi & Frac_mask;
-	uls.hi &= 0x7fffffff;		/* clear sign bit, which we ignore */
+	uls.hi &= 0x7fffffff;			/* clear sign bit, which we ignore */
 	de = (int)(uls.hi >> Exp_shift);
 	z |= Exp_msk11;
-	if (y = uls.lo) {		/* assignment = */
-		if (k = lo0bits(&y)) {	/* assignment = */
-			x[0] = y | z << 32 - k;
+	if ((y = uls.lo) != 0) {		/* assignment = */
+		if ((k = lo0bits(&y)) != 0) {	/* assignment = */
+			x[0] = y | z << (32 - k);
 			z >>= k;
 		} else
 			x[0] = y;
@@ -779,7 +779,7 @@ nrv_alloc(char *s, char **rve, int n)
 	char	*rv, *t;
 
 	t = rv = rv_alloc(n);
-	while (*t = *s++) 
+	while ((*t = *s++) != 0)
 		t++;
 	if (rve)
 		*rve = t;
@@ -1019,7 +1019,7 @@ dtoa(double d, int mode, int ndigits, int *decpt, int *sign, char **rve)
 					ds *= bigtens[i];
 				}
 			d /= ds;
-		} else if (j1 = -k) {
+		} else if ((j1 = -k) != 0) {
 			d *= tens[j1 & 0xf];
 			for (j = j1 >> 4; j; j >>= 1, i++)
 				if (j & 1) {
@@ -1093,7 +1093,7 @@ fast_failed:
 			*s++ = '0' + (int)L;
 			if (i == ilim) {
 				d += d;
-				if (d > ds || d == ds && L & 1) {
+				if (d > ds || (d == ds && L & 1)) {
 bump_up:
 					while (*--s == '9')
 						if (s == s0) {
@@ -1150,7 +1150,7 @@ bump_up:
 				Bfree(b);
 				b = b1;
 			}
-			if (j = b5 - m5)
+			if ((j = b5 - m5) != 0)
 				b = pow5mult(b, j);
 		} else
 			b = pow5mult(b, b5);
@@ -1179,7 +1179,7 @@ bump_up:
 	 * and for all and pass them and a shift to quorem, so it
 	 * can do shifts and ors to compute the numerator for q.
 	 */
-	if (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f)
+	if ((i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f) != 0)
 		i = 32 - i;
 	if (i > 4) {
 		i -= 4;
@@ -1250,11 +1250,11 @@ one_digit:
 				*s++ = dig;
 				goto ret;
 			}
-			if (j < 0 || j == 0 && !mode && !(ulsd.lo & 1)) {
+			if (j < 0 || (j == 0 && !mode && !(ulsd.lo & 1))) {
 				if (j1 > 0) {
 					b = lshift(b, 1);
 					j1 = cmp(b, S);
-					if ((j1 > 0 || j1 == 0 && dig & 1)
+					if ((j1 > 0 || (j1 == 0 && dig & 1))
 					     && dig++ == '9')
 						goto round_9_up;
 				}
@@ -1293,7 +1293,7 @@ round_9_up:
 
 	b = lshift(b, 1);
 	j = cmp(b, S);
-	if (j > 0 || j == 0 && dig & 1) {
+	if (j > 0 || (j == 0 && dig & 1)) {
 roundoff:
 		while (*--s == '9')
 			if (s == s0) {

sys/src/libstdio/fflush.c

@@ -16,9 +16,9 @@
  */
 FILE _IO_stream[]={
 /*	fd	flags	state	buf	rp	wp	lp	bufl	unbuf */
-	0,	0,	OPEN,	0,	0,	0,	0,	0,	0,
-	1,	0,	OPEN,	0,	0,	0,	0,	0,	0,
-	2,	0,	OPEN,	0,	0,	0,	0,	0,	0,
+	{0,	0,	OPEN,	0,	0,	0,	0,	0,	{0}},
+	{1,	0,	OPEN,	0,	0,	0,	0,	0,	{0}},
+	{2,	0,	OPEN,	0,	0,	0,	0,	0,	{0}},
 };
 
 int _fflush(FILE *f){

sys/src/libstdio/fgets.c

@@ -20,8 +20,8 @@ char *fgets(char *as, int n, FILE *f){
 		--n;
 		if(c=='\n') break;
 	}
-	if(c==EOF && s==as
-	|| ferror(f)) return NULL;
+	if((c==EOF && s==as) || ferror(f))
+		return NULL;
 	if(n) *s='\0';
 	return as;
 }

sys/src/libstdio/vfscanf.c

@@ -183,7 +183,7 @@ static int icvt_fixed(FILE *f, va_list *args,
 		}
 		break;
 	}
-	while('0'<=c && c<='9' || 'a'<=c && c<='f' || 'A'<=c && c<='F'){
+	while(('0'<=c && c<='9') || ('a'<=c && c<='f') || ('A'<=c && c<='F')){
 		dig='0'<=c && c<='9'?c-'0':'a'<=c && c<='f'?c-'a'+10:c-'A'+10;
 		if(dig>=base) break;
 		ndig++;
@@ -252,7 +252,7 @@ static int icvt_f(FILE *f, va_list *args, int store, int width, int type){
 		*s++=c;
 		wgetc(c, f, Done);
 	}
-	while('0'<=c && c<='9' || ndpt==0 && c=='.'){
+	while(('0'<=c && c<='9') || (ndpt==0 && c=='.')){
 		if(c=='.') ndpt++;
 		else ndig++;
 		*s++=c;
@@ -334,8 +334,8 @@ static int match(int c, const char *pat){
 	}
 	while(pat!=fmtp){
 		if(pat+2<fmtp && pat[1]=='-'){
-			if(pat[0]<=c && c<=pat[2]
-			|| pat[2]<=c && c<=pat[0])
+			if((pat[0]<=c && c<=pat[2])
+			|| (pat[2]<=c && c<=pat[0]))
 				return ok;
 			pat+=2;
 		}

sys/src/libthread/channel.c

@@ -167,7 +167,7 @@ alt(Alt *alts)
 			else
 				allreadycl = 1;
 
-		if(waiting == 0)
+		if(waiting == 0) {
 			if(ca != nil){
 				/* everything was closed, select last channel */
 				ca->err = errcl;
@@ -182,6 +182,7 @@ alt(Alt *alts)
 				t->chan = Channone;
 				return -1;
 			}
+		}
 		/*
 		 * wait for successful rendezvous.
 		 * we can't just give up if the rendezvous

sys/src/libusb/audio/audioctl.c

@@ -27,35 +27,35 @@ Dev *ad;
 
 Audiocontrol controls[2][Ncontrol] = {
 	{
-	[Speed_control] = {		"speed",	0, 0, 0,	44100,	Undef},
-	[Mute_control] = {		"mute",		0, 0, 0,	0,	Undef},
-	[Volume_control] = {		"volume",	0, 0, 0,	0,	Undef},
-	[Bass_control] = {		"bass",		0, 0, 0,	0,	Undef},
-	[Mid_control] = {		"mid",		0, 0, 0,	0,	Undef},
-	[Treble_control] = {		"treble",	0, 0, 0,	0,	Undef},
-	[Equalizer_control] = {		"equalizer",	0, 0, 0,	0,	Undef},
-	[Agc_control] = {		"agc",		0, 0, 0,	0,	Undef},
-	[Delay_control] = {		"delay",	0, 0, 0,	0,	Undef},
-	[Bassboost_control] = {		"bassboost",	0, 0, 0,	0,	Undef},
-	[Loudness_control] = {		"loudness",	0, 0, 0,	0,	Undef},
-	[Channel_control] = {		"channels",	0, 0, 0,	2,	Undef},
-	[Resolution_control] = {	"resolution",	0, 0, 0,	16,	Undef},
-//	[Selector_control] = {		"selector",	0, 0, 0,	0,	Undef},
+	[Speed_control] = {		"speed",	0, 0, 0,	{44100,	Undef}},
+	[Mute_control] = {		"mute",		0, 0, 0,	{0,	Undef}},
+	[Volume_control] = {		"volume",	0, 0, 0,	{0,	Undef}},
+	[Bass_control] = {		"bass",		0, 0, 0,	{0,	Undef}},
+	[Mid_control] = {		"mid",		0, 0, 0,	{0,	Undef}},
+	[Treble_control] = {		"treble",	0, 0, 0,	{0,	Undef}},
+	[Equalizer_control] = {		"equalizer",	0, 0, 0,	{0,	Undef}},
+	[Agc_control] = {		"agc",		0, 0, 0,	{0,	Undef}},
+	[Delay_control] = {		"delay",	0, 0, 0,	{0,	Undef}},
+	[Bassboost_control] = {		"bassboost",	0, 0, 0,	{0,	Undef}},
+	[Loudness_control] = {		"loudness",	0, 0, 0,	{0,	Undef}},
+	[Channel_control] = {		"channels",	0, 0, 0,	{2,	Undef}},
+	[Resolution_control] = {	"resolution",	0, 0, 0,	{16,	Undef}},
+//	[Selector_control] = {		"selector",	0, 0, 0,	{0,	Undef}},
 	}, {
-	[Speed_control] = {		"speed",	0, 0, 0,	44100,	Undef},
-	[Mute_control] = {		"mute",		0, 0, 0,	0,	Undef},
-	[Volume_control] = {		"volume",	0, 0, 0,	0,	Undef},
-	[Bass_control] = {		"bass",		0, 0, 0,	0,	Undef},
-	[Mid_control] = {		"mid",		0, 0, 0,	0,	Undef},
-	[Treble_control] = {		"treble",	0, 0, 0,	0,	Undef},
-	[Equalizer_control] = {		"equalizer",	0, 0, 0,	0,	Undef},
-	[Agc_control] = {		"agc",		0, 0, 0,	0,	Undef},
-	[Delay_control] = {		"delay",	0, 0, 0,	0,	Undef},
-	[Bassboost_control] = {		"bassboost",	0, 0, 0,	0,	Undef},
-	[Loudness_control] = {		"loudness",	0, 0, 0,	0,	Undef},
-	[Channel_control] = {		"channels",	0, 0, 0,	2,	Undef},
-	[Resolution_control] = {	"resolution",	0, 0, 0,	16,	Undef},
-//	[Selector_control] = {		"selector",	0, 0, 0,	0,	Undef},
+	[Speed_control] = {		"speed",	0, 0, 0,	{44100,	Undef}},
+	[Mute_control] = {		"mute",		0, 0, 0,	{0,	Undef}},
+	[Volume_control] = {		"volume",	0, 0, 0,	{0,	Undef}},
+	[Bass_control] = {		"bass",		0, 0, 0,	{0,	Undef}},
+	[Mid_control] = {		"mid",		0, 0, 0,	{0,	Undef}},
+	[Treble_control] = {		"treble",	0, 0, 0,	{0,	Undef}},
+	[Equalizer_control] = {		"equalizer",	0, 0, 0,	{0,	Undef}},
+	[Agc_control] = {		"agc",		0, 0, 0,	{0,	Undef}},
+	[Delay_control] = {		"delay",	0, 0, 0,	{0,	Undef}},
+	[Bassboost_control] = {		"bassboost",	0, 0, 0,	{0,	Undef}},
+	[Loudness_control] = {		"loudness",	0, 0, 0,	{0,	Undef}},
+	[Channel_control] = {		"channels",	0, 0, 0,	{2,	Undef}},
+	[Resolution_control] = {	"resolution",	0, 0, 0,	{16,	Undef}},
+//	[Selector_control] = {		"selector",	0, 0, 0,	{0,	Undef}},
 	}
 };
 

sys/src/libusb/audio/audiofs.c

@@ -480,7 +480,7 @@ readproc(void *x)
 
 	w = x;
 	mdata = emallocz(8*1024+IOHDRSZ, 0);
-	while(event = recvul(w->eventc)){
+	while((event = recvul(w->eventc)) != 0){
 		if(event != Work)
 			continue;
 		f = w->fid;

sys/src/libusb/disk/disk.c

@@ -42,10 +42,10 @@ struct Dirtab
 
 static Dirtab dirtab[] =
 {
-	[Qdir] =	"/",	DMDIR|0555,
-	[Qctl] =	"ctl",	0664,		/* nothing secret here */
-	[Qraw] =	"raw",	0640,
-	[Qdata] =	"data",	0640,
+	[Qdir] =	{"/",	 DMDIR|0555},
+	[Qctl] =	{"ctl",	 0664},		/* nothing secret here */
+	[Qraw] =	{"raw",	 0640},
+	[Qdata] =	{"data", 0640},
 };
 
 /*
@@ -262,11 +262,12 @@ umsrequest(Umsc *umsc, ScsiPtr *cmd, ScsiPtr *data, int *status)
 				memset(data->p + n, 0, left);
 		}
 		nio = n;
-		if(diskdebug)
+		if(diskdebug) {
 			if(n < 0)
 				fprint(2, "disk: data: %r\n");
 			else
 				fprint(2, "disk: data: %d bytes\n", n);
+		}
 		if(n <= 0)
 			if(data->write == 0)
 				unstall(ums->dev, ums->epin, Ein);
@@ -424,7 +425,7 @@ setup(Umsc *lun, char *data, int count, int64_t offset)
 	int32_t nb, lbsize, lbshift, lbmask;
 	uint64_t bno;
 
-	if(count < 0 || lun->ScsiReq.lbsize <= 0 && umscapacity(lun) < 0 ||
+	if(count < 0 || (lun->ScsiReq.lbsize <= 0 && umscapacity(lun) < 0) ||
 	    lun->ScsiReq.lbsize == 0)
 		return -1;
 	lbsize = lun->ScsiReq.lbsize;

sys/src/libusb/disk/scsireq.c

@@ -220,13 +220,14 @@ SRread(ScsiReq *rp, void *buf, int32_t nbytes)
 	int32_t n;
 
 	if(rp->lbsize == 0 || (nbytes % rp->lbsize) || nbytes > Maxiosize){
-		if(diskdebug)
+		if(diskdebug){
 			if (nbytes % rp->lbsize)
 				fprint(2, "disk: i/o size %ld %% %ld != 0\n",
 					nbytes, rp->lbsize);
 			else
 				fprint(2, "disk: i/o size %ld > %d\n",
 					nbytes, Maxiosize);
+		}
 		rp->status = Status_BADARG;
 		return -1;
 	}
@@ -264,7 +265,7 @@ SRread(ScsiReq *rp, void *buf, int32_t nbytes)
 
 	/* device is a tape or something similar */
 	if (rp->sense[2] == Sd2filemark || rp->sense[2] == 0x08 ||
-	    rp->sense[2] & Sd2ili && n > 0)
+	    (rp->sense[2] & Sd2ili && n > 0))
 		rp->data.count = nbytes - n;
 	else
 		return -1;
@@ -284,13 +285,14 @@ SRwrite(ScsiReq *rp, void *buf, int32_t nbytes)
 	int32_t n;
 
 	if(rp->lbsize == 0 || (nbytes % rp->lbsize) || nbytes > Maxiosize){
-		if(diskdebug)
+		if(diskdebug){
 			if (nbytes % rp->lbsize)
 				fprint(2, "disk: i/o size %ld %% %ld != 0\n",
 					nbytes, rp->lbsize);
 			else
 				fprint(2, "disk: i/o size %ld > %d\n",
 					nbytes, Maxiosize);
+		}
 		rp->status = Status_BADARG;
 		return -1;
 	}
@@ -605,7 +607,7 @@ request(int fd, ScsiPtr *cmd, ScsiPtr *data, int *status)
 	/* read status */
 	buf[0] = '\0';
 	r = read(fd, buf, sizeof buf-1);
-	if(exabyte && r <= 0 || !exabyte && r < 0){
+	if((exabyte && r <= 0) || (!exabyte && r < 0)){
 		fprint(2, "scsireq: read status: %r\n");
 		*status = Status_SW;
 		return -1;

sys/src/libusb/ether/ether.c

@@ -104,24 +104,24 @@ Cinfo cinfo[] =
 
 static Dirtab rootdirtab[] =
 {
-	"/",		Qroot,		DMDIR|0555,	/* etherU%d */
-	"clone",	Qclone,		0666,
-	"addr",		Qaddr,		0444,
-	"ifstats",	Qifstats,	0444,
-	"stats",	Qstats,		0444,
+	{"/",		Qroot,		DMDIR|0555},	/* etherU%d */
+	{"clone",	Qclone,		0666},
+	{"addr",	Qaddr,		0444},
+	{"ifstats",	Qifstats,	0444},
+	{"stats",	Qstats,		0444},
 	/* one dir per connection here */
-	nil, 0, 0,
+	{nil, 0, 0},
 };
 
 static Dirtab conndirtab[] =
 {
-	"%d",		Qndir,		DMDIR|0555,
-	"data",		Qndata,		0666,
-	"ctl",		Qnctl,		0666,
-	"ifstats",	Qnifstats,	0444,
-	"stats",	Qnstats,	0444,
-	"type",		Qntype,		0444,
-	nil, 0,
+	{"%d",		Qndir,		DMDIR|0555},
+	{"data",	Qndata,		0666},
+	{"ctl",		Qnctl,		0666},
+	{"ifstats",	Qnifstats,	0444},
+	{"stats",	Qnstats,	0444},
+	{"type",	Qntype,		0444},
+	{nil, 0, 0},
 };
 
 int etherdebug;
@@ -150,7 +150,7 @@ mkqid(int n, int t)
 {
 	uint64_t q;
 
-	q = (n&0xFFFFFF) << 8 | t&0xFF;
+	q = ((n&0xFFFFFF) << 8) | (t&0xFF);
 	return q;
 }
 

sys/src/libusb/kb/kb.c

@@ -291,11 +291,12 @@ ptrrepvals(KDev *kd, Chain *ch, int *px, int *py, int *pb)
 	c = ch->e / 8;
 
 	/* sometimes there is a report id, sometimes not */
-	if(c == kd->templ.sz + 1)
+	if(c == kd->templ.sz + 1) {
 		if(ch->buf[0] == kd->templ.id)
 			ch->b += 8;
 		else
 			return -1;
+	}
 	parsereport(&kd->templ, ch);
 
 	if(kd->debug > 1)
@@ -468,7 +469,7 @@ Repeat:
 	t = 160;
 	for(;;){
 		for(i = 0; i < t; i += 5){
-			if(l = nbrecvul(repeatc))
+			if((l = nbrecvul(repeatc)) != 0)
 				goto Repeat;
 			sleep(5);
 		}
@@ -740,12 +741,13 @@ kbmain(Dev *d, int argc, char* argv[])
 	d->aux = nil;
 	dprint(2, "kb: main: dev %s ref %ld\n", d->dir, d->Ref.ref);
 
-	if(kena)
+	if(kena) {
 		for(i = 0; i < nelem(ud->ep); i++)
 			if((ep = ud->ep[i]) == nil)
 				break;
 			else if(ep->iface->csp == KbdCSP)
 				bootp = 1;
+	}
 
 	for(i = 0; i < nelem(ud->ep); i++){
 		if((ep = ud->ep[i]) == nil)

sys/src/libusb/lib/fsdir.c

@@ -61,12 +61,13 @@ usbfsdirdump(void)
 	qlock(&fslck);
 	fprint(2, "%s: fs list: (%d used %d total)\n", argv0, fsused, nfs);
 	for(i = 1; i < nfs; i++)
-		if(fs[i] != nil)
+		if(fs[i] != nil) {
 			if(fs[i]->dev != nil)
 				fprint(2, "%s\t%s dev %#p refs %ld\n",
 					argv0, fs[i]->name, fs[i]->dev, fs[i]->dev->Ref.ref);
 			else
 				fprint(2, "%s:\t%s\n", argv0, fs[i]->name);
+		}
 	qunlock(&fslck);
 }
 

sys/src/libusb/serial/prolific.c

@@ -386,9 +386,9 @@ plreadstatus(Serialport *p)
 			return -1;
 		}
 	}
-	if(nr < 0)
+	if(nr < 0){
 		dsprint(2, "serial: reading status: %r");
-	else if(nr >= sizeof buf - 1){
+	} else if(nr >= sizeof buf - 1){
 		p->dcd = buf[8] & DcdStatus;
 		p->dsr = buf[8] & DsrStatus;
 		p->cts = buf[8] & BreakerrStatus;
@@ -400,8 +400,9 @@ plreadstatus(Serialport *p)
 			p->nparityerr++;
 		if(buf[8] & OvererrStatus)
 			p->novererr++;
-	} else
+	} else {
 		dsprint(2, "serial: bad status read %d\n", nr);
+	}
 	dsprint(2, "serial: finished read from interrupt %d\n", nr);
 	qunlock(&ser->QLock);
 	return 0;

sys/src/libusb/serial/serial.c

@@ -41,9 +41,9 @@ struct Dirtab {
 };
 
 static Dirtab dirtab[] = {
-	[Qroot] =	"/",		DMDIR|0555,
-	[Qdata] =	"%s",		0660,
-	[Qctl] =	"%sctl",	0664,
+	[Qroot] =	{"/",		DMDIR|0555},
+	[Qdata] =	{"%s",		0660},
+	[Qctl] =	{"%sctl",	0664},
 };
 
 /* someday? static int sdebug; */
@@ -112,12 +112,13 @@ serialreset(Serial *ser)
 int
 serialrecover(Serial *ser, Serialport *p, Dev *ep, char *err)
 {
-	if(p != nil)
+	if(p != nil) {
 		dprint(2, "serial[%d], %s: %s, level %d\n", p->interfc,
 			p->name, err, ser->recover);
-	else
+	} else {
 		dprint(2, "serial[%s], global error, level %d\n",
 			ser->p[0].name, ser->recover);
+	}
 	ser->recover++;
 	if(strstr(err, "detached") != nil)
 		return -1;