1999-05-23 Roland McGrath <roland@baalperazim.frob.com>

	* ialloc.c (diskfs_alloc_node): Frob printf format to suppress warning.
	* getblk.c (ext2_getblk): Likewise.
	* balloc.c (ext2_free_blocks): Likewise.
	* hyper.c (get_hypermetadata): Likewise.

4 files changed, 23 insertions, 23 deletions

diff --git a/ext2fs/balloc.c b/ext2fs/balloc.c
index 9c47b742..811bca4f 100644
--- a/ext2fs/balloc.c
+++ b/ext2fs/balloc.c
@@ -1,8 +1,8 @@
 /* Block allocation routines
 
-   Copyright (C) 1995 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1999 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
@@ -45,7 +45,7 @@
 
 #define in_range(b, first, len) ((b) >= (first) && (b) <= (first) + (len) - 1)
 
-void 
+void
 ext2_free_blocks (block_t block, unsigned long count)
 {
   char *bh;
@@ -60,7 +60,7 @@ ext2_free_blocks (block_t block, unsigned long count)
       (block + count) > sblock->s_blocks_count)
     {
       ext2_error ("freeing blocks not in datazone - "
-		  "block = %lu, count = %lu", block, count);
+		  "block = %u, count = %lu", block, count);
       spin_unlock (&global_lock);
       return;
     }
@@ -72,7 +72,7 @@ ext2_free_blocks (block_t block, unsigned long count)
   bit = (block - sblock->s_first_data_block) % sblock->s_blocks_per_group;
   if (bit + count > sblock->s_blocks_per_group)
     ext2_panic ("freeing blocks across group boundary - "
-		"block = %lu, count = %lu",
+		"block = %u, count = %lu",
 		block, count);
   gdp = group_desc (block_group);
   bh = bptr (gdp->bg_block_bitmap);
@@ -82,7 +82,7 @@ ext2_free_blocks (block_t block, unsigned long count)
       in_range (block, gdp->bg_inode_table, itb_per_group) ||
       in_range (block + count - 1, gdp->bg_inode_table, itb_per_group))
     ext2_panic ("freeing blocks in system zones - "
-		"block = %lu, count = %lu",
+		"block = %u, count = %lu",
 		block, count);
 
   for (i = 0; i < count; i++)
@@ -108,7 +108,7 @@ ext2_free_blocks (block_t block, unsigned long count)
 /*
  * ext2_new_block uses a goal block to assist allocation.  If the goal is
  * free, or there is a free block within 32 blocks of the goal, that block
- * is allocated.  Otherwise a forward search is made for a free block; within 
+ * is allocated.  Otherwise a forward search is made for a free block; within
  * each block group the search first looks for an entire free byte in the block
  * bitmap, and then for any free bit if that fails.
  */
@@ -170,7 +170,7 @@ repeat:
       if (j)
 	{
 	  /*
-	     * The goal was occupied; search forward for a free 
+	     * The goal was occupied; search forward for a free
 	     * block within the next 32 blocks
 	   */
 	  lmap = ((((unsigned long *) bh)[j >> 5]) >>
@@ -198,7 +198,7 @@ repeat:
        * of the goal: do a search forward through the block groups,
        * searching in each group first for an entire free byte in
        * the bitmap and then for any free bit.
-       * 
+       *
        * Search first in the remainder of the current group; then,
        * cyclicly search through the rest of the groups.
        */
@@ -223,7 +223,7 @@ repeat:
   ext2_debug ("bit not found in block group %d", i);
 
   /*
-     * Now search the rest of the groups.  We assume that 
+     * Now search the rest of the groups.  We assume that
      * i and gdp correctly point to the last group visited.
    */
   for (k = 0; k < groups_count; k++)
@@ -256,7 +256,7 @@ repeat:
     }
 
 search_back:
-  /* 
+  /*
      * We have succeeded in finding a free byte in the block
      * bitmap.  Now search backwards up to 7 bits to find the
      * start of this group of free blocks.
@@ -348,7 +348,7 @@ got_block:
   return j;
 }
 
-unsigned long 
+unsigned long
 ext2_count_free_blocks ()
 {
 #ifdef EXT2FS_DEBUG
@@ -379,14 +379,14 @@ ext2_count_free_blocks ()
 #endif
 }
 
-static inline int 
+static inline int
 block_in_use (block_t block, unsigned char *map)
 {
   return test_bit ((block - sblock->s_first_data_block) %
 		   sblock->s_blocks_per_group, map);
 }
 
-void 
+void
 ext2_check_blocks_bitmap ()
 {
   char *bh;
diff --git a/ext2fs/getblk.c b/ext2fs/getblk.c
index ecc69dcc..1ac597e5 100644
--- a/ext2fs/getblk.c
+++ b/ext2fs/getblk.c
@@ -1,8 +1,8 @@
 /* File block to disk block mapping routines
 
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995,96,99 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
@@ -38,14 +38,14 @@
 #include <string.h>
 #include "ext2fs.h"
 
-/* 
+/*
  * ext2_discard_prealloc and ext2_alloc_block are atomic wrt. the
  * superblock in the same manner as are ext2_free_blocks and
  * ext2_new_block.  We just wait on the super rather than locking it
  * here, since ext2_new_block will do the necessary locking and we
  * can't block until then.
  */
-void 
+void
 ext2_discard_prealloc (struct node *node)
 {
 #ifdef EXT2_PREALLOCATE
@@ -235,7 +235,7 @@ ext2_getblk (struct node *node, block_t block, int create, block_t *disk_block)
       addr_per_block * addr_per_block +
       addr_per_block * addr_per_block * addr_per_block)
     {
-      ext2_warning ("block > big: %lu", block);
+      ext2_warning ("block > big: %u", block);
       return EIO;
     }
   /*
diff --git a/ext2fs/hyper.c b/ext2fs/hyper.c
index 871c7254..d7536014 100644
--- a/ext2fs/hyper.c
+++ b/ext2fs/hyper.c
@@ -1,8 +1,8 @@
 /* Fetching and storing the hypermetadata (superblock and bg summary info)
 
-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,99 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
@@ -100,7 +100,7 @@ get_hypermetadata (void)
 		block_size);
 
   if (store->size < (sblock->s_blocks_count << log2_block_size))
-    ext2_panic ("disk size (%d bytes) too small; superblock says we need %d",
+    ext2_panic ("disk size (%ld bytes) too small; superblock says we need %d",
 		store->size, sblock->s_blocks_count << log2_block_size);
 
   /* Set these handy variables.  */
diff --git a/ext2fs/ialloc.c b/ext2fs/ialloc.c
index 30807f81..716a1f7d 100644
--- a/ext2fs/ialloc.c
+++ b/ext2fs/ialloc.c
@@ -291,7 +291,7 @@ diskfs_alloc_node (struct node *dir, mode_t mode, struct node **node)
   if (st->st_blocks)
     {
       if (sblock->s_creator_os == EXT2_OS_HURD)
-	ext2_warning ("Free inode %d had %d blocks", inum, st->st_blocks);
+	ext2_warning ("Free inode %d had %ld blocks", inum, st->st_blocks);
       st->st_blocks = 0;
       np->dn_set_ctime = 1;
     }