2005-06-02 Roland McGrath <roland@redhat.com>

	* file.c (printstatfs64): Cast values to unsigned long long and use
	%llu formats.
	Fixes RH#158243.

diff --git a/file.c b/file.c
index 52c36312f30cd270728a198e356f2a3ddb63a55c..db6b60aeb9c05aa539b0715290e7c360172915a0 100644 (file)
--- a/file.c
+++ b/file.c
@@ -1545,30 +1545,19 @@ long addr;
                tprintf("{...}");
                return;
        }
-#ifdef ALPHA
-
-       tprintf("{f_type=%s, f_fbsize=%u, f_blocks=%u, f_bfree=%u, ",
-               sprintfstype(statbuf.f_type),
-               statbuf.f_bsize, statbuf.f_blocks, statbuf.f_bfree);
-       tprintf("f_bavail=%u, f_files=%u, f_ffree=%u, f_fsid={%d, %d}, f_namelen=%u",
-               statbuf.f_bavail,statbuf.f_files, statbuf.f_ffree,
-               statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1],
-               statbuf.f_namelen);
-#else /* !ALPHA */
-       tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
+       tprintf("{f_type=%s, f_bsize=%llu, f_blocks=%llu, f_bfree=%llu, ",
                sprintfstype(statbuf.f_type),
-               (unsigned long)statbuf.f_bsize,
-               (unsigned long)statbuf.f_blocks,
-               (unsigned long)statbuf.f_bfree);
-       tprintf("f_bavail=%lu, f_files=%lu, f_ffree=%lu, f_fsid={%d, %d}",
-               (unsigned long)statbuf.f_bavail,
-               (unsigned long)statbuf.f_files,
-               (unsigned long)statbuf.f_ffree,
+               (unsigned long long)statbuf.f_bsize,
+               (unsigned long long)statbuf.f_blocks,
+               (unsigned long long)statbuf.f_bfree);
+       tprintf("f_bavail=%llu, f_files=%llu, f_ffree=%llu, f_fsid={%d, %d}",
+               (unsigned long long)statbuf.f_bavail,
+               (unsigned long long)statbuf.f_files,
+               (unsigned long long)statbuf.f_ffree,
                statbuf.f_fsid.__val[0], statbuf.f_fsid.__val[1]);
        tprintf(", f_namelen=%lu", (unsigned long)statbuf.f_namelen);
-#endif /* !ALPHA */
 #ifdef _STATFS_F_FRSIZE
-       tprintf(", f_frsize=%lu", (unsigned long)statbuf.f_frsize);
+       tprintf(", f_frsize=%llu", (unsigned long long)statbuf.f_frsize);
 #endif
        tprintf("}");
 }