[svn-r8893] Purpose:

    Code cleanup

Description:
    Clean up a bunch of warnings and bring new code better inline with current
library coding practice.

Platforms tested:
    FreeBSD 4.10 (sleipnir) w/parallel
    Too minor to require h5committest

Misc. update:

1 files changed, 84 insertions, 59 deletions

diff --git a/src/H5MF.c b/src/H5MF.c
index 97b2965..9da1a0f 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -32,14 +32,16 @@
  */
 #define H5F_PACKAGE		/*suppress error about including H5Fpkg	  */
 
+/* Pablo information */
+/* (Put before include files to avoid problems with inline functions) */
+#define PABLO_MASK      H5MF_mask
+
 #include "H5private.h"
 #include "H5Eprivate.h"
 #include "H5Fpkg.h"
 #include "H5FDprivate.h"
 #include "H5MFprivate.h"
 
-#define PABLO_MASK      H5MF_mask
-
 /* Is the interface initialized? */
 static int             interface_initialize_g = 0;
 #define INTERFACE_INIT  NULL
@@ -80,13 +82,14 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
     /* Fail if we don't have write access */
     if (0==(f->intent & H5F_ACC_RDWR))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, HADDR_UNDEF, "file is read-only");
+
     /* Check that the file can address the new space */
-    if( H5MF_alloc_overflow(f, size) != 0 )
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "not enough address space in file");
+    if( H5MF_alloc_overflow(f, size) )
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "not enough address space in file"); 
 
     /* Allocate space from the virtual file layer */
     if (HADDR_UNDEF==(ret_value=H5FD_alloc(f->shared->lf, type, dxpl_id, size)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed");
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "file allocation failed");
 
     /* Convert absolute file address to relative file address */
     assert(ret_value>=f->shared->base_addr);
@@ -197,6 +200,11 @@ H5MF_realloc(H5F_t *f, H5FD_mem_t type, hid_t dxpl_id, haddr_t old_addr, hsize_t
     /* Convert old relative address to absolute address */
     old_addr += f->shared->base_addr;
 
+    /* Check that the file can address the new space. */
+    /* In the worst case, this means adding new_size bytes to the end of the file. */
+    if( H5MF_alloc_overflow(f, new_size) )
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, HADDR_UNDEF, "not enough address space in file");
+
     /* Reallocate memory from the virtual file layer */
     ret_value = H5FD_realloc(f->shared->lf, type, dxpl_id, old_addr, old_size,
 			     new_size);
@@ -214,104 +222,119 @@ done:
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5MF_reserve
+ * Function:	H5MF_reserve
  *
- * Purpose:     Sets aside file space that has not yet been allocated, but will
- *                      be (or might be in the worst case).  This number is used to
- *                      ensure that there is room in the file when it is flushed to disk.
+ * Purpose:	Sets aside file space that has not yet been allocated, but will
+ *		be (or might be in the worst case).  This number is used to
+ *		ensure that there is room in the file when it is flushed to disk.
  *
- *                      Nothing changes (and no error is generated) if the file is opened
- *                      as read-only.
+ *		Nothing changes (and no error is generated) if the file is opened
+ *		as read-only.
  *
- * Return:      Success:        0
+ * Return:	Success:	0
  *
- *              Failure:        negative
+ * 		Failure:	negative
  *
- * Programmer:  James Laird
- *                              Nat Furrer
+ * Programmer:	James Laird
+ *		Nat Furrer
  *              Thursday, May 27, 2004
  *
  * Modifications:
  *-------------------------------------------------------------------------
  */
-herr_t H5MF_reserve(H5F_t *f, hsize_t size)
+herr_t
+H5MF_reserve(H5F_t *f, hsize_t size)
 {
-        herr_t ret_value = SUCCEED;
+    herr_t ret_value = SUCCEED;
+
     FUNC_ENTER_NOAPI(H5MF_reserve, FAIL);
 
-        /* Check arguments */
-        assert(f);
+    /* Check arguments */
+    assert(f);
 
-        /* Check that there is room in the file to reserve this space */
-        if( H5MF_alloc_overflow( f, size ) != 0)
-                HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "not enough address space in file");
+    /* Check that there is room in the file to reserve this space */
+    if( H5MF_alloc_overflow( f, size ) )
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "not enough address space in file");
 
-        f->shared->lf->reserved_alloc += size;
+    f->shared->lf->reserved_alloc += size;
 
 done:
-        FUNC_LEAVE_NOAPI(ret_value);
+    FUNC_LEAVE_NOAPI(ret_value);
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5MF_free_reserved
+ * Function:	H5MF_free_reserved
  *
- * Purpose:     Releases the file space set aside by H5MF_reserve.  This should
- *                      be called immediately before allocating the file space for which
- *                      the space was reserved.
+ * Purpose:	Releases the file space set aside by H5MF_reserve.  This should
+ *			be called immediately before allocating the file space for which
+ *			the space was reserved.
  *
- * Return:      None
+ * Return:	None
  *
- * Programmer:  James Laird
- *                              Nat Furrer
+ * Programmer:	James Laird
+ *				Nat Furrer
  *              Thursday, May 27, 2004
  *
  * Modifications:
  *-------------------------------------------------------------------------
  */
-void H5MF_free_reserved(H5F_t *f, hsize_t size)
+herr_t
+H5MF_free_reserved(H5F_t *f, hsize_t size)
 {
-        /* Check arguments */
-        assert(f);
+    herr_t ret_value = SUCCEED;
 
-        /* If this assert breaks, it means that HDF5 is trying to free file space
-         * that was never reserved.
-         */
-        assert(size <= f->shared->lf->reserved_alloc);
+    FUNC_ENTER_NOAPI(H5MF_free_reserved,FAIL)
+
+    /* Check arguments */
+    assert(f);
+
+    /* If this assert breaks, it means that HDF5 is trying to free file space
+     * that was never reserved.
+     */
+    assert(size <= f->shared->lf->reserved_alloc);
 
-        f->shared->lf->reserved_alloc -= size;
+    f->shared->lf->reserved_alloc -= size;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 /*-------------------------------------------------------------------------
- * Function:    H5MF_alloc_overflow
+ * Function:	H5MF_alloc_overflow
  *
- * Purpose:     Checks if an allocation of file space would cause an overflow.
+ * Purpose:	Checks if an allocation of file space would cause an overflow.
  *          F is the file whose space is being allocated, SIZE is the amount
  *          of space needed.
  *
- * Return:      0 if no overflow would result
+ * Return:	0 if no overflow would result
  *          1 if overflow would result (the allocation should not be allowed)
  *
- * Programmer:  James Laird
- *                              Nat Furrer
+ * Programmer:	James Laird
+ *				Nat Furrer
  *              Tuesday, June 1, 2004
  *
  * Modifications:
  *-------------------------------------------------------------------------
  */
-int H5MF_alloc_overflow(H5F_t *f, hsize_t size)
+hbool_t
+H5MF_alloc_overflow(H5F_t *f, hsize_t size)
 {
-    hsize_t space_needed;    /* Accumulator variable */
-    size_t c;
+    hsize_t space_needed;       /* Accumulator variable */
+    size_t c;                   /* Local index variable */
+    hbool_t ret_value;           /* Return value */
+
+    FUNC_ENTER_NOAPI(H5MF_alloc_overflow,FALSE)
 
     /* Start with the current end of the file's address. */
-    space_needed = f->shared->lf->cls->get_eoa(f->shared->lf);
+    space_needed = (hsize_t)H5F_get_eoa(f);
+    HDassert(H5F_addr_defined(space_needed));
 
     /* Subtract the file's base address to get the actual amount of
      * space being used:
      * (end of allocated space - beginning of allocated space)
      */
-    assert(f->shared->base_addr < space_needed);
-    space_needed -= f->shared->base_addr;
+    HDassert(H5F_BASE_ADDR(f) < space_needed);
+    space_needed -= (hsize_t)H5F_BASE_ADDR(f);
 
     /* Add the amount of space requested for this allocation */
     space_needed += size;
@@ -334,9 +357,12 @@ int H5MF_alloc_overflow(H5F_t *f, hsize_t size)
         space_needed = space_needed >> 16;
 
     if(space_needed != 0)
-        return 1;
+        ret_value=TRUE;
     else
-        return 0;
+        ret_value=FALSE;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
 }
 
 
@@ -365,11 +391,11 @@ htri_t
 H5MF_can_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
 {
     htri_t	ret_value;      /* Return value */
-    
+
     FUNC_ENTER_NOAPI(H5MF_can_extend, FAIL);
 
     /* Convert old relative address to absolute address */
-    addr += f->shared->base_addr;
+    addr += H5F_BASE_ADDR(f);
 
     /* Pass the request down to the virtual file layer */
     if((ret_value=H5FD_can_extend(f->shared->lf, type, addr, size, extra_requested))<0)
@@ -404,16 +430,16 @@ htri_t
 H5MF_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra_requested)
 {
     htri_t	ret_value;      /* Return value */
-    
-    FUNC_ENTER_NOAPI(H5MF_extend, FAIL);
 
-    /* Convert old relative address to absolute address */
-    addr += f->shared->base_addr;
+    FUNC_ENTER_NOAPI(H5MF_extend, FAIL);
 
     /* Make sure there is enough addressable space to satisfy the request */
     if ( H5MF_alloc_overflow(f, extra_requested) )
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory: out of address space");
 
+    /* Convert old relative address to absolute address */
+    addr += H5F_BASE_ADDR(f);
+
     /* Pass the request down to the virtual file layer */
     if((ret_value=H5FD_extend(f->shared->lf, type, addr, size, extra_requested))<0)
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate new file memory");
@@ -421,4 +447,3 @@ H5MF_extend(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size, hsize_t extra
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5MF_extend() */
-