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.

1 files changed, 9 insertions, 9 deletions

diff --git a/libstore/remap.c b/libstore/remap.c
index e1965ea5..6dd104e8 100644
--- a/libstore/remap.c
+++ b/libstore/remap.c
@@ -27,7 +27,7 @@
 
 static error_t
 remap_read (struct store *store,
-	     off_t addr, size_t index, size_t amount,
+	     store_offset_t addr, size_t index, size_t amount,
 	     void **buf, size_t *len)
 {
   return store_read (store->children[0], addr, amount, buf, len);
@@ -35,7 +35,7 @@ remap_read (struct store *store,
 
 static error_t
 remap_write (struct store *store,
-	      off_t addr, size_t index, void *buf, size_t len,
+	      store_offset_t addr, size_t index, void *buf, size_t len,
 	      size_t *amount)
 {
   return store_write (store->children[0], addr, buf, len, amount);
@@ -120,7 +120,7 @@ remap_open (const char *name, int flags,
 	      /* Syntax "100+" means block 100 to the end of the store.
 		 Since we don't know the size yet, we use -1 as a marker
 		 for the code below.  */
-	      runs[nruns++].length = (off_t) -1;
+	      runs[nruns++].length = (store_offset_t) -1;
 	      break;
 	    }
 	  runs[nruns].length = strtoul (p, &endp, 0);
@@ -144,7 +144,7 @@ remap_open (const char *name, int flags,
 	 and update them to use the actual size of the store.  */
       size_t i;
       for (i = 0; i < nruns; ++i)
-	if (runs[i].length == (off_t) -1)
+	if (runs[i].length == (store_offset_t) -1)
 	  runs[i].length = from->blocks - runs[i].start;
 
       /* Now do the remapping according to RUNS.  */
@@ -241,7 +241,7 @@ store_remap_runs (const struct store_run *runs, size_t num_runs,
   size_t xruns_alloced = num_runs + num_base_runs;
 
   /* Add the single run [ADDR, LEN) to *XRUNS, returning true if successful. */
-  int add_run (off_t addr, off_t len)
+  int add_run (store_offset_t addr, store_offset_t len)
     {
       if (*num_xruns == xruns_alloced)
 	/* Make some more space in *XRUNS.  */
@@ -266,13 +266,13 @@ store_remap_runs (const struct store_run *runs, size_t num_runs,
 
   for (i = 0; i < num_runs; i++)
     {
-      off_t addr = runs[i].start, left = runs[i].length;
+      store_offset_t addr = runs[i].start, left = runs[i].length;
 
       if (addr >= 0)
 	for (j = 0; j < num_base_runs && left > 0; j++)
 	  {
-	    off_t baddr = base_runs[j].start;
-	    off_t blen = base_runs[j].length;
+	    store_offset_t baddr = base_runs[j].start;
+	    store_offset_t blen = base_runs[j].length;
 
 	    if (addr >= blen)
 	      addr -= blen;
@@ -282,7 +282,7 @@ store_remap_runs (const struct store_run *runs, size_t num_runs,
 	    else
 	      /* Add another output run.  */
 	      {
-		off_t len = blen - addr; /* Size of next output run.  */
+		store_offset_t len = blen - addr; /* Size of next output run.  */
 		if (! add_run (baddr + addr, len > left ? left : len))
 		  ERR (ENOMEM);
 		addr = 0;