Module Name: src
Committed By: perseant
Date: Wed Jul 3 21:56:17 UTC 2024
Modified Files:
src/sbin/fsck_exfatfs [perseant-exfatfs]: pass1.c pass2.c
src/sbin/newfs_exfatfs [perseant-exfatfs]: make_exfatfs.c
src/usr.sbin/dumpexfatfs [perseant-exfatfs]: dumpexfatfs.c
Log Message:
Fix format size mismatch bugs, allowing build on 32-bit platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/fsck_exfatfs/pass1.c \
src/sbin/fsck_exfatfs/pass2.c
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sbin/newfs_exfatfs/make_exfatfs.c
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/usr.sbin/dumpexfatfs/dumpexfatfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_exfatfs/pass1.c
diff -u src/sbin/fsck_exfatfs/pass1.c:1.1.2.1 src/sbin/fsck_exfatfs/pass1.c:1.1.2.2
--- src/sbin/fsck_exfatfs/pass1.c:1.1.2.1 Sat Jun 29 19:43:25 2024
+++ src/sbin/fsck_exfatfs/pass1.c Wed Jul 3 21:56:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pass1.c,v 1.1.2.1 2024/06/29 19:43:25 perseant Exp $ */
+/* $NetBSD: pass1.c,v 1.1.2.2 2024/07/03 21:56:17 perseant Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -287,7 +287,7 @@ validfunc(void *arg, struct xfinode *xip
exfatfs_get_file_name(xip, ucs2, &len, sizeof ucs2);
exfatfs_ucs2utf8str(ucs2, len, utf8, NAME_MAX);
printf("nv=%d scan directory 0x%lx, %s\n",
- nvnodes, INUM(xip), utf8);
+ nvnodes, (unsigned long)INUM(xip), utf8);
assert(xip->xi_serial == dserial);
}
pass1_recursive(vp, vdp);
Index: src/sbin/fsck_exfatfs/pass2.c
diff -u src/sbin/fsck_exfatfs/pass2.c:1.1.2.1 src/sbin/fsck_exfatfs/pass2.c:1.1.2.2
--- src/sbin/fsck_exfatfs/pass2.c:1.1.2.1 Sat Jun 29 19:43:25 2024
+++ src/sbin/fsck_exfatfs/pass2.c Wed Jul 3 21:56:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: pass2.c,v 1.1.2.1 2024/06/29 19:43:25 perseant Exp $ */
+/* $NetBSD: pass2.c,v 1.1.2.2 2024/07/03 21:56:17 perseant Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -94,14 +94,14 @@ pass2(struct exfatfs *fs, uint8_t *obser
continue;
++problems;
if (isset(observed_bitmap, base + off)) {
- pwarn("AT PHYSICAL DISK ADDRESS 0x%lx size %zu offset %lu/%lu\n", bp->b_blkno, size, (unsigned long)off, (unsigned long)(size * NBBY));
+ pwarn("AT PHYSICAL DISK ADDRESS 0x%lx size %zu offset %lu/%lu\n", (unsigned long)bp->b_blkno, size, (unsigned long)off, (unsigned long)(size * NBBY));
pwarn("UNALLOCATED CLUSTER %lu IN USE\n", (unsigned long)base + off + 2);
if (Pflag || reply("ALLOCATE") == 1) {
setbit(bp->b_data, off - base);
modified = 1;
}
} else {
- pwarn("AT PHYSICAL DISK ADDRESS 0x%lx size %zu offset %lu/%lu\n", bp->b_blkno, size, (unsigned long)off, (unsigned long)(size * NBBY));
+ pwarn("AT PHYSICAL DISK ADDRESS 0x%lx size %zu offset %lu/%lu\n", (unsigned long)bp->b_blkno, size, (unsigned long)off, (unsigned long)(size * NBBY));
pwarn("ALLOCATED CLUSTER %lu NOT IN USE\n", (unsigned long)base + off + 2);
if (Pflag || reply("CLEAR") == 1) {
clrbit(bp->b_data, off - base);
Index: src/sbin/newfs_exfatfs/make_exfatfs.c
diff -u src/sbin/newfs_exfatfs/make_exfatfs.c:1.1.2.1 src/sbin/newfs_exfatfs/make_exfatfs.c:1.1.2.2
--- src/sbin/newfs_exfatfs/make_exfatfs.c:1.1.2.1 Sat Jun 29 19:43:25 2024
+++ src/sbin/newfs_exfatfs/make_exfatfs.c Wed Jul 3 21:56:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: make_exfatfs.c,v 1.1.2.1 2024/06/29 19:43:25 perseant Exp $ */
+/* $NetBSD: make_exfatfs.c,v 1.1.2.2 2024/07/03 21:56:17 perseant Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#if 0
static char sccsid[] = "@(#)lfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: make_exfatfs.c,v 1.1.2.1 2024/06/29 19:43:25 perseant Exp $");
+__RCSID("$NetBSD: make_exfatfs.c,v 1.1.2.2 2024/07/03 21:56:17 perseant Exp $");
#endif
#endif /* not lint */
@@ -698,7 +698,7 @@ make_exfatfs(int devfd, uint secsize, st
bit = ((i - start) & (NBBY - 1));
byte = (i - start) / NBBY;
if (Vflag)
- printf(" set bit %d byte %d bn 0x%lx for cluster %lld\n", bit, byte, bp->b_blkno, (long long)i);
+ printf(" set bit %d byte %d bn 0x%lx for cluster %lld\n", bit, byte, (unsigned long)bp->b_blkno, (long long)i);
((char *)bp->b_data)[byte] |= (1 << bit);
}
if (Vflag)
Index: src/usr.sbin/dumpexfatfs/dumpexfatfs.c
diff -u src/usr.sbin/dumpexfatfs/dumpexfatfs.c:1.1.2.2 src/usr.sbin/dumpexfatfs/dumpexfatfs.c:1.1.2.3
--- src/usr.sbin/dumpexfatfs/dumpexfatfs.c:1.1.2.2 Tue Jul 2 20:36:51 2024
+++ src/usr.sbin/dumpexfatfs/dumpexfatfs.c Wed Jul 3 21:56:17 2024
@@ -337,7 +337,7 @@ void print_upcase_table(struct exfatfs *
int i, subclust;
struct buf *bp;
- printf("Upcase Table (%ld entries):", len / 2);
+ printf("Upcase Table (%ld entries):", (long)len / 2);
do {
for (subclust = 0; subclust < (1 << fs->xf_SectorsPerClusterShift); ++subclust) {
/* Retrieve the block */
@@ -445,7 +445,7 @@ void print_dir(struct exfatfs *fs, uint3
++nsecfound;
if (action == ACTION_PRINT)
- printf("Entry %ld: type 0x%2.2hhx\n", off, dp[0]);
+ printf("Entry %ld: type 0x%2.2hhx\n", (long)off, dp[0]);
switch (dp[0]) {
case XD_ENTRYTYPE_EOD:
if (action == ACTION_PRINT)
