type mismatches in bin (int vs ssize_t)

[Vink Joris <nimadeus@pandora.be>]

Index: cat/cat.c
===================================================================
RCS file: /cvs/src/bin/cat/cat.c,v
retrieving revision 1.15
diff -u -r1.15 cat.c
--- cat/cat.c	2 Jun 2003 23:32:06 -0000	1.15
+++ cat/cat.c	5 Jan 2004 16:32:43 -0000
@@ -228,7 +228,8 @@
 void
 raw_cat(int rfd)
 {
-	int nr, nw, off, wfd;
+	int nw, off, wfd;
+	ssize_t nr;
 	static int bsize;
 	static char *buf;
 	struct stat sbuf;
Index: df/df.c
===================================================================
RCS file: /cvs/src/bin/df/df.c,v
retrieving revision 1.37
diff -u -r1.37 df.c
--- df/df.c	29 Jul 2003 00:24:15 -0000	1.37
+++ df/df.c	5 Jan 2004 16:32:44 -0000
@@ -462,7 +462,7 @@
 int
 bread(int rfd, off_t off, void *buf, int cnt)
 {
-	int nr;
+	ssize_t nr;
 
 	(void)lseek(rfd, off, SEEK_SET);
 	if ((nr = read(rfd, buf, cnt)) != cnt) {
Index: ksh/exec.c
===================================================================
RCS file: /cvs/src/bin/ksh/exec.c,v
retrieving revision 1.31
diff -u -r1.31 exec.c
--- ksh/exec.c	15 Dec 2003 05:25:52 -0000	1.31
+++ ksh/exec.c	5 Jan 2004 16:32:47 -0000
@@ -768,7 +768,8 @@
 	{
 		char buf[LINE];
 		register char *cp;
-		register int fd, n;
+		register int fd;
+		ssize_t n;
 
 		buf[0] = '\0';
 		if ((fd = open(tp->str, O_RDONLY)) >= 0) {
Index: ksh/misc.c
===================================================================
RCS file: /cvs/src/bin/ksh/misc.c,v
retrieving revision 1.20
diff -u -r1.20 misc.c
--- ksh/misc.c	22 Oct 2003 07:40:38 -0000	1.20
+++ ksh/misc.c	5 Jan 2004 16:32:49 -0000
@@ -1211,7 +1211,7 @@
 	char *buf;
 	int nbytes;
 {
-	int ret;
+	ssize_t ret;
 	int tried_reset = 0;
 
 	while ((ret = read(fd, buf, nbytes)) < 0) {
Index: mv/mv.c
===================================================================
RCS file: /cvs/src/bin/mv/mv.c,v
retrieving revision 1.29
diff -u -r1.29 mv.c
--- mv/mv.c	29 Jul 2003 00:24:15 -0000	1.29
+++ mv/mv.c	5 Jan 2004 16:32:49 -0000
@@ -271,7 +271,8 @@
 	struct timeval tval[2];
 	static u_int blen;
 	static char *bp;
-	int nread, from_fd, to_fd;
+	ssize_t nread;
+	int from_fd, to_fd;
 	int badchown = 0, serrno = 0;
 
 	if ((from_fd = open(from, O_RDONLY, 0)) < 0) {
Index: pax/ar_io.c
===================================================================
RCS file: /cvs/src/bin/pax/ar_io.c,v
retrieving revision 1.34
diff -u -r1.34 ar_io.c
--- pax/ar_io.c	8 Sep 2003 20:19:51 -0000	1.34
+++ pax/ar_io.c	5 Jan 2004 16:32:52 -0000
@@ -421,7 +421,7 @@
 void
 ar_drain(void)
 {
-	int res;
+	ssize_t res;
 	char drbuf[MAXBLK];
 
 	/*
@@ -515,7 +515,7 @@
 int
 ar_read(char *buf, int cnt)
 {
-	int res = 0;
+	ssize_t res = 0;
 
 	/*
 	 * if last i/o was in error, no more reads until reset or new volume
@@ -994,7 +994,7 @@
 get_phys(void)
 {
 	int padsz = 0;
-	int res;
+	ssize_t res;
 	int phyblk;
 	struct mtop mb;
 	char scbuf[MAXBLK];
Index: rcp/rcp.c
===================================================================
RCS file: /cvs/src/bin/rcp/rcp.c,v
retrieving revision 1.38
diff -u -r1.38 rcp.c
--- rcp/rcp.c	29 Jul 2003 00:24:16 -0000	1.38
+++ rcp/rcp.c	5 Jan 2004 16:32:53 -0000
@@ -391,7 +391,8 @@
 	static BUF buffer;
 	BUF *bp;
 	off_t i;
-	int amt, fd, haderr, indx, result;
+	int amt, fd, haderr, indx;
+	ssize_t result;
 	char *last, *name, buf[BUFSIZ];
 	int len;
 
@@ -538,7 +539,8 @@
 	struct timeval tv[2];
 	enum { YES, NO, DISPLAYED } wrerr;
 	BUF *bp;
-	off_t i, j, size;
+	off_t i, size;
+	ssize_t j;
 	int amt, count, exists, first, mask, mode, ofd, omode;
 	int setimes, targisdir, wrerrno = 0;
 	char ch, *cp, *np, *targ, *why, *vect[1], buf[BUFSIZ];




-- 
Best regards,

[-----------------------------------------]
[ Joris Vink - nimadeus(at)pandora(dot)be ]
[ Programmer / OpenBSD Support 		  ]
[ OpenBSD - current 			  ]
[ http://users.pandora.be/nimadeus/       ]
[-----------------------------------------]