2002-05-08 Roland McGrath <roland@frob.com>

	* main.c (diskfs_append_args): Fix argument type.
	(main): Use %z format modifier for size_t arg.
	* dir.c (dirscanblock): Use %z format modifier for vm_address_t arg.
	(diskfs_dirempty): int -> vm_address_t
	(count_dirents): int -> size_t
	(diskfs_get_directs): u_int -> size_t

2 files changed, 9 insertions, 10 deletions

diff --git a/ufs/dir.c b/ufs/dir.c
index 7880ca21..3256bc42 100644
--- a/ufs/dir.c
+++ b/ufs/dir.c
@@ -1,5 +1,5 @@
 /* Directory management routines
-   Copyright (C) 1994,95,96,97,98,99,2000 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,97,98,99,2000,02 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -379,7 +379,7 @@ dirscanblock (vm_address_t blockaddr, struct node *dp, int idx,
 	  || DIRSIZ (DIRECT_NAMLEN (entry)) > read_disk_entry (entry->d_reclen)
 	  || memchr (entry->d_name, '\0', DIRECT_NAMLEN (entry)))
 	{
-	  fprintf (stderr, "Bad directory entry: inode: %d offset: %d\n",
+	  fprintf (stderr, "Bad directory entry: inode: %d offset: %zd\n",
 		  dp->dn->number, currentoff - blockaddr + idx * DIRBLKSIZ);
 	  return ENOENT;
 	}
@@ -729,8 +729,7 @@ diskfs_dirempty(struct node *dp,
 		struct protid *cred)
 {
   struct directory_entry *entry;
-  int curoff;
-  vm_address_t buf;
+  vm_address_t buf, curoff;
   memory_object_t memobj;
   error_t err;
 
@@ -798,7 +797,7 @@ diskfs_drop_dirstat (struct node *dp, struct dirstat *ds)
 static error_t
 count_dirents (struct node *dp, int nb, char *buf)
 {
-  int amt;
+  size_t amt;
   char *offinblk;
   struct directory_entry *entry;
   int count = 0;
@@ -833,7 +832,7 @@ diskfs_get_directs (struct node *dp,
 		    int entry,
 		    int nentries,
 		    char **data,
-		    u_int *datacnt,
+		    size_t *datacnt,
 		    vm_size_t bufsiz,
 		    int *amt)
 {
@@ -848,7 +847,7 @@ diskfs_get_directs (struct node *dp,
   char *datap;
   struct directory_entry *entryp;
   int allocsize;
-  int checklen;
+  size_t checklen;
   struct dirent *userp;
 
   nblks = dp->dn_stat.st_size/DIRBLKSIZ;
diff --git a/ufs/main.c b/ufs/main.c
index 8c79d707..242107f4 100644
--- a/ufs/main.c
+++ b/ufs/main.c
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 1994,95,96,97,98,99 Free Software Foundation, Inc.
+   Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -136,7 +136,7 @@ struct argp *diskfs_runtime_argp = (struct argp *)&runtime_argp;
 
 /* Override the standard diskfs routine so we can add our own output.  */
 error_t
-diskfs_append_args (char **argz, unsigned *argz_len)
+diskfs_append_args (char **argz, size_t *argz_len)
 {
   error_t err;
 
@@ -166,7 +166,7 @@ main (int argc, char **argv)
 			    &store_parsed, &bootstrap);
 
   if (store->block_size > DEV_BSIZE)
-    error (4, 0, "%s: Bad device block size %d (should be <= %d)",
+    error (4, 0, "%s: Bad device block size %zd (should be <= %d)",
 	   diskfs_disk_name, store->block_size, DEV_BSIZE);
   if (store->size < SBSIZE + SBOFF)
     error (5, 0, "%s: Disk too small (%Ld bytes)", diskfs_disk_name,