Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sup/source fix size_t issues on _LP64



details:   https://anonhg.NetBSD.org/src/rev/56dca1090c94
branches:  trunk
changeset: 748255:56dca1090c94
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Oct 18 15:23:54 2009 +0000

description:
fix size_t issues on _LP64

diffstat:

 usr.sbin/sup/source/ffilecopy.c |  4 ++--
 usr.sbin/sup/source/scmio.c     |  7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diffs (46 lines):

diff -r 607cebe6c2a4 -r 56dca1090c94 usr.sbin/sup/source/ffilecopy.c
--- a/usr.sbin/sup/source/ffilecopy.c   Sun Oct 18 15:14:13 2009 +0000
+++ b/usr.sbin/sup/source/ffilecopy.c   Sun Oct 18 15:23:54 2009 +0000
@@ -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;
diff -r 607cebe6c2a4 -r 56dca1090c94 usr.sbin/sup/source/scmio.c
--- a/usr.sbin/sup/source/scmio.c       Sun Oct 18 15:14:13 2009 +0000
+++ b/usr.sbin/sup/source/scmio.c       Sun Oct 18 15:23:54 2009 +0000
@@ -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);



Home | Main Index | Thread Index | Old Index