commit - 01d1f4cb4b791eca0bc79bc00188bf3c688290e6
commit + bcac59d81b63c352a9073104e7e63838e117a877
blob - bace6d09de63fc347bf310dedc4dc495db77a5c0
blob + 99033bc8245c72d15460cb03d39769a3332c8788
--- src/cmd/9p.c
+++ src/cmd/9p.c
@@ -336,10 +336,8 @@ timefmt(Fmt *fmt)
 	if((long)(time0-u) < 6*30*86400)
 		return fmtprint(fmt, "%s %2d %02d:%02d",
 			mon[tm->mon], tm->mday, tm->hour, tm->min);
-	else
-		return fmtprint(fmt, "%s %2d %5d",
-			mon[tm->mon], tm->mday, tm->year+1900);
-	return 0;
+	return fmtprint(fmt, "%s %2d %5d",
+		mon[tm->mon], tm->mday, tm->year+1900);
 }
 
 static int
blob - a39abff5facc674ff75e346bc1155a8f52036eb5
blob + cd9d5045eb6e434dda7a2bfe0363c552d6ddd7a0
--- src/cmd/auth/factotum/conv.c
+++ src/cmd/auth/factotum/conv.c
@@ -105,7 +105,7 @@ convgetrpc(Conv *c, int want)
 			return &c->rpc;
 		rpcrespond(c, "phase in state '%s' want '%s'", c->state, rpcname[want]);
 	}
-	return nil;	/* not reached */
+	/* not reached */
 }
 
 /* read until the done function tells us that's enough */
blob - 698d330574df180ddd15b2d8a71cfe3899d5113e
blob + 5e3a64e638159e6d93ac5428781cc0c159882762
--- src/cmd/auth/factotum/fs.c
+++ src/cmd/auth/factotum/fs.c
@@ -159,7 +159,7 @@ readlist(int off, int (*gen)(int, char*, uint), Req *r
 		a += n;
 		off++;
 	}
-	return -1;		/* not reached */
+	/* not reached */
 }
 
 static int
blob - 6571735b4ce14ea2ae4ed3d5aee6eda81f69174d
blob + 64740ae71171f075e7ab8dbdb68ed01815ac79de
--- src/cmd/lex/ncform
+++ src/cmd/lex/ncform
@@ -157,7 +157,7 @@ yylook(void){
 		if(debug)putchar('\n');
 # endif
 		}
-	return(0);	/* shut up the compiler; i have no idea what should be returned */
+	/* not reached */
 	}
 int
 yyback(int *p, int m)
blob - 0f9762ff7ebdf03367bf5a64664043a620c1dd14
blob + a9e1a0aee626ef4f92809dbb6935a30248602f24
--- src/cmd/listen1.c
+++ src/cmd/listen1.c
@@ -102,5 +102,4 @@ main(int argc, char **argv)
 			break;
 		}
 	}
-	exits(nil);
 }
blob - dccfe01d7ba810df6495ce39bfb356d8342623bf
blob + a9a7ef1fff38c89e0506129ddd53cbff43b5e696
--- src/cmd/proof/screen.c
+++ src/cmd/proof/screen.c
@@ -88,7 +88,6 @@ getcmdstr(void)
 			}
 		}
 	}
-	return nil;
 }
 
 static char *
blob - 971848e16bfe7639ebe14252affe6ba43b3f55b3
blob + 0fe6794cfc4cd9e9f960c0260a41c2b5dd7602fa
--- src/cmd/spell/sprog.c
+++ src/cmd/spell/sprog.c
@@ -591,7 +591,6 @@ main(int argc, char *argv[])
 		} else if(affix[0] != 0 && affix[0] != '.')
 			print("%s\t%s\n", affix, original);
 	}
-	exits(0);
 }
 
 /*	strip exactly one suffix and do
blob - 5f6d1a3f7c4b212b3ee9fd2a7adb153ef661c0c5
blob + 37c3a05b3d8bd8e292848826432a827aa8d3ca7a
--- src/cmd/venti/srv/dat.h
+++ src/cmd/venti/srv/dat.h
@@ -75,17 +75,17 @@ enum
 	/*
 	 * magic numbers on disk
 	 */
-	_ClumpMagic		= 0xd15cb10c,	/* clump header, deprecated */
+	_ClumpMagic		= 0xd15cb10cU,	/* clump header, deprecated */
 	ClumpFreeMagic		= 0,		/* free clump; terminates active clump log */
 
-	ArenaPartMagic		= 0xa9e4a5e7,	/* arena partition header */
-	ArenaMagic		= 0xf2a14ead,	/* arena trailer */
-	ArenaHeadMagic		= 0xd15c4ead,	/* arena header */
+	ArenaPartMagic		= 0xa9e4a5e7U,	/* arena partition header */
+	ArenaMagic		= 0xf2a14eadU,	/* arena trailer */
+	ArenaHeadMagic		= 0xd15c4eadU,	/* arena header */
 	
-	BloomMagic		= 0xb1004ead,	/* bloom filter header */
+	BloomMagic		= 0xb1004eadU,	/* bloom filter header */
 	BloomMaxHash	= 32,
 
-	ISectMagic		= 0xd15c5ec7,	/* index header */
+	ISectMagic		= 0xd15c5ec7U,	/* index header */
 
 	ArenaPartVersion	= 3,
 	ArenaVersion4		= 4,
blob - 8e267ce4cf8e7df77c07ac6db1cce37aa9e3281c
blob + cde9a24223e15227879dda7f2e7b96ac419c58bb
--- src/libauthsrv/passtokey.c
+++ src/libauthsrv/passtokey.c
@@ -29,5 +29,4 @@ passtokey(char *key, char *p)
 		}
 		encrypt(key, t, 8);
 	}
-	return 1;	/* not reached */
 }
blob - de37f91c2a9f4cfa8a074c93db1cdfaadd3cc1c9
blob + f03e9c321697881597815e4d43d3b214d2c11e38
--- src/libhttpd/parse.c
+++ src/libhttpd/parse.c
@@ -348,7 +348,6 @@ mimeok(Hlex *h, char *name, int multipart, HContent *h
 		}
 		lex(h);
 	}
-	return head;
 }
 
 /*
@@ -387,7 +386,6 @@ mimeetag(Hlex *h, HETag *head)
 		if(lex(h) != ',')
 			return head;
 	}
-	return head;
 }
 
 /*
@@ -840,8 +838,7 @@ top:
 		}
 		return Word;
 	}
-	goto top;
-	return 0;
+	/* not reached */
 }
 
 /*
blob - 938d0a33d67424291b2611ccad448bda9769e9c3
blob + 98a88369087b577d3c4c49d0768ccc018c33e578
--- src/libhttpd/parsereq.c
+++ src/libhttpd/parsereq.c
@@ -285,7 +285,6 @@ getword(HConnect *c)
 		}
 		ch = getc(c);
 	}
-	return nil;
 }
 
 static int
blob - d09edcb38edf4505497fbc1ebc055fe716a7b805
blob + 4980c2cf0d78f54694d45975bafa45e961420848
--- src/libmach/dwarfcfa.c
+++ src/libmach/dwarfcfa.c
@@ -390,6 +390,6 @@ dexec(DwarfBuf *b, State *s, int locstop)
 			return -1;
 		}
 	}
-	return -1;		/* not reached */		
+	/* not reached */		
 }
 
blob - c985910f213231840e56911ae8d7b7412856815d
blob + fd1e2389ab4ebffc8d5d925e5a74631e0b36fada
--- src/libventi/version.c
+++ src/libventi/version.c
@@ -81,8 +81,12 @@ vtversion(VtConn *z)
 	vtdebug(z, "version string in: %s", buf);
 
 	p = buf+strlen(prefix);
-	for(;;){
+	for(; *p; p=pp){
+		if(*p == ':' || *p == '-')
+			p++;
 		pp = strpbrk(p, ":-");
+		if(pp == nil)
+			pp = p+strlen(p);
 		for(i=0; okvers[i]; i++)
 			if(strlen(okvers[i]) == pp-p && memcmp(okvers[i], p, pp-p) == 0){
 				*pp = 0;