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, 38 insertions, 12 deletions

diff --git a/utils/ChangeLog b/utils/ChangeLog
index 2eb8f4eb..5a56b1c9 100644
--- a/utils/ChangeLog
+++ b/utils/ChangeLog
@@ -1,3 +1,19 @@
+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.
+
 2000-10-18  Marcus Brinkmann  <marcus@gnu.org>
 
 	* devprobe.c (main): Call device_close before freeing the device
diff --git a/utils/storecat.c b/utils/storecat.c
index be65b63a..f01c12c1 100644
--- a/utils/storecat.c
+++ b/utils/storecat.c
@@ -30,8 +30,8 @@ main (int argc, char **argv)
   error_t err;
   struct store *s;
   char *name;
-  off_t addr;
-  size_t left;
+  store_offset_t addr;
+  store_offset_t left;
   const struct argp_child kids[] = { { &store_argp }, { 0 }};
   struct argp argp =
     { 0, 0, 0, "Write the contents of a store to stdout", kids };
diff --git a/utils/storeinfo.c b/utils/storeinfo.c
index 638cebc7..d088a9fd 100644
--- a/utils/storeinfo.c
+++ b/utils/storeinfo.c
@@ -99,12 +99,20 @@ print_store (struct store *store, int level, unsigned what)
 	  fputs (str ?: "-", stdout);
 	}
     }
-  void pint (off_t val, unsigned mask)
+  void psiz (size_t val, unsigned mask)
     {
       if ((what & mask) == mask)
 	{
 	  psep ();
-	  printf ("%ld", val);
+	  printf ("%u", val);
+	}
+    }
+  void poff (store_offset_t val, unsigned mask)
+    {
+      if ((what & mask) == mask)
+	{
+	  psep ();
+	  printf ("%Ld", val);
 	}
     }
 
@@ -155,9 +163,9 @@ print_store (struct store *store, int level, unsigned what)
     }
 
   pstr (store->name,       W_NAME);
-  pint (store->block_size, W_BLOCK_SIZE);
-  pint (store->blocks,     W_BLOCKS);
-  pint (store->size,       W_SIZE);
+  psiz (store->block_size, W_BLOCK_SIZE);
+  poff (store->blocks,     W_BLOCKS);
+  poff (store->size,       W_SIZE);
 
   if (what & W_RUNS)
     {
@@ -168,9 +176,9 @@ print_store (struct store *store, int level, unsigned what)
 	    putchar (',');
 	  if (store->runs[i].start < 0)
 	    /* A hole */
-	    printf ("@+%ld", store->runs[i].length);
+	    printf ("@+%Ld", store->runs[i].length);
 	  else
-	    printf ("%ld+%ld", store->runs[i].start, store->runs[i].length);
+	    printf ("%Ld+%Ld", store->runs[i].start, store->runs[i].length);
 	}
     }
 
diff --git a/utils/storeread.c b/utils/storeread.c
index 80c36466..52da3fc2 100644
--- a/utils/storeread.c
+++ b/utils/storeread.c
@@ -39,14 +39,16 @@ int
 main (int argc, char **argv)
 {
   struct store *store = 0;
-  off_t addr = -1;
+  store_offset_t addr = -1;
   int dumped = 0, use_file_io = 0, block_size = 0;
 
-  void dump (off_t addr,  ssize_t len)
+  void dump (store_offset_t addr,  ssize_t len)
     {
       char buf[4096];
       void *data = buf;
       size_t data_len = sizeof (buf);
+
+      /* XXX: store->size can be too big for len.  */
       error_t err =
 	store_read (store, addr, len < 0 ? store->size : len,
 		    &data, &data_len);
@@ -92,7 +94,7 @@ main (int argc, char **argv)
 		error (err, 3, "%s", arg);
 	    }
 	  else if (addr < 0)
-	    addr = atoi (arg);
+	    addr = atoll (arg);
 	  else
 	    {
 	      dump (addr, atoi (arg));