fix compilatio problems on LP64

This commit is contained in:
kent 2005-08-20 15:00:27 +00:00
parent 2fd38e91a5
commit ed574610ee
2 changed files with 7 additions and 7 deletions

View File

@ -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 @@ ffs_create_image(const char *image, fsinfo_t *fsopts)
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);
}

View File

@ -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 @@ donames(fd, super, name)
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;
}