# HG changeset patch
# User David du Colombier <0intro@gmail.com>
# Date 1331547753 -3600
# Node ID fbcdd3d2e913ed2a17c8deec225ae526229baa56
# Parent  6d33694b7cf80b47892db0448d94035df9b337d9
nix: sync with plan 9

R=nixiedev, quanstro
CC=nix-dev
http://codereview.appspot.com/5798056

Committer: Francisco J Ballesteros <nemo.mbox@gmail.com>

diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/basename.c
--- a/sys/src/ape/cmd/basename.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/basename.c	Mon Mar 12 11:22:33 2012 +0100
@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 
+void
 main(int argc, char **argv)
 {
 	char *f, *b, *s;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/make/dosys.c
--- a/sys/src/ape/cmd/make/dosys.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/make/dosys.c	Mon Mar 12 11:22:33 2012 +0100
@@ -165,6 +165,7 @@
 sprintf(junk, "spurious return from process %d", pid);
 fatal(junk);
 /*NOTREACHED*/
+return -1;
 }
 
 static int
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/make/gram.y
--- a/sys/src/ape/cmd/make/gram.y	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/make/gram.y	Mon Mar 12 11:22:33 2012 +0100
@@ -438,4 +438,5 @@
 sprintf(buf, "line %d of file %s: %s",
 		yylineno, filestack[ninclude-1].fname, s);
 fatal(buf);
+return 0;
 }
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/make/misc.c
--- a/sys/src/ape/cmd/make/misc.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/make/misc.c	Mon Mar 12 11:22:33 2012 +0100
@@ -190,6 +190,7 @@
 
 fatal("out of memory");
 /* NOTREACHED */
+return 0;
 }
 
 /* copy string a into b, substituting for arguments */
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/pdksh/c_sh.c
--- a/sys/src/ape/cmd/pdksh/c_sh.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/pdksh/c_sh.c	Mon Mar 12 11:22:33 2012 +0100
@@ -614,6 +614,7 @@
 
 	unwind(*wp[0] == 'b' ? LBREAK : LCONTIN);
 	/*NOTREACHED*/
+	return 0;
 }
 
 int
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/sed/sed0.c
--- a/sys/src/ape/cmd/sed/sed0.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/sed/sed0.c	Mon Mar 12 11:22:33 2012 +0100
@@ -20,6 +20,7 @@
 		128
 	};
 
+void
 main(int argc, char **argv)
 {
 
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/cmd/uname.c
--- a/sys/src/ape/cmd/uname.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/cmd/uname.c	Mon Mar 12 11:22:33 2012 +0100
@@ -30,6 +30,7 @@
 	fputs(w, stdout);
 }
 
+void
 main(int argc, char **argv)
 {
 	struct utsname u;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/ap/mips/lock.c
--- a/sys/src/ape/lib/ap/mips/lock.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/ap/mips/lock.c	Mon Mar 12 11:22:33 2012 +0100
@@ -128,6 +128,8 @@
 			}
 		}
 		return 0;
+	default:
+		return 0;
 	}	
 }
 
@@ -168,5 +170,7 @@
 			}
 		}
 		return 1;
+	default:
+		return 0;
 	}	
 }
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/ap/plan9/signal.c
--- a/sys/src/ape/lib/ap/plan9/signal.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/ap/plan9/signal.c	Mon Mar 12 11:22:33 2012 +0100
@@ -111,6 +111,7 @@
 	}
 	_doatexits();
 	_NOTED(1); /* NDFLT */
+	return 0;
 }
 
 int
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/ap/plan9/tcgetattr.c
--- a/sys/src/ape/lib/ap/plan9/tcgetattr.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/ap/plan9/tcgetattr.c	Mon Mar 12 11:22:33 2012 +0100
@@ -144,6 +144,7 @@
 		_syserrno();
 		return -1;
 	}
+	return 0;
 }
 
 pid_t
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/ap/posix/getgrent.c
--- a/sys/src/ape/lib/ap/posix/getgrent.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/ap/posix/getgrent.c	Mon Mar 12 11:22:33 2012 +0100
@@ -13,7 +13,8 @@
 static struct group group;
 static char *gr_mem[MAXGRP];
 
-setgrent()
+void
+setgrent(void)
 {
 	if( !grf )
 		grf = fopen( GROUP, "r" );
@@ -21,7 +22,8 @@
 		rewind( grf );
 }
 
-endgrent()
+void
+endgrent(void)
 {
 	if( grf ){
 		fclose( grf );
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/ap/stdio/strerror.c
--- a/sys/src/ape/lib/ap/stdio/strerror.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/ap/stdio/strerror.c	Mon Mar 12 11:22:33 2012 +0100
@@ -103,4 +103,5 @@
 {
 	strncpy(buf, strerror(n), len);
 	buf[len-1] = 0;
+	return buf;
 }
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/bsd/listen.c
--- a/sys/src/ape/lib/bsd/listen.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/bsd/listen.c	Mon Mar 12 11:22:33 2012 +0100
@@ -109,6 +109,7 @@
 		close(dfd);
 	}
 	exit(0);
+	return 0;
 }
 
 int
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/ape/lib/v/nap.c
--- a/sys/src/ape/lib/v/nap.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/ape/lib/v/nap.c	Mon Mar 12 11:22:33 2012 +0100
@@ -1,3 +1,4 @@
+int
 nap(int n)
 {
 	register i;
@@ -6,4 +7,5 @@
 		for(i = 0; i < 1000*1000*10; i++)
 			;
 	}
+	return 0;
 }
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/grap/main.c
--- a/sys/src/cmd/grap/main.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/grap/main.c	Mon Mar 12 11:22:33 2012 +0100
@@ -34,6 +34,7 @@
 extern void getdata(void);
 extern	int	unlink(char *);
 
+void
 main(int argc, char *argv[])
 {
 	extern void onintr(int), fpecatch(int);
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/lp/lpdaemon.c
--- a/sys/src/cmd/lp/lpdaemon.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/lp/lpdaemon.c	Mon Mar 12 11:22:33 2012 +0100
@@ -319,6 +319,7 @@
 	error("alarm at %d - %s\n", dbgstate, dbgstrings[dbgstate]);
 }
 
+void
 main()
 {
 	unsigned char *ap, *bp, *cp, *savbufpnt;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/lp/lpdsend.c
--- a/sys/src/cmd/lp/lpdsend.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/lp/lpdsend.c	Mon Mar 12 11:22:33 2012 +0100
@@ -278,6 +278,7 @@
 	return addr;
 }
 
+void
 main(int argc, char *argv[])
 {
 	int c, usgflg = 0, inputfd, printerfd, sendport;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/postscript/text2post/text2post.c
--- a/sys/src/cmd/postscript/text2post/text2post.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/postscript/text2post/text2post.c	Mon Mar 12 11:22:33 2012 +0100
@@ -469,6 +469,7 @@
 
 }
 
+void
 main(int argc, char *argv[]) {
 	int i;
 	char *t;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/postscript/tr2post/ps_include.c
--- a/sys/src/cmd/postscript/tr2post/ps_include.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/postscript/tr2post/ps_include.c	Mon Mar 12 11:22:33 2012 +0100
@@ -11,7 +11,7 @@
 typedef struct {long start, end;} Section;
 static char *buf;
 
-static
+static void
 copy(Biobufhdr *fin, Biobufhdr *fout, Section *s) {
 	int cond;
 	if (s->end <= s->start)
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/postscript/tr2post/readDESC.c
--- a/sys/src/cmd/postscript/tr2post/readDESC.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/postscript/tr2post/readDESC.c	Mon Mar 12 11:22:33 2012 +0100
@@ -136,4 +136,5 @@
 		}
 	}
 	Bterm(Bfd);
+	return(TRUE);
 }
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/cmd/postscript/tr2post/tr2post.c
--- a/sys/src/cmd/postscript/tr2post/tr2post.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/cmd/postscript/tr2post/tr2post.c	Mon Mar 12 11:22:33 2012 +0100
@@ -95,6 +95,7 @@
 	remove(tmpfilename);
 }
 
+void
 main(int argc, char *argv[]) {
 	Biobuf *binp;
 	Biobufhdr *Binp;
diff -r 6d33694b7cf8 -r fbcdd3d2e913 sys/src/games/mp3enc/main.c
--- a/sys/src/games/mp3enc/main.c	Mon Mar 12 11:21:28 2012 +0100
+++ b/sys/src/games/mp3enc/main.c	Mon Mar 12 11:22:33 2012 +0100
@@ -290,4 +290,5 @@
 	}
 	close_infile();
 	exit(0);
+	return 0;
 }