[svn-r12877] Description:

    Clean up more compiler warnings.

Tested on:
    Linux/64 2.6 (chicago2)

13 files changed, 130 insertions, 129 deletions

diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index 024aa88..e6a07b7 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -1333,7 +1333,7 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu\n", FUNC, fspace->alloc_sec
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space sections")
 
         /* Compute new size */
-        new_size = fspace->alloc_sect_size;
+        H5_ASSIGN_OVERFLOW(/* To: */ new_size, /* From: */ fspace->alloc_sect_size, /* From: */ hsize_t, /* To: */ size_t);
         while(new_size < fspace->sect_size)
             new_size *= (double)fspace->expand_percent / 100.0;
         fspace->alloc_sect_size = new_size;
@@ -1369,7 +1369,7 @@ HDfprintf(stderr, "%s: old_addr = %a, fspace->sect_addr = %a\n", FUNC, old_addr,
         haddr_t old_addr;               /* Old address of serialized sections */
 
         /* Compute the threshold for decreasing the sections' serialized size */
-        decrease_threshold = ((size_t)fspace->alloc_sect_size * (double)fspace->shrink_percent) / 100.0;
+        decrease_threshold = (size_t)(((size_t)fspace->alloc_sect_size * (double)fspace->shrink_percent) / 100.0);
 
         if(fspace->alloc_sect_size > H5FS_SINFO_SIZE_DEFAULT &&
                 fspace->sect_size < decrease_threshold) {
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 8553b15..5f5c751 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -55,7 +55,7 @@ typedef struct {
     int indent;                 /* Indention amount */
     int fwidth;                 /* Field width mount */
     haddr_t dblock_addr;        /* Direct block's address */
-    haddr_t dblock_size;        /* Direct block's size */
+    hsize_t dblock_size;        /* Direct block's size */
     uint8_t *marker;            /* 'Marker' array for free space */
     size_t sect_count;          /* Number of free space sections in block */
     size_t amount_free;         /* Amount of free space in block */
@@ -340,11 +340,11 @@ H5HF_dblock_debug_cb(const H5FS_section_info_t *_sect, void *_udata)
         if(sect_start < dblock_start)
             start = 0;
         else
-            start = sect_start - dblock_start;
+            H5_ASSIGN_OVERFLOW(/* To: */ start, /* From: */ (sect_start - dblock_start), /* From: */ hsize_t, /* To: */ size_t)
         if(sect_end > dblock_end)
-            end = udata->dblock_size;
+            H5_ASSIGN_OVERFLOW(/* To: */ end, /* From: */ udata->dblock_size, /* From: */ hsize_t, /* To: */ size_t)
         else
-            end = (sect_end - dblock_start) + 1;
+            H5_ASSIGN_OVERFLOW(/* To: */ end, /* From: */ ((sect_end - dblock_start) + 1), /* From: */ hsize_t, /* To: */ size_t)
 
         /* Calculate the length */
         len = end - start;
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index 1007412..c9322c4 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -129,7 +129,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
         dblock->block_off = par_iblock->block_off;
         dblock->block_off += hdr->man_dtable.row_block_off[par_row];
         dblock->block_off += hdr->man_dtable.row_block_size[par_row] * (par_entry % hdr->man_dtable.cparam.width);
-        dblock->size = hdr->man_dtable.row_block_size[par_row];
+        H5_ASSIGN_OVERFLOW(/* To: */ dblock->size, /* From: */ hdr->man_dtable.row_block_size[par_row], /* From: */ hsize_t, /* To: */ size_t);
     } /* end if */
     else {
         /* Must be the root direct block */
@@ -434,7 +434,7 @@ HDfprintf(stderr, "%s: after updating iterator, hdr->man_iter_off = %Hu\n", FUNC
         if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
         HDassert(next_row < iblock->nrows);
-        next_size = hdr->man_dtable.row_block_size[next_row];
+        H5_ASSIGN_OVERFLOW(/* To: */ next_size, /* From: */ hdr->man_dtable.row_block_size[next_row], /* From: */ hsize_t, /* To: */ size_t);
 
         /* Check for skipping over blocks */
         if(min_dblock_size > next_size) {
diff --git a/src/H5HFdtable.c b/src/H5HFdtable.c
index 80ec8b1..8c97b19 100644
--- a/src/H5HFdtable.c
+++ b/src/H5HFdtable.c
@@ -167,7 +167,7 @@ HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off);
     /* Check for offset in first row */
     if(off < dtable->num_id_first_row) {
         *row = 0;
-        *col = off / dtable->cparam.start_block_size;
+        H5_ASSIGN_OVERFLOW(/* To: */ *col, /* From: */ (off / dtable->cparam.start_block_size), /* From: */ hsize_t, /* To: */ unsigned);
     } /* end if */
     else {
         unsigned high_bit = H5V_log2_gen(off);  /* Determine the high bit in the offset */
@@ -177,7 +177,7 @@ HDfprintf(stderr, "%s: off = %Hu\n", "H5HF_dtable_lookup", off);
 HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", high_bit, off_mask);
 #endif /* QAK */
         *row = (high_bit - dtable->first_row_bits) + 1;
-        *col = (off - off_mask) / dtable->row_block_size[*row];
+        H5_ASSIGN_OVERFLOW(/* To: */ *col, /* From: */ ((off - off_mask) / dtable->row_block_size[*row]), /* From: */ hsize_t, /* To: */ unsigned);
     } /* end else */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index adc1859..a02e8ed 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -262,7 +262,7 @@ H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr)
         if(u < hdr->man_dtable.max_direct_rows) {
             hdr->man_dtable.row_tot_dblock_free[u] = hdr->man_dtable.row_block_size[u] -
                     H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr);
-            hdr->man_dtable.row_max_dblock_free[u] = hdr->man_dtable.row_tot_dblock_free[u];
+            H5_ASSIGN_OVERFLOW(/* To: */ hdr->man_dtable.row_max_dblock_free[u], /* From: */ hdr->man_dtable.row_tot_dblock_free[u], /* From: */ hsize_t, /* To: */ size_t);
         } /* end if */
         else
             if(H5HF_hdr_compute_free_space(hdr, u) < 0)
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index 7675b77..da9f1a4 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -591,7 +591,7 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
 {
     void *read_buf;                     /* Pointer to buffer for reading */
     haddr_t obj_addr;                   /* Object's address in the file */
-    hsize_t obj_size = 0;               /* Object's size in the file */
+    size_t obj_size = 0;                /* Object's size in the file */
     unsigned filter_mask = 0;           /* Filter mask for object (only used for filtered objects) */
     herr_t ret_value = SUCCEED;         /* Return value */
 
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index df2ef56..a26dde2 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -38,6 +38,7 @@
 #include "H5HGprivate.h"        /* Global Heaps                         */
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5Lprivate.h"         /* Links			  	*/
+#include "H5MMprivate.h"	/* Memory management			*/
 #include "H5Opkg.h"             /* Object headers			*/
 #include "H5Pprivate.h"         /* Property lists                       */
 
diff --git a/test/bittests.c b/test/bittests.c
index c9161de..43760e9 100644
--- a/test/bittests.c
+++ b/test/bittests.c
@@ -121,13 +121,13 @@ test_find (void)
     for (i=0; i<8*(int)sizeof(v1); i++) {
 	memset (v1, 0xff, sizeof v1);
 	v1[i/8] &= ~(1<<(i%8));
-	n = H5T_bit_find (v1, 0, 8*sizeof(v1), H5T_BIT_LSB, FALSE);
+	n = H5T_bit_find (v1, (size_t)0, 8*sizeof(v1), H5T_BIT_LSB, FALSE);
 	if ((ssize_t)i!=n) {
 	    H5_FAILED();
 	    printf ("    Test for clear bit %d failed (lsb)!\n", i);
 	    goto failed;
 	}
-	n = H5T_bit_find (v1, 0, 8*sizeof(v1), H5T_BIT_MSB, FALSE);
+	n = H5T_bit_find (v1, (size_t)0, 8*sizeof(v1), H5T_BIT_MSB, FALSE);
 	if ((ssize_t)i!=n) {
 	    H5_FAILED();
 	    printf ("    Test for clear bit %d failed (lsb)!\n", i);
@@ -197,7 +197,7 @@ test_copy (void)
 
 
 	/* Look for the zeros and ones */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_LSB, 1);
 	if (size>0 && n!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first copied bit in destination "
@@ -226,7 +226,7 @@ test_copy (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_MSB, 1);
 	if (size>0 && (size_t)(n+1)!=d_offset+size) {
 	    H5_FAILED();
 	    printf ("    Unable to find last copied bit in destination "
@@ -238,7 +238,7 @@ test_copy (void)
 	    puts ("    Found copied bits but shouldn't have (reverse)!");
 	    goto failed;
 	}
-	n = H5T_bit_find (v2, 0, d_offset+size, H5T_BIT_MSB, 0);
+	n = H5T_bit_find (v2, (size_t)0, d_offset+size, H5T_BIT_MSB, 0);
 	if (d_offset>0 && n+1!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find beginning of copied data "
@@ -309,7 +309,7 @@ test_shift (void)
         H5T_bit_shift (vector, shift_dist, offset, size);
 
 	/* Look for the ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if ((size_t)n!=offset+shift_dist) {
 	    H5_FAILED();
 	    printf ("    Unable to find first bit in destination "
@@ -321,7 +321,7 @@ test_shift (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n!=(ssize_t)(offset+size-1)) {
 	    H5_FAILED();
 	    printf ("    Unable to find last bit in destination "
@@ -336,7 +336,7 @@ test_shift (void)
         H5T_bit_shift (vector, -shift_dist, offset, size);
 
 	/* Look for the ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if ((size_t)n!=offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first bit in destination "
@@ -348,7 +348,7 @@ test_shift (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n!=(ssize_t)(offset+size-shift_dist-1)) {
 	    H5_FAILED();
 	    printf ("    Unable to find last bit in destination "
@@ -371,7 +371,7 @@ test_shift (void)
         H5T_bit_shift (vector, shift_dist, offset, size);
 
 	/* Supposed to fail to find any ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if (n >= 0) {
 	    H5_FAILED();
 	    printf ("    Unable to verify all bits are zero in destination(LSB) "
@@ -380,7 +380,7 @@ test_shift (void)
 	}
 
         /* Look from the other direction */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n >= 0) {
 	    H5_FAILED();
 	    printf ("    Unable to verify all bits are zero in destination(MSB) "
@@ -444,7 +444,7 @@ test_increment (void)
         H5T_bit_inc (vector, offset, size);
 
 	/* Look for the one */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if (size!=1 && (size_t)n!=offset+size-1) {
 	    H5_FAILED();
 	    printf ("    Unable to find first bit in destination "
@@ -462,7 +462,7 @@ test_increment (void)
 	 * Look for one in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (size!=1 && n!=(ssize_t)(offset+size-1)) {
 	    H5_FAILED();
 	    printf ("    Unable to find last bit in destination "
@@ -528,7 +528,7 @@ test_decrement (void)
         H5T_bit_dec (vector, offset, size);
 
 	/* Look for the ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if ((size_t)n!=offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first bit in destination "
@@ -540,7 +540,7 @@ test_decrement (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n!=(ssize_t)(offset+size-1)) {
 	    H5_FAILED();
 	    printf ("    Unable to find last bit in destination "
@@ -600,7 +600,7 @@ test_negate (void)
         H5T_bit_neg (vector, offset, size);
 
 	/* Look for the ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if ((size_t)n!=offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first bit in destination "
@@ -612,7 +612,7 @@ test_negate (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n!=(ssize_t)(offset+size-1)) {
 	    H5_FAILED();
 	    printf ("    Unable to find last bit in destination "
@@ -628,7 +628,7 @@ test_negate (void)
         H5T_bit_neg (vector, offset, size);
 
 	/* Look for the ones */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_LSB, 1);
 	if (n>=0) {
 	    H5_FAILED();
 	    printf ("    Unable to verify all-zero bits in destination "
@@ -640,7 +640,7 @@ test_negate (void)
 	 * Look for ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (vector, 0, 8*sizeof(vector), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (vector, (size_t)0, 8*sizeof(vector), H5T_BIT_MSB, 1);
 	if (n>=0) {
 	    H5_FAILED();
 	    printf ("    Unable to verify all-zero bits in destination "
@@ -709,7 +709,7 @@ test_set (void)
 
 
 	/* Look for the zeros and ones */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_LSB, 1);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_LSB, 1);
 	if (size>0 && n!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first set bit in destination "
@@ -738,7 +738,7 @@ test_set (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_MSB, 1);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_MSB, 1);
 	if (size>0 && (size_t)(n+1)!=d_offset+size) {
 	    H5_FAILED();
 	    printf ("    Unable to find last set bit in destination "
@@ -750,7 +750,7 @@ test_set (void)
 	    puts ("    Found set bits but shouldn't have (reverse)!");
 	    goto failed;
 	}
-	n = H5T_bit_find (v2, 0, d_offset+size, H5T_BIT_MSB, 0);
+	n = H5T_bit_find (v2, (size_t)0, d_offset+size, H5T_BIT_MSB, 0);
 	if (d_offset>0 && n+1!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find beginning of set bit region "
@@ -826,7 +826,7 @@ test_clear (void)
 
 
 	/* Look for the zeros and ones */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_LSB, 0);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_LSB, 0);
 	if (size>0 && n!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find first cleared bit in destination "
@@ -855,7 +855,7 @@ test_clear (void)
 	 * Look for zeros and ones in reverse order.  This is only to test
 	 * that reverse searches work as expected.
 	 */
-	n = H5T_bit_find (v2, 0, 8*sizeof(v2), H5T_BIT_MSB, 0);
+	n = H5T_bit_find (v2, (size_t)0, 8*sizeof(v2), H5T_BIT_MSB, 0);
 	if (size>0 && (size_t)(n+1)!=d_offset+size) {
 	    H5_FAILED();
 	    printf ("    Unable to find last cleared bit in destination "
@@ -867,7 +867,7 @@ test_clear (void)
 	    puts ("    Found cleared bits but shouldn't have (reverse)!");
 	    goto failed;
 	}
-	n = H5T_bit_find (v2, 0, d_offset+size, H5T_BIT_MSB, 1);
+	n = H5T_bit_find (v2, (size_t)0, d_offset+size, H5T_BIT_MSB, 1);
 	if (d_offset>0 && n+1!=(ssize_t)d_offset) {
 	    H5_FAILED();
 	    printf ("    Unable to find beginning of cleared bit region "
diff --git a/test/btree2.c b/test/btree2.c
index 48692f2..d86e2de 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -6750,8 +6750,8 @@ test_delete(hid_t fapl)
     hid_t	file=-1;
     char	filename[1024];
     H5F_t	*f=NULL;
-    off_t       empty_size;             /* Size of an empty file */
-    off_t       file_size;              /* Size of each file created */
+    h5_stat_size_t       empty_size;             /* Size of an empty file */
+    h5_stat_size_t       file_size;              /* Size of each file created */
     hsize_t     record;                 /* Record to insert into tree */
     haddr_t     bt2_addr;               /* Address of B-tree created */
     H5B2_stat_t bt2_stat;               /* Statistics about B-tree created */
diff --git a/test/fheap.c b/test/fheap.c
index d11208e..27a21d7 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -618,7 +618,7 @@ error:
 static int
 open_heap(char *filename, hid_t fapl, hid_t dxpl, const H5HF_create_t *cparam,
     const fheap_test_param_t *tparam, hid_t *file, H5F_t **f, H5HF_t **fh,
-    haddr_t *fh_addr, fheap_heap_state_t *state, off_t *empty_size)
+    haddr_t *fh_addr, fheap_heap_state_t *state, h5_stat_size_t *empty_size)
 {
     size_t      id_len;                 /* Size of fractal heap IDs */
 
@@ -759,9 +759,9 @@ static int
 close_heap(char *filename, hid_t dxpl, fheap_test_param_t *tparam,
     hid_t file, H5F_t *f, H5HF_t **fh, haddr_t fh_addr,
     fheap_heap_state_t *state, fheap_heap_ids_t *keep_ids,
-    off_t empty_size)
+    h5_stat_size_t empty_size)
 {
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       file_size;              /* Size of file currently */
 
     /* Check for closing & re-opening the heap */
     if(reopen_heap(f, dxpl, fh, fh_addr, tparam) < 0)
@@ -1813,8 +1813,8 @@ test_create(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t UNUSED *tparam
     H5HF_create_t test_cparam;          /* Creation parameters for heap */
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Heap address in file */
-    off_t       empty_size;             /* File size, w/o heap */
-    off_t       file_size;              /* File size, after deleting heap */
+    h5_stat_size_t       empty_size;             /* File size, w/o heap */
+    h5_stat_size_t       file_size;              /* File size, after deleting heap */
     size_t      id_len;                 /* Size of fractal heap IDs */
     fheap_heap_state_t state;           /* State of fractal heap */
 
@@ -5862,8 +5862,8 @@ test_man_remove_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
     unsigned char obj[SMALL_OBJ_SIZE1]; /* Buffer for object to insert */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    u;                      /* Local index variable */
 
@@ -6018,8 +6018,8 @@ test_man_remove_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpara
     unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for second object */
     unsigned char obj[SMALL_OBJ_SIZE1]; /* Buffer for object to insert */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    u;                      /* Local index variable */
 
@@ -6203,8 +6203,8 @@ test_man_remove_one_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     unsigned char *obj;                 /* Buffer for object to insert */
     size_t      obj_len;                /* Length of object to insert */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    u;                      /* Local index variable */
 
@@ -6364,8 +6364,8 @@ test_man_remove_two_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     unsigned char *obj;                 /* Buffer for object to insert */
     size_t      obj_len;                /* Length of object to insert */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    u;                      /* Local index variable */
 
@@ -6600,8 +6600,8 @@ test_man_remove_three_larger(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     unsigned char *obj;                 /* Buffer for object to insert */
     size_t      obj_len;                /* Length of object to insert */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     fheap_heap_state_t state;           /* State of fractal heap */
     unsigned    u;                      /* Local index variable */
 
@@ -6892,7 +6892,7 @@ test_man_remove_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from root direct block of absolute heap %s";       /* Test description */
@@ -6966,7 +6966,7 @@ test_man_remove_two_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from two direct blocks of absolute heap %s";       /* Test description */
@@ -7055,7 +7055,7 @@ test_man_remove_first_row(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from first row of direct blocks of absolute heap %s";       /* Test description */
@@ -7126,7 +7126,7 @@ test_man_remove_first_two_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_par
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from first two rows of direct blocks of absolute heap %s";       /* Test description */
@@ -7199,7 +7199,7 @@ test_man_remove_first_four_rows(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from first four rows of direct blocks of absolute heap %s";       /* Test description */
@@ -7276,7 +7276,7 @@ test_man_remove_all_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from all direct blocks of root group in absolute heap %s";       /* Test description */
@@ -7347,7 +7347,7 @@ test_man_remove_2nd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from 2nd level indirect blocks of absolute heap %s";       /* Test description */
@@ -7422,7 +7422,7 @@ test_man_remove_3rd_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_param
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "removing all objects from 3rd level indirect blocks of absolute heap %s";       /* Test description */
@@ -7506,7 +7506,7 @@ test_man_skip_start_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "inserting object that is too large for starting block, then remove all objects %s";       /* Test description */
@@ -7584,7 +7584,7 @@ test_man_skip_start_block_add_back(hid_t fapl, H5HF_create_t *cparam, fheap_test
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "skipping starting block, then adding object back to first block, then remove all objects %s";       /* Test description */
@@ -7683,7 +7683,7 @@ test_man_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -7793,7 +7793,7 @@ test_man_skip_2nd_block(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "insert object to initial block, then add object too large for starting direct blocks, then remove all objects %s";       /* Test description */
@@ -7890,7 +7890,7 @@ test_man_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_tes
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8035,7 +8035,7 @@ test_man_fill_one_partial_skip_2nd_block_add_skipped(hid_t fapl, H5HF_create_t *
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8201,7 +8201,7 @@ test_man_fill_row_skip_add_skipped(hid_t fapl, H5HF_create_t *cparam, fheap_test
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8330,7 +8330,7 @@ test_man_skip_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_direct_rows;        /* Number of rows (of direct blocks) in root indirect block */
     unsigned    row;                    /* Current row */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "skipping direct blocks to last row and skipping two rows of root indirect block, then backfill and extend, then remove all objects %s";       /* Test description */
@@ -8455,7 +8455,7 @@ test_man_fill_direct_skip_indirect_start_block_add_skipped(hid_t fapl, H5HF_crea
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8581,7 +8581,7 @@ test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H5HF_
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
     unsigned    row;                    /* Current row in indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8709,7 +8709,7 @@ test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped(hid_t fapl, H5HF_
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -8856,7 +8856,7 @@ test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped(hid_t fapl, H5
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
     unsigned    row;                    /* Current row in indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9026,7 +9026,7 @@ test_man_fill_direct_skip_indirect_two_rows_add_skipped(hid_t fapl, H5HF_create_
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
     unsigned    max_dblock_rows;        /* Max. # of rows (of direct blocks) in the root indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9180,7 +9180,7 @@ test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped(hid_t
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
     unsigned    max_dblock_rows;        /* Max. # of rows (of direct blocks) in the root indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9358,7 +9358,7 @@ test_man_fill_2nd_direct_skip_start_block_add_skipped(hid_t fapl, H5HF_create_t
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9487,7 +9487,7 @@ test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped(hid_t fapl, H
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9626,7 +9626,7 @@ test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped(h
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9778,7 +9778,7 @@ test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped(
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -9941,7 +9941,7 @@ test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped(hid_t
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -10104,7 +10104,7 @@ test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_s
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -10271,7 +10271,7 @@ test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped(hid_t fapl, H5
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -10433,7 +10433,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_blo
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -10613,7 +10613,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -10828,7 +10828,7 @@ test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_star
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -11025,7 +11025,7 @@ test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -11252,7 +11252,7 @@ test_man_frag_simple(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     H5HF_t      *fh = NULL;             /* Fractal heap wrapper */
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "fragmenting small blocks, then backfill and extend, then remove all objects %s";       /* Test description */
@@ -11385,7 +11385,7 @@ test_man_frag_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    root_direct_rows;       /* Number of rows in root indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     fheap_heap_state_t state;           /* State of fractal heap */
     const char *base_desc = "fragmenting direct blocks, then backfill and extend, then remove all objects %s";       /* Test description */
@@ -11557,7 +11557,7 @@ test_man_frag_2nd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    num_first_indirect_rows;        /* Number of rows (of direct blocks) in each of the first indirect blocks */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -11671,7 +11671,7 @@ test_man_frag_3rd_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned    root_direct_rows;       /* Number of rows in root indirect block */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
     size_t      obj_size;               /* Size of object */
     size_t      fill_size;              /* Size of objects for "bulk" filled blocks */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -11786,8 +11786,8 @@ test_huge_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for object */
     size_t      obj_size;               /* Size of object */
     size_t      robj_size;              /* Size of object read */
@@ -11939,8 +11939,8 @@ test_huge_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for first object */
     unsigned char *heap_id2 = NULL;     /* Heap ID for second object */
     size_t      obj_size;               /* Size of object */
@@ -12172,8 +12172,8 @@ test_huge_insert_three(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tp
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for first object */
     unsigned char *heap_id2 = NULL;     /* Heap ID for second object */
     unsigned char *heap_id3 = NULL;     /* Heap ID for third object */
@@ -12480,8 +12480,8 @@ test_huge_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for first object */
     unsigned char *heap_id2 = NULL;     /* Heap ID for second object */
     unsigned char *heap_id3 = NULL;     /* Heap ID for third object */
@@ -12907,8 +12907,8 @@ test_filtered_huge(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for object */
     size_t      obj_size;               /* Size of object */
     size_t      robj_size;              /* Size of object read */
@@ -13118,8 +13118,8 @@ test_tiny_insert_one(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for object */
     size_t      obj_size;               /* Size of object */
     size_t      robj_size;              /* Size of object read */
@@ -13271,8 +13271,8 @@ test_tiny_insert_two(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for first object */
     unsigned char *heap_id2 = NULL;     /* Heap ID for second object */
     size_t      obj_size;               /* Size of object */
@@ -13505,8 +13505,8 @@ test_tiny_insert_mix(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpar
     haddr_t     fh_addr;                /* Address of fractal heap */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     size_t      id_len;                 /* Size of fractal heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char *heap_id = NULL;      /* Heap ID for first object */
     unsigned char *heap_id2 = NULL;     /* Heap ID for second object */
     unsigned char *heap_id3 = NULL;     /* Heap ID for third object */
@@ -14115,8 +14115,8 @@ test_filtered_man_root_direct(hid_t fapl, H5HF_create_t *cparam, fheap_test_para
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     unsigned char heap_id[HEAP_ID_LEN]; /* Heap ID for object */
     size_t      obj_size;               /* Size of object */
     size_t      robj_size;              /* Size of object read */
@@ -14282,9 +14282,9 @@ test_filtered_man_root_indirect(hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     haddr_t     fh_addr;                /* Address of fractal heap */
     H5HF_create_t tmp_cparam;           /* Local heap creation parameters */
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
-    off_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
 #ifdef NOT_YET
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       file_size;              /* Size of file currently */
 #endif /* NOT_YET */
     unsigned char heap_id1[HEAP_ID_LEN]; /* Heap ID for object #1 */
     unsigned char heap_id2[HEAP_ID_LEN]; /* Heap ID for object #2 */
@@ -14598,8 +14598,8 @@ test_random(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_test_pa
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned long seed = 0;             /* Random # seed */
     hsize_t     total_obj_added;        /* Size of objects added */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     size_t      obj_size;               /* Size of object */
     size_t      obj_loc;                /* Location of object in buffer */
     fheap_heap_state_t state;           /* State of fractal heap */
@@ -14802,8 +14802,8 @@ test_random_pow2(hsize_t size_limit, hid_t fapl, H5HF_create_t *cparam, fheap_te
     fheap_heap_ids_t keep_ids;          /* Structure to retain heap IDs */
     unsigned long seed = 0;             /* Random # seed */
     hsize_t     total_obj_added;        /* Size of objects added */
-    off_t       empty_size;             /* Size of a file with an empty heap */
-    off_t       file_size;              /* Size of file currently */
+    h5_stat_size_t       empty_size;             /* Size of a file with an empty heap */
+    h5_stat_size_t       file_size;              /* Size of file currently */
     size_t      obj_size;               /* Size of object */
     size_t      obj_loc;                /* Location of object in buffer */
     fheap_heap_state_t state;           /* State of fractal heap */
diff --git a/test/stab.c b/test/stab.c
index dcb3f3a..e23a5f4 100644
--- a/test/stab.c
+++ b/test/stab.c
@@ -329,9 +329,9 @@ lifecycle(hid_t fapl)
     H5G_stat_t  obj_stat;               /* Object info */
     char        objname[NAME_BUF_SIZE];         /* Object name */
     char	filename[NAME_BUF_SIZE];
-    off_t       empty_size;             /* Size of an empty file */
+    h5_stat_size_t       empty_size;             /* Size of an empty file */
     unsigned    u;                      /* Local index variable */
-    off_t       file_size;              /* Size of each file created */
+    h5_stat_size_t       file_size;              /* Size of each file created */
 
     TESTING("group lifecycle");
 
@@ -555,8 +555,8 @@ long_compact(hid_t fapl)
     hid_t       fapl2 = (-1);           /* File access property list ID */
     char        *objname;               /* Object name */
     char	filename[NAME_BUF_SIZE];
-    off_t       empty_size;             /* Size of an empty file */
-    off_t       file_size;              /* Size of each file created */
+    h5_stat_size_t       empty_size;             /* Size of an empty file */
+    h5_stat_size_t       file_size;              /* Size of each file created */
 
     TESTING("long link names in compact groups");
 
@@ -811,8 +811,8 @@ no_compact(hid_t fapl)
     hid_t       fapl2 = (-1);           /* File access property list ID */
     char        objname[NAME_BUF_SIZE];         /* Object name */
     char	filename[NAME_BUF_SIZE];
-    off_t       empty_size;             /* Size of an empty file */
-    off_t       file_size;              /* Size of each file created */
+    h5_stat_size_t       empty_size;             /* Size of an empty file */
+    h5_stat_size_t       file_size;              /* Size of each file created */
     unsigned	est_num_entries;	/* Estimated # of entries in group */
     unsigned	est_name_len;		/* Estimated length of entry name */
 
diff --git a/test/tattr.c b/test/tattr.c
index 969734b..cca4cbf 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -1510,8 +1510,8 @@ test_attr_dtype_shared(hid_t fapl)
     int data=8;                 /* Data to write */
     int rdata=0;                /* Read read in */
     H5G_stat_t statbuf;         /* Object's information */
-    off_t empty_filesize;       /* Size of empty file */
-    off_t filesize;             /* Size of file after modifications */
+    h5_stat_size_t empty_filesize;       /* Size of empty file */
+    h5_stat_size_t filesize;             /* Size of file after modifications */
     herr_t  ret;		/* Generic return value		*/
 
     /* Output message about test being performed */
diff --git a/test/unlink.c b/test/unlink.c
index edb6b6c..1045960 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -511,8 +511,8 @@ test_filespace(hid_t fapl)
     hsize_t     attr_dims[FILESPACE_ATTR_NDIMS]= {FILESPACE_ATTR_DIM0, FILESPACE_ATTR_DIM1};        /* Attribute dimensions */
     int        *data = NULL;    /* Pointer to dataset buffer */
     int        *tmp_data;       /* Temporary pointer to dataset buffer */
-    off_t       empty_size;     /* Size of an empty file */
-    off_t       file_size;      /* Size of each file created */
+    h5_stat_size_t       empty_size;     /* Size of an empty file */
+    h5_stat_size_t       file_size;      /* Size of each file created */
     herr_t	status;         /* Function status return value */
     unsigned u,v,w;             /* Local index variables */
 
@@ -2095,8 +2095,8 @@ test_full_group_compact(hid_t fapl)
     char objname[128];          /* Buffer for name of objects to create */
     char objname2[128];         /* Buffer for name of objects to create */
     char filename[1024];        /* Buffer for filename */
-    off_t       keep_size;      /* Size of the file with objects to keep */
-    off_t       file_size;      /* Size of each file created */
+    h5_stat_size_t       keep_size;      /* Size of the file with objects to keep */
+    h5_stat_size_t       file_size;      /* Size of each file created */
     unsigned u;                 /* Local index variable */
 
     TESTING("unlinking non-empty compact group");
@@ -2229,8 +2229,8 @@ test_full_group_dense(hid_t fapl)
     char objname[128];          /* Buffer for name of objects to create */
     char objname2[128];         /* Buffer for name of objects to create */
     char filename[1024];        /* Buffer for filename */
-    off_t       keep_size;      /* Size of the file with objects to keep */
-    off_t       file_size;      /* Size of each file created */
+    h5_stat_size_t       keep_size;      /* Size of the file with objects to keep */
+    h5_stat_size_t       file_size;      /* Size of each file created */
     unsigned u;                 /* Local index variable */
 
     TESTING("unlinking non-empty dense group");