doc/

2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* hurd.texi (Store Management): Replace off_t with store_offset_t.
	(Store I/O): Likewise.
	(Store Classes): Likewise.

ext2fs/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* ext2fs.c (main): Use %Ld instead %ld to print store->size.
	* hyper.c (get_hypermetadata): Likewise.

libstore/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* zero.c (zero_remap): Change type of variables length, old_length
	to store_offset_t.
	(zero_decode): Change type of variable size to store_offset_t.
	(zero_open): Likewise. Use strtoull instead strtoul to parse
	size argument from name. Use store_offset_t for max_offs and
	its calculation.
	(store_zero_create): Use store_offset_t type for size argument.

	* derive.c (_store_derive): Use store_offset_t as type for
	variable last_part_base.

	* stripe.c (addr_adj): Change types of addr argument and return
	value to store_offset_t.
	(store_ileave_create): Change type of interleave argument and
	variables min_end and end to store_offset_t, but type of variable
	block_size to size_t.
	(store_concat_create): Change type of variable block_size to
	size_t.

	* make.c (_store_create): Change end argument type to store_offset_t.

	* store.h: New type store_offset_t, define to off64_t.
	(struct store_run): Change type of start and length to
	store_offset_t.
	(struct store): Change type of end, wrap_src, wrap_dst, blocks,
	size to store_offset_t.
	Change type of addr arg in store_read_meth_t and
	store_write_meth_t to store_offset_t, as well as in declarations
	for store_read and store_write.
	Change type of argument end in _store_create declaration to
	store_offset_t.
	Change type of argument size in store_zero_create to
	store_offset_t. Change type of argument interleace in
	store_ileace_create to store_offset_t.

	* rdwr.c (store_find_first_run): Change type of return value, addr
	and *base arguments, and variables wrap_src and run_blocks to
	store_offset_t.
	(store_next_run): Change type of *base argument to store_offset_t.
	(store_write): Change type of addr argument and variable base to
	store_offset_t.
	(store_read): Likewise, also for addr argument of local function seg_read.
	Change type of len argument to size_t.

	* copy.c (copy_read): Change type of addr argument to store_offset_t.
	(copy_write): Likewise.
	* device.c (dev_read): Likewise.
	(dev_write): Likewise.
	* file.c (file_read): Likewise.
	(file_write): Likewise.
	(file_byte_read): Likewise.
	(file_byte_write): Likewise.
	* mvol.c (mvol_read): Likewise.
	(mvol_write): Likewise.
	* remap.c (remap_read): Likewise.
	(remap_write): Likewise.
	* stripe.c (stripe_read): Likewise.
	(stripe_write): Likewise.
	* task.c (task_read): Likewise.
	(task_write): Likewise.
	* zero.c (zero_read): Likewise.
	(zero_write): Likewise.

	* remap.c (store_remap_runs): Change type of addr and len
	arguments of local function add_run and of local variables addr,
	length, baddr, blen and len to store_offset_t.
	(remap_open): Cast -1 to store_offset_t, not off_t.

	* argp.c (struct store_parsed): Change type of interleave from
	off_t to store_offset_t.
	(store_parsed_append_args): Use %Ld instead %ld to print
	interleave value.
	(store_parsed_name): Likewise.

ufs/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* main.c (main): Use %Ld instead %ld to print store->size.
	* hyper.c (get_hypermetadata): Likewise.
	* inode.c (diskfs_S_file_get_storage_info): Change type of variables
	start and length from off_t to store_offset_t.

utils/
2001-01-08  Marcus Brinkmann  <marcus@gnu.org>

	* storeread.c (main): Change type of addr to store_offset_t,
	also for first argument of local function dump.
	Add comment about store->size as len parameter for store_read.
	Use atoll instead atoi for addr argument.

	* storeinfo.c (print_store): Remove local function pint, add two
	similar functions psiz and poff, accepting and printing a size_t
	or store_offset_t respectively.
	Use psiz to print block_size, poff to print blocks and size of
	store.
	Use %Ld instead %ld to print runs.

	* storecat.c (main): Change type of addr and left to store_offset_t.

4 files changed, 11 insertions, 4 deletions

diff --git a/ufs/ChangeLog b/ufs/ChangeLog
index 14aed9dd..d8e04a0e 100644
--- a/ufs/ChangeLog
+++ b/ufs/ChangeLog
@@ -1,3 +1,10 @@
+2001-01-08  Marcus Brinkmann  <marcus@gnu.org>
+
+	* main.c (main): Use %Ld instead %ld to print store->size.
+	* hyper.c (get_hypermetadata): Likewise.
+	* inode.c (diskfs_S_file_get_storage_info): Change type of variables
+	start and length from off_t to store_offset_t.
+
 2001-01-07  Marcus Brinkmann  <marcus@gnu.org>
 
 	* dir.c: Make diskfs_dirstat_size const.
diff --git a/ufs/hyper.c b/ufs/hyper.c
index c907d274..ece327a2 100644
--- a/ufs/hyper.c
+++ b/ufs/hyper.c
@@ -251,7 +251,7 @@ get_hypermetadata (void)
   if (store->size < sblock->fs_size * sblock->fs_fsize)
     {
       fprintf (stderr,
-	       "Disk size (%ld) less than necessary "
+	       "Disk size (%Ld) less than necessary "
 	       "(superblock says we need %ld)\n",
 	       store->size, sblock->fs_size * sblock->fs_fsize);
       exit (1);
diff --git a/ufs/inode.c b/ufs/inode.c
index 099609ab..72467e1a 100644
--- a/ufs/inode.c
+++ b/ufs/inode.c
@@ -679,8 +679,8 @@ diskfs_S_file_get_storage_info (struct protid *cred,
 
 	for (i = 0; i < NDADDR; i++)
 	  {
-	    off_t start = fsbtodb (sblock, read_disk_entry (di->di_db[i]));
-	    off_t length =
+	    store_offset_t start = fsbtodb (sblock, read_disk_entry (di->di_db[i]));
+	    store_offset_t length =
 	      (((i + 1) * sblock->fs_bsize > np->allocsize)
 	       ? np->allocsize - i * sblock->fs_bsize
 	       : sblock->fs_bsize);
diff --git a/ufs/main.c b/ufs/main.c
index cc39019d..8c79d707 100644
--- a/ufs/main.c
+++ b/ufs/main.c
@@ -169,7 +169,7 @@ main (int argc, char **argv)
     error (4, 0, "%s: Bad device block size %d (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,
+    error (5, 0, "%s: Disk too small (%Ld bytes)", diskfs_disk_name,
 	   store->size);
 
   log2_dev_blocks_per_dev_bsize = 0;