From 55aa66415c144ddd4521248bf825c8c350d3a777 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Wed, 25 Dec 1996 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 1996-12-25

---
 boot/boot.h           | 2 +-
 boot/doauthenticate.c | 8 +++++---
 pc/devata.c           | 2 +-
 port/devsd.c          | 2 +-
 port/portfns.h        | 4 ++--
 port/qio.c            | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/boot/boot.h b/boot/boot.h
index 59dc3720d36392c4cc3930a17b04a9dd96eeeb4f..0dbc5c5f4ae5594c0428cac0f21287fde80a24f7 100644
--- a/boot/boot.h
+++ b/boot/boot.h
@@ -43,7 +43,7 @@ extern int	nop(int);
 extern int	outin(char*, char*, int);
 extern int	plumb(char*, char*, int*, char*);
 extern int	readfile(char*, char*, int);
-extern int	readn(int, char*, int);
+extern long	readn(int, void*, long);
 extern int	sendmsg(int, char*);
 extern void	setenv(char*, char*);
 extern void	settime(int);
diff --git a/boot/doauthenticate.c b/boot/doauthenticate.c
index 9f5077347b0924c638d00c94ce16f25d188c3b17..5c41444b25f0f36ba1dfa9b4fe3c38d26820d8ed 100644
--- a/boot/doauthenticate.c
+++ b/boot/doauthenticate.c
@@ -6,13 +6,15 @@
 static char *pbmsg = "AS protocol botch";
 static char *ccmsg = "can't connect to AS";
 
-int
-readn(int fd, char *buf, int len)
+long
+readn(int fd, void *buf, long len)
 {
 	int m, n;
+	char *p;
 
+	p = buf;
 	for(n = 0; n < len; n += m){
-		m = read(fd, buf+n, len-n);
+		m = read(fd, p+n, len-n);
 		if(m <= 0)
 			return -1;
 	}
diff --git a/pc/devata.c b/pc/devata.c
index a72e99befba48ae846b5ecc1c59e71a6db1c4f43..3daa201d96c45fc8ff58e03e5bc8c97c3954564c 100644
--- a/pc/devata.c
+++ b/pc/devata.c
@@ -203,7 +203,7 @@ static void	atapipart(Drive*);
 static void	atapiintr(Controller*);
 
 static int
-atagen(Chan *c, Dirtab*, long, long s, Dir *dirp)
+atagen(Chan *c, Dirtab*, int, int s, Dir *dirp)
 {
 	Qid qid;
 	int drive;
diff --git a/port/devsd.c b/port/devsd.c
index 4cf12054e3702565304b62517d9a3abc9b13dee3..0bbd4adf743e4cc0aa5a165856f1fce9f7c5b718 100644
--- a/port/devsd.c
+++ b/port/devsd.c
@@ -69,7 +69,7 @@ static int types[] =
 };
 
 static int
-sdgen(Chan *c, Dirtab*, long, long s, Dir *dirp)
+sdgen(Chan *c, Dirtab*, int, int s, Dir *dirp)
 {
 	Qid qid;
 	Disk *d;
diff --git a/port/portfns.h b/port/portfns.h
index 20dddfdc9b0b072340f79b298ec656603aa50475..ebc052ef2f609e0f571a189309c1e99adf4050c5 100644
--- a/port/portfns.h
+++ b/port/portfns.h
@@ -70,7 +70,7 @@ void		duppage(Page*);
 void		dupswap(Page*);
 int		encrypt(void*, void*, int);
 void		envcpy(Egrp*, Egrp*);
-int		eqchan(Chan*, Chan*, long);
+int		eqchan(Chan*, Chan*, int);
 int		eqqid(Qid, Qid);
 void		error(char*);
 long		execregs(ulong, ulong, ulong);
@@ -197,7 +197,7 @@ void		putpage(Page*);
 void		putseg(Segment*);
 void		putstr(char*);
 void		putstr(char*);
-void		putstrn(char*, long);
+void		putstrn(char*, int);
 void		putswap(Page*);
 ulong		pwait(Waitmsg*);
 Block*		qbread(Queue*, int);
diff --git a/port/qio.c b/port/qio.c
index 7092e456efb01d6108e29e08a148ec8ae68022eb..b9560d9fccf755e9c466ea6d9787717be0034531 100644
--- a/port/qio.c
+++ b/port/qio.c
@@ -589,7 +589,7 @@ qwrite(Queue *q, void *vp, int len)
  *  used by print() to write to a queue.  Since we may be splhi or not in
  *  a process, don't qlock.
  */
-int
+long
 qiwrite(Queue *q, void *vp, int len)
 {
 	int n, sofar, dowakeup;