[src/trunk]: src/sys/arch/x68k/stand/boot_ufs Fix in debug code (no functiona...

[itohy <itohy%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a31ae9080d24
branches:  trunk
changeset: 553885:a31ae9080d24
user:      itohy <itohy%NetBSD.org@localhost>
date:      Wed Oct 22 14:18:27 2003 +0000

description:
Fix in debug code (no functional changes).

diffstat:

 sys/arch/x68k/stand/boot_ufs/readufs.h     |  13 +++++++++----
 sys/arch/x68k/stand/boot_ufs/readufs_lfs.c |   8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (70 lines):

diff -r aa44cd758f03 -r a31ae9080d24 sys/arch/x68k/stand/boot_ufs/readufs.h
--- a/sys/arch/x68k/stand/boot_ufs/readufs.h    Wed Oct 22 12:30:39 2003 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/readufs.h    Wed Oct 22 14:18:27 2003 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: readufs.h,v 1.4 2003/04/09 12:57:14 itohy Exp $        */
-/*     from Id: readufs.h,v 1.8 2003/04/08 09:19:32 itohy Exp  */
+/*     $NetBSD: readufs.h,v 1.5 2003/10/22 14:18:27 itohy Exp $        */
+/*     from Id: readufs.h,v 1.9 2003/10/15 14:16:58 itohy Exp  */
 
 /*
  * Written in 1999, 2002, 2003 by ITOH Yasufumi (itohy%netbsd.org@localhost).
@@ -30,6 +30,7 @@
 # define di_common     di2
 #endif
 
+/* for fields of same names and different locations */
 #if !(defined(USE_UFS1) && defined(USE_UFS2))
 # ifdef USE_UFS1
 #  define di_thisver   di1
@@ -39,11 +40,15 @@
 # endif
 #endif
 
+/* this is a size hack */
 #if defined(USE_UFS1) && defined(USE_UFS2)
 # define DI_SIZE(di)   ((di)->di1.di_size)
 #else
 # define DI_SIZE(di)   ((di)->di_thisver.di_size)
 #endif
+/* and may break following fields on UFS2 */
+#define di_gid         di_gid__is_not_available
+#define di_blksize     di_blksize__is_not_available
 
 /*
  * filesystem information
@@ -127,9 +132,9 @@
 
 #ifdef __GNUC__
 # ifndef alloca
-#  define alloca(n)     __builtin_alloca(n)
+#  define alloca(n)    __builtin_alloca(n)
 # endif
 # ifndef strcmp
-#  define strcmp(p, q)  __builtin_strcmp(p, q)
+#  define strcmp(p, q) __builtin_strcmp(p, q)
 # endif
 #endif
diff -r aa44cd758f03 -r a31ae9080d24 sys/arch/x68k/stand/boot_ufs/readufs_lfs.c
--- a/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c        Wed Oct 22 12:30:39 2003 +0000
+++ b/sys/arch/x68k/stand/boot_ufs/readufs_lfs.c        Wed Oct 22 14:18:27 2003 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: readufs_lfs.c,v 1.4 2003/04/09 12:57:14 itohy Exp $    */
-/*     from Id: readufs_lfs.c,v 1.6 2003/04/08 09:19:32 itohy Exp      */
+/*     $NetBSD: readufs_lfs.c,v 1.5 2003/10/22 14:18:27 itohy Exp $    */
+/*     from Id: readufs_lfs.c,v 1.7 2003/10/15 14:16:58 itohy Exp      */
 
 /*
  * FS specific support for 4.4BSD Log-structured Filesystem
@@ -209,9 +209,9 @@
 
 found:
 #ifdef DEBUG_WITH_STDIO
-       printf("LFS: dinode(%d): mode 0%o, nlink %d, inumber %d, size %d, uid %d, gid %d, db[0] %d\n",
+       printf("LFS: dinode(%d): mode 0%o, nlink %d, inumber %d, size %d, uid %d, db[0] %d\n",
                ino, di->di_mode, di->di_nlink, di->di_inumber,
-               (int) di->di_size, di->di_uid, di->di_gid, di->di_db[0]);
+               (int) di->di_size, di->di_uid, di->di_db[0]);
 #endif
 
 #if 0  /* currently UFS1 only */