must cast di_size passed to printf

[unix-history] / usr / src / sys / ufs / lfs / lfs_debug.c

diff --git a/usr/src/sys/ufs/lfs/lfs_debug.c b/usr/src/sys/ufs/lfs/lfs_debug.c
index 6832995..0eb7201 100644 (file)
--- a/usr/src/sys/ufs/lfs/lfs_debug.c
+++ b/usr/src/sys/ufs/lfs/lfs_debug.c
@@ -1,10 +1,10 @@
 /*
 /*

- * Copyright (c) 1989, 1991 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.

  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *
  * All rights reserved.
  *
  * %sccs.include.redist.c%
  *

- *     @(#)lfs_debug.c 5.4 (Berkeley) %G%
+ *     @(#)lfs_debug.c 7.3 (Berkeley) %G%

  */
 
 #ifdef DEBUG
  */
 
 #ifdef DEBUG


@@ -12,15 +12,15 @@
 #include <sys/namei.h>
 #include <sys/vnode.h>
 
 #include <sys/namei.h>
 #include <sys/vnode.h>
 

-#include <ufs/quota.h>
-#include <ufs/inode.h>
+#include <ufs/ufs/quota.h>
+#include <ufs/ufs/inode.h>

 
 

-#include <lfs/lfs.h>
-#include <lfs/lfs_extern.h>
+#include <ufs/lfs/lfs.h>
+#include <ufs/lfs/lfs_extern.h>

 
 void 
 lfs_dump_super(lfsp)
 
 void 
 lfs_dump_super(lfsp)

-       LFS *lfsp;
+       struct lfs *lfsp;

 {
        int i;
 
 {
        int i;
 


@@ -91,7 +91,7 @@ lfs_dump_dinode(dip)
                "nlink ", dip->di_nlink,
                "uid   ", dip->di_uid,
                "gid   ", dip->di_gid,
                "nlink ", dip->di_nlink,
                "uid   ", dip->di_uid,
                "gid   ", dip->di_gid,

-               "size  ", dip->di_size);
+               "size  ", (u_long)dip->di_size);

        (void)printf("inum  %d\n", dip->di_inum);
        (void)printf("Direct Addresses\n");
        for (i = 0; i < NDADDR; i++) {
        (void)printf("inum  %d\n", dip->di_inum);
        (void)printf("Direct Addresses\n");
        for (i = 0; i < NDADDR; i++) {


@@ -145,12 +145,12 @@ lfs_vinvalbuf(vp)
                else
                        break;
                for (bp = blist; bp; bp = nbp) {
                else
                        break;
                for (bp = blist; bp; bp = nbp) {

-printf("lfs_vinvalbuf: ino %d, lblkno %d, blkno %lx flags %xl\n",
-VTOI(vp)->i_number, bp->b_lblkno, bp->b_blkno, bp->b_flags);
+       printf("lfs_vinvalbuf: ino %d, lblkno %d, blkno %lx flags %xl\n",
+            VTOI(vp)->i_number, bp->b_lblkno, bp->b_blkno, bp->b_flags);

                        nbp = bp->b_blockf;
                        s = splbio();
                        if (bp->b_flags & B_BUSY) {
                        nbp = bp->b_blockf;
                        s = splbio();
                        if (bp->b_flags & B_BUSY) {

-printf("lfs_vinvalbuf: buffer busy, would normally sleep\n");
+       printf("lfs_vinvalbuf: buffer busy, would normally sleep\n");

 /*
                                bp->b_flags |= B_WANTED;
                                sleep((caddr_t)bp, PRIBIO + 1);
 /*
                                bp->b_flags |= B_WANTED;
                                sleep((caddr_t)bp, PRIBIO + 1);


@@ -163,7 +163,7 @@ printf("lfs_vinvalbuf: buffer busy, would normally sleep\n");
                        splx(s);
                        if (bp->b_flags & B_DELWRI) {
                                dirty++;                        /* XXX */
                        splx(s);
                        if (bp->b_flags & B_DELWRI) {
                                dirty++;                        /* XXX */

-printf("lfs_vinvalbuf: buffer dirty (DELWRI). would normally write\n");
+       printf("lfs_vinvalbuf: buffer dirty (DELWRI). would normally write\n");

                                break;
                        }
                        if (bp->b_vp != vp)
                                break;
                        }
                        if (bp->b_vp != vp)