2000-03-09 Roland McGrath <roland@baalperazim.frob.com>

	* balloc.c (ext2_free_blocks, ext2_new_block): Fix formats to avoid
	-Wformat warnings.
	* getblk.c (ext2_alloc_block, inode_getblk, ext2_getblk): Likewise.
	* ialloc.c (ext2_count_free_inodes): Likewise.
	* truncate.c (trunc_direct): Likewise.
	* pager.c (pending_blocks_write, diskfs_grow): Likewise.

5 files changed, 20 insertions, 20 deletions

diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c
index 437febaa..a53e1116 100644
--- a/ext2fs/balloc.c
+++ b/ext2fs/balloc.c
@@ -1,6 +1,6 @@
 /* Block allocation routines
 
-   Copyright (C) 1995, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,99,2000 Free Software Foundation, Inc.
 
    Converted to work under the hurd by Miles Bader <miles@gnu.org>
 
@@ -74,7 +74,7 @@ ext2_free_blocks (block_t block, unsigned long count)
       return;
     }
 
-  ext2_debug ("freeing block %lu[%lu]", block, count);
+  ext2_debug ("freeing block %u[%lu]", block, count);
 
   do
     {
@@ -162,7 +162,7 @@ ext2_new_block (block_t goal,
     }
 #endif
 
-  ext2_debug ("goal=%lu", goal);
+  ext2_debug ("goal=%u", goal);
 
 repeat:
   /*
@@ -341,7 +341,7 @@ got_block:
 	}
       gdp->bg_free_blocks_count -= *prealloc_count;
       sblock->s_free_blocks_count -= *prealloc_count;
-      ext2_debug ("preallocated a further %lu bits", *prealloc_count);
+      ext2_debug ("preallocated a further %u bits", *prealloc_count);
     }
 #endif
 
@@ -394,7 +394,7 @@ ext2_count_free_blocks ()
 	      i, gdp->bg_free_blocks_count, x);
       bitmap_count += x;
     }
-  printf ("ext2_count_free_blocks: stored = %lu, computed = %lu, %lu",
+  printf ("ext2_count_free_blocks: stored = %u, computed = %lu, %lu",
 	  sblock->s_free_blocks_count, desc_count, bitmap_count);
   spin_unlock (&global_lock);
   return bitmap_count;
diff --git a/ext2fs/getblk.c b/ext2fs/getblk.c
index 5dea8f30..5858daba 100644
--- a/ext2fs/getblk.c
+++ b/ext2fs/getblk.c
@@ -1,6 +1,6 @@
 /* File block to disk block mapping routines
 
-   Copyright (C) 1995,96,99 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,99,2000 Free Software Foundation, Inc.
 
    Converted to work under the hurd by Miles Bader <miles@gnu.org>
 
@@ -78,7 +78,7 @@ ext2_alloc_block (struct node *node, block_t goal, int zero)
     {
       result = node->dn->info.i_prealloc_block++;
       node->dn->info.i_prealloc_count--;
-      ext2_debug ("preallocation hit (%lu/%lu) => %lu",
+      ext2_debug ("preallocation hit (%lu/%lu) => %u",
 		  ++alloc_hits, ++alloc_attempts, result);
     }
   else
@@ -154,7 +154,7 @@ inode_getblk (struct node *node, int nr, int create, int zero,
 
   *result = ext2_alloc_block (node, goal, zero);
 
-  ext2_debug ("%screate, hint = %lu, goal = %lu => %lu",
+  ext2_debug ("%screate, hint = %u, goal = %u => %u",
 	      create ? "" : "no", hint, goal, *result);
 
   if (!*result)
@@ -248,7 +248,7 @@ ext2_getblk (struct node *node, block_t block, int create, block_t *disk_block)
      * allocations use the same goal zone
    */
 
-  ext2_debug ("block = %lu, next = %lu, goal = %lu", block,
+  ext2_debug ("block = %u, next = %u, goal = %u", block,
 	      node->dn->info.i_next_alloc_block,
 	      node->dn->info.i_next_alloc_goal);
 
diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c
index 2ccfb08d..de37b99e 100644
--- a/ext2fs/ialloc.c
+++ b/ext2fs/ialloc.c
@@ -1,8 +1,8 @@
 /* Inode allocation routines.
 
-   Copyright (C) 1995, 1996, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,99,2000 Free Software Foundation, Inc.
 
-   Converted to work under the hurd by Miles Bader <miles@gnu.ai.mit.edu>
+   Converted to work under the hurd by Miles Bader <miles@gnu.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -361,7 +361,7 @@ ext2_count_free_inodes ()
 		  i, gdp->bg_free_inodes_count, x);
       bitmap_count += x;
     }
-  ext2_debug ("stored = %lu, computed = %lu, %lu",
+  ext2_debug ("stored = %u, computed = %lu, %lu",
 	      sblock->s_free_inodes_count, desc_count, bitmap_count);
   spin_unlock (&global_lock);
   return desc_count;
diff --git a/ext2fs/pager.c b/ext2fs/pager.c
index bf57d9ed..07041b72 100644
--- a/ext2fs/pager.c
+++ b/ext2fs/pager.c
@@ -1,8 +1,8 @@
 /* Pager for ext2fs
 
-   Copyright (C) 1994, 95, 96, 97, 98, 99 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,97,98,99,2000 Free Software Foundation, Inc.
 
-   Converted for ext2fs by Miles Bader <miles@gnu.ai.mit.edu>
+   Converted for ext2fs by Miles Bader <miles@gnu.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -300,7 +300,7 @@ pending_blocks_write (struct pending_blocks *pb)
       block_t dev_block = pb->block << log2_dev_blocks_per_fs_block;
       size_t length = pb->num << log2_block_size, amount;
 
-      ext2_debug ("writing block %lu[%d]", pb->block, pb->num);
+      ext2_debug ("writing block %u[%ld]", pb->block, pb->num);
 
       if (pb->offs > 0)
 	/* Put what we're going to write into a page-aligned buffer.  */
@@ -632,8 +632,8 @@ diskfs_grow (struct node *node, off_t size, struct protid *cred)
 		 ? new_end_block
 		 : old_page_end_block);
 
-	      ext2_debug ("extending writable page %u by %ld blocks"
-			  "; first new block = %lu",
+	      ext2_debug ("extending writable page %u by %d blocks"
+			  "; first new block = %u",
 			  trunc_page (old_size),
 			  writable_end - end_block,
 			  end_block);
diff --git a/ext2fs/truncate.c b/ext2fs/truncate.c
index 336981cc..f3063e37 100644
--- a/ext2fs/truncate.c
+++ b/ext2fs/truncate.c
@@ -1,8 +1,8 @@
 /* File truncation
 
-   Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,97,99,2000 Free Software Foundation, Inc.
 
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+   Written by Miles Bader <miles@gnu.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -102,7 +102,7 @@ trunc_direct (struct node *node, block_t end, struct free_block_run *fbr)
 {
   block_t *blocks = node->dn->info.i_data;
 
-  ext2_debug ("truncating direct blocks from %ld", end);
+  ext2_debug ("truncating direct blocks from %d", end);
 
   while (end < EXT2_NDIR_BLOCKS)
     free_block_run_free_ptr (fbr, blocks + end++);