Module Name: src
Committed By: christos
Date: Sun Oct 18 15:23:54 UTC 2009
Modified Files:
src/usr.sbin/sup/source: ffilecopy.c scmio.c
Log Message:
fix size_t issues on _LP64
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sup/source/ffilecopy.c
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/sup/source/scmio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sup/source/ffilecopy.c
diff -u src/usr.sbin/sup/source/ffilecopy.c:1.10 src/usr.sbin/sup/source/ffilecopy.c:1.11
--- src/usr.sbin/sup/source/ffilecopy.c:1.10 Sat Oct 17 18:26:13 2009
+++ src/usr.sbin/sup/source/ffilecopy.c Sun Oct 18 11:23:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ffilecopy.c,v 1.10 2009/10/17 22:26:13 christos Exp $ */
+/* $NetBSD: ffilecopy.c,v 1.11 2009/10/18 15:23:54 christos Exp $ */
/*
* Copyright (c) 1991 Carnegie Mellon University
@@ -96,7 +96,7 @@
*
*/
-int
+ssize_t
ffilecopy(FILE * here, FILE * there)
{
int i, herefile, therefile;
Index: src/usr.sbin/sup/source/scmio.c
diff -u src/usr.sbin/sup/source/scmio.c:1.18 src/usr.sbin/sup/source/scmio.c:1.19
--- src/usr.sbin/sup/source/scmio.c:1.18 Sat Oct 17 18:26:13 2009
+++ src/usr.sbin/sup/source/scmio.c Sun Oct 18 11:23:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: scmio.c,v 1.18 2009/10/17 22:26:13 christos Exp $ */
+/* $NetBSD: scmio.c,v 1.19 2009/10/18 15:23:54 christos Exp $ */
/*
* Copyright (c) 1992 Carnegie Mellon University
@@ -256,7 +256,8 @@
return (scmerr(-1, "Write retries failed"));
}
if (x != count)
- return (scmerr(-1, "Write error on network returned %d on write of %d", x, count));
+ return (scmerr(-1, "Write error on network returned %d "
+ "on write of %zu", x, count));
return (SCMOK);
}
@@ -434,7 +435,7 @@
if (push) {
if (bufptr + count < buffer)
- return (scmerr(-1, "No space in buffer %d", count));
+ return (scmerr(-1, "No space in buffer %zu", count));
bufptr -= count;
bufcnt += count;
memcpy(bufptr, data, -count);
