Source formatted

1 files changed, 46 insertions, 62 deletions

diff --git a/src/H5Fio.c b/src/H5Fio.c
index 0a2effb..8755fd8 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -26,56 +26,46 @@
 /* Module Setup */
 /****************/
 
-#include "H5Fmodule.h"          /* This source code file is part of the H5F module */
-
+#include "H5Fmodule.h" /* This source code file is part of the H5F module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5Eprivate.h"		/* Error handling		  	*/
-#include "H5Fpkg.h"             /* File access				*/
-#include "H5FDprivate.h"	/* File drivers				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-#include "H5PBprivate.h"	/* Page Buffer				*/
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5Eprivate.h"  /* Error handling		  	*/
+#include "H5Fpkg.h"      /* File access				*/
+#include "H5FDprivate.h" /* File drivers				*/
+#include "H5Iprivate.h"  /* IDs			  		*/
+#include "H5PBprivate.h" /* Page Buffer				*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_block_read
  *
@@ -91,10 +81,10 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void *buf/*out*/)
+H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void *buf /*out*/)
 {
-    H5FD_mem_t  map_type;               /* Mapped memory type */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FD_mem_t map_type;            /* Mapped memory type */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -105,21 +95,20 @@ H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, void *buf/*
     HDassert(H5F_addr_defined(addr));
 
     /* Check for attempting I/O on 'temporary' file address */
-    if(H5F_addr_le(f->shared->tmp_addr, (addr + size)))
+    if (H5F_addr_le(f->shared->tmp_addr, (addr + size)))
         HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
-    if(H5PB_read(f->shared, map_type, addr, size, buf) < 0)
+    if (H5PB_read(f->shared, map_type, addr, size, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "read through page buffer failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_block_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5F_block_write
  *
@@ -137,8 +126,8 @@ done:
 herr_t
 H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, const void *buf)
 {
-    H5FD_mem_t  map_type;               /* Mapped memory type */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FD_mem_t map_type;            /* Mapped memory type */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -150,21 +139,20 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, const void
     HDassert(H5F_addr_defined(addr));
 
     /* Check for attempting I/O on 'temporary' file address */
-    if(H5F_addr_le(f->shared->tmp_addr, (addr + size)))
+    if (H5F_addr_le(f->shared->tmp_addr, (addr + size)))
         HGOTO_ERROR(H5E_IO, H5E_BADRANGE, FAIL, "attempting I/O in temporary file space")
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
     /* Pass through page buffer layer */
-    if(H5PB_write(f->shared, map_type, addr, size, buf) < 0)
+    if (H5PB_write(f->shared, map_type, addr, size, buf) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "write through page buffer failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5F_block_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_flush_tagged_metadata
  *
@@ -186,22 +174,21 @@ H5F_flush_tagged_metadata(H5F_t *f, haddr_t tag)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Use tag to search for and flush associated metadata */
-    if(H5AC_flush_tagged_metadata(f, tag) < 0)
+    if (H5AC_flush_tagged_metadata(f, tag) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
 
     /* Flush and reset the accumulator */
-    if(H5F__accum_reset(f->shared, TRUE) < 0)
+    if (H5F__accum_reset(f->shared, TRUE) < 0)
         HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator")
 
     /* Flush file buffers to disk. */
-    if(H5FD_flush(f->shared->lf, FALSE) < 0)
+    if (H5FD_flush(f->shared->lf, FALSE) < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "low level flush failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5F_flush_tagged_metadata */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_evict_tagged_metadata
  *
@@ -222,14 +209,13 @@ H5F_evict_tagged_metadata(H5F_t *f, haddr_t tag)
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Evict the object's metadata */
-    if(H5AC_evict_tagged_metadata(f, tag, TRUE) < 0)
+    if (H5AC_evict_tagged_metadata(f, tag, TRUE) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "unable to evict tagged metadata")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5F_evict_tagged_metadata */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F__evict_cache_entries
  *
@@ -253,37 +239,36 @@ H5F__evict_cache_entries(H5F_t *f)
     HDassert(f->shared);
 
     /* Evict all except pinned entries in the cache */
-    if(H5AC_evict(f) < 0)
+    if (H5AC_evict(f) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTEXPUNGE, FAIL, "unable to evict all except pinned entries")
 
 #ifndef NDEBUG
-{
-    unsigned status = 0;
-    uint32_t cur_num_entries;
-
-    /* Retrieve status of the superblock */
-    if(H5AC_get_entry_status(f, (haddr_t)0, &status) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
-
-    /* Verify status of the superblock entry in the cache */
-    if(!(status & H5AC_ES__IN_CACHE) || !(status & H5AC_ES__IS_PINNED))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
-
-    /* Get the number of cache entries */
-    if(H5AC_get_cache_size(f->shared->cache, NULL, NULL, NULL, &cur_num_entries) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
-
-    /* Should be the only one left in the cache (the superblock) */
-    if(cur_num_entries != 1)
-        HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "number of cache entries is not correct")
-}
+    {
+        unsigned status = 0;
+        uint32_t cur_num_entries;
+
+        /* Retrieve status of the superblock */
+        if (H5AC_get_entry_status(f, (haddr_t)0, &status) < 0)
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
+
+        /* Verify status of the superblock entry in the cache */
+        if (!(status & H5AC_ES__IN_CACHE) || !(status & H5AC_ES__IS_PINNED))
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to get entry status")
+
+        /* Get the number of cache entries */
+        if (H5AC_get_cache_size(f->shared->cache, NULL, NULL, NULL, &cur_num_entries) < 0)
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5AC_get_cache_size() failed.")
+
+        /* Should be the only one left in the cache (the superblock) */
+        if (cur_num_entries != 1)
+            HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "number of cache entries is not correct")
+    }
 #endif /* NDEBUG */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5F__evict_cache_entries() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5F_get_checksums
  *
@@ -300,7 +285,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_get_checksums(const uint8_t *buf, size_t buf_size, uint32_t *s_chksum/*out*/, uint32_t *c_chksum/*out*/)
+H5F_get_checksums(const uint8_t *buf, size_t buf_size, uint32_t *s_chksum /*out*/, uint32_t *c_chksum /*out*/)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
@@ -309,8 +294,8 @@ H5F_get_checksums(const uint8_t *buf, size_t buf_size, uint32_t *s_chksum/*out*/
     HDassert(buf_size);
 
     /* Return the stored checksum */
-    if(s_chksum) {
-        const uint8_t *chk_p;      	/* Pointer into raw data buffer */
+    if (s_chksum) {
+        const uint8_t *chk_p; /* Pointer into raw data buffer */
 
         /* Offset to the checksum in the buffer */
         chk_p = buf + buf_size - H5_SIZEOF_CHKSUM;
@@ -320,9 +305,8 @@ H5F_get_checksums(const uint8_t *buf, size_t buf_size, uint32_t *s_chksum/*out*/
     } /* end if */
 
     /* Return the computed checksum for the buffer */
-    if(c_chksum)
-	*c_chksum = H5_checksum_metadata(buf, buf_size - H5_SIZEOF_CHKSUM, 0);
+    if (c_chksum)
+        *c_chksum = H5_checksum_metadata(buf, buf_size - H5_SIZEOF_CHKSUM, 0);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5F_get_chksums() */
-