Source-Changes-HG archive

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

[src/trunk]: src/usr.sbin fix compilatio problems on LP64



details:   https://anonhg.NetBSD.org/src/rev/30b10c9f5eed
branches:  trunk
changeset: 583727:30b10c9f5eed
user:      kent <kent%NetBSD.org@localhost>
date:      Sat Aug 20 15:00:27 2005 +0000

description:
fix compilatio problems on LP64

diffstat:

 usr.sbin/makefs/ffs.c |  6 +++---
 usr.sbin/quot/quot.c  |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (58 lines):

diff -r 0446a707234c -r 30b10c9f5eed usr.sbin/makefs/ffs.c
--- a/usr.sbin/makefs/ffs.c     Sat Aug 20 14:59:20 2005 +0000
+++ b/usr.sbin/makefs/ffs.c     Sat Aug 20 15:00:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs.c,v 1.35 2005/08/13 01:49:35 fvdl Exp $    */
+/*     $NetBSD: ffs.c,v 1.36 2005/08/20 15:00:27 kent Exp $    */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
 
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.35 2005/08/13 01:49:35 fvdl Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.36 2005/08/20 15:00:27 kent Exp $");
 #endif /* !__lint */
 
 #include <sys/param.h>
@@ -536,7 +536,7 @@
                warnx(
                "Image file `%s' has %lld free inodes; %lld are required.",
                    image,
-                   (long long)fs->fs_cstotal.cs_nifree + ROOTINO,
+                   (long long)(fs->fs_cstotal.cs_nifree + ROOTINO),
                    (long long)fsopts->inodes);
                return (-1);
        }
diff -r 0446a707234c -r 30b10c9f5eed usr.sbin/quot/quot.c
--- a/usr.sbin/quot/quot.c      Sat Aug 20 14:59:20 2005 +0000
+++ b/usr.sbin/quot/quot.c      Sat Aug 20 15:00:27 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quot.c,v 1.25 2005/08/19 02:09:50 christos Exp $       */
+/*     $NetBSD: quot.c,v 1.26 2005/08/20 15:00:27 kent Exp $   */
 
 /*
  * Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -33,7 +33,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: quot.c,v 1.25 2005/08/19 02:09:50 christos Exp $");
+__RCSID("$NetBSD: quot.c,v 1.26 2005/08/20 15:00:27 kent Exp $");
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -484,10 +484,10 @@
                while ((c = getchar()) != EOF && c != '\n');
        ungetc(c, stdin);
        inode1 = -1;
-       while (scanf("%llu", &inode) == 1) {
+       while (scanf("%" SCNu64, &inode) == 1) {
                if (inode < 0 || inode > maxino) {
 #ifndef        COMPAT
-                       warnx("invalid inode %llu", (unsigned long long)inode);
+                       warnx("invalid inode %" PRIu64, inode);
 #endif
                        return;
                }



Home | Main Index | Thread Index | Old Index