Formats the source and updates the gcc warning pragmas

1 files changed, 38 insertions, 57 deletions

diff --git a/src/H5HLdblk.c b/src/H5HLdblk.c
index c3fcffe..2d2a539 100644
--- a/src/H5HLdblk.c
+++ b/src/H5HLdblk.c
@@ -26,49 +26,41 @@
 /* Module Setup */
 /****************/
 
-#include "H5HLmodule.h"         /* This source code file is part of the H5HL module */
-
+#include "H5HLmodule.h" /* This source code file is part of the H5HL module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"      /* Generic Functions            */
-#include "H5Eprivate.h"     /* Error handling               */
-#include "H5FLprivate.h"    /* Free lists                   */
-#include "H5HLpkg.h"        /* Local Heaps                  */
-#include "H5MFprivate.h"    /* File memory management       */
-
+#include "H5private.h"   /* Generic Functions            */
+#include "H5Eprivate.h"  /* Error handling               */
+#include "H5FLprivate.h" /* Free lists                   */
+#include "H5HLpkg.h"     /* Local Heaps                  */
+#include "H5MFprivate.h" /* File memory management       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -76,8 +68,6 @@
 /* Declare a free list to manage the H5HL_dblk_t struct */
 H5FL_DEFINE_STATIC(H5HL_dblk_t);
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL__dblk_new
  *
@@ -91,21 +81,19 @@ H5FL_DEFINE_STATIC(H5HL_dblk_t);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-H5HL_dblk_t *, NULL, NULL,
-H5HL__dblk_new(H5HL_t *heap))
+BEGIN_FUNC(PKG, ERR, H5HL_dblk_t *, NULL, NULL, H5HL__dblk_new(H5HL_t *heap))
 
-    H5HL_dblk_t *dblk = NULL;           /* New local heap data block */
+    H5HL_dblk_t *dblk = NULL; /* New local heap data block */
 
     /* check arguments */
     HDassert(heap);
 
     /* Allocate new local heap data block */
-    if(NULL == (dblk = H5FL_CALLOC(H5HL_dblk_t)))
+    if (NULL == (dblk = H5FL_CALLOC(H5HL_dblk_t)))
         H5E_THROW(H5E_CANTALLOC, "memory allocation failed for local heap data block")
 
     /* Increment ref. count on heap data structure */
-    if(FAIL == H5HL__inc_rc(heap))
+    if (FAIL == H5HL__inc_rc(heap))
         H5E_THROW(H5E_CANTINC, "can't increment heap ref. count")
 
     /* Link the heap & the data block */
@@ -115,15 +103,14 @@ H5HL__dblk_new(H5HL_t *heap))
     /* Set the return value */
     ret_value = dblk;
 
-CATCH
+    CATCH
     /* Ensure that the data block memory is deallocated on errors */
-    if(!ret_value && dblk != NULL)
+    if (!ret_value && dblk != NULL)
         /* H5FL_FREE always returns NULL so we can't check for errors */
         dblk = H5FL_FREE(H5HL_dblk_t, dblk);
 
 END_FUNC(PKG) /* end H5HL__dblk_new() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL__dblk_dest
  *
@@ -136,34 +123,31 @@ END_FUNC(PKG) /* end H5HL__dblk_new() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5HL__dblk_dest(H5HL_dblk_t *dblk))
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_dest(H5HL_dblk_t *dblk))
 
     /* check arguments */
     HDassert(dblk);
 
     /* Check if data block was initialized */
-    if(dblk->heap) {
+    if (dblk->heap) {
         /* Unlink data block from heap */
         dblk->heap->dblk = NULL;
 
         /* Decrement ref. count on heap data structure */
-        if(FAIL == H5HL__dec_rc(dblk->heap))
+        if (FAIL == H5HL__dec_rc(dblk->heap))
             H5E_THROW(H5E_CANTDEC, "can't decrement heap ref. count")
 
         /* Unlink heap from data block */
         dblk->heap = NULL;
     } /* end if */
 
-CATCH
+    CATCH
     /* Free local heap data block */
     /* H5FL_FREE always returns NULL so we can't check for errors */
     dblk = H5FL_FREE(H5HL_dblk_t, dblk);
 
 END_FUNC(PKG) /* end H5HL__dblk_dest() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5HL__dblk_realloc
  *
@@ -176,29 +160,27 @@ END_FUNC(PKG) /* end H5HL__dblk_dest() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
+BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
 
-    H5HL_dblk_t *dblk;                  /* Local heap data block */
-    haddr_t old_addr;                   /* Old location of heap data block */
-    haddr_t new_addr;                   /* New location of heap data block */
-    size_t old_heap_size;               /* Old size of heap data block */
+    H5HL_dblk_t *dblk;          /* Local heap data block */
+    haddr_t      old_addr;      /* Old location of heap data block */
+    haddr_t      new_addr;      /* New location of heap data block */
+    size_t       old_heap_size; /* Old size of heap data block */
 
     /* check arguments */
     HDassert(heap);
     HDassert(new_heap_size > 0);
 
     /* Release old space on disk */
-    old_addr = heap->dblk_addr;
+    old_addr      = heap->dblk_addr;
     old_heap_size = heap->dblk_size;
     H5_CHECK_OVERFLOW(old_heap_size, size_t, hsize_t);
-    if(FAIL == H5MF_xfree(f, H5FD_MEM_LHEAP, old_addr, (hsize_t)old_heap_size))
+    if (FAIL == H5MF_xfree(f, H5FD_MEM_LHEAP, old_addr, (hsize_t)old_heap_size))
         H5E_THROW(H5E_CANTFREE, "can't free old local heap data");
 
     /* Allocate new space on disk */
     H5_CHECK_OVERFLOW(new_heap_size, size_t, hsize_t);
-    if(HADDR_UNDEF == (new_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, (hsize_t)new_heap_size)))
+    if (HADDR_UNDEF == (new_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, (hsize_t)new_heap_size)))
         H5E_THROW(H5E_CANTALLOC, "unable to allocate file space for local heap");
 
     /* Update heap info*/
@@ -206,15 +188,15 @@ H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
     heap->dblk_size = new_heap_size;
 
     /* Check if heap data block actually moved in the file */
-    if(H5F_addr_eq(old_addr, new_addr)) {
+    if (H5F_addr_eq(old_addr, new_addr)) {
         /* Check if heap data block is contiguous w/prefix */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Sanity check */
             HDassert(H5F_addr_eq(heap->prfx_addr + heap->prfx_size, old_addr));
             HDassert(heap->prfx);
 
             /* Resize the heap prefix in the cache */
-            if(FAIL == H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)))
+            if (FAIL == H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)))
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap in cache");
         } /* end if */
         else {
@@ -223,24 +205,24 @@ H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
             HDassert(heap->dblk);
 
             /* Resize the heap data block in the cache */
-            if(H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
+            if (H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap (data block) in cache");
         } /* end else */
-    } /* end if */
+    }     /* end if */
     else {
         /* Check if heap data block was contiguous w/prefix previously */
-        if(heap->single_cache_obj) {
+        if (heap->single_cache_obj) {
             /* Create new heap data block */
-            if(NULL == (dblk = H5HL__dblk_new(heap)))
+            if (NULL == (dblk = H5HL__dblk_new(heap)))
                 H5E_THROW(H5E_CANTALLOC, "unable to allocate local heap data block");
 
             /* Resize current heap prefix */
             heap->prfx_size = H5HL_SIZEOF_HDR(f);
-            if(FAIL == H5AC_resize_entry(heap->prfx, (size_t)heap->prfx_size))
+            if (FAIL == H5AC_resize_entry(heap->prfx, (size_t)heap->prfx_size))
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap prefix in cache");
 
             /* Insert data block into cache (pinned) */
-            if(FAIL == H5AC_insert_entry(f, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG))
+            if (FAIL == H5AC_insert_entry(f, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG))
                 H5E_THROW(H5E_CANTINIT, "unable to cache local heap data block");
 
             dblk = NULL;
@@ -253,22 +235,21 @@ H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
             /* (ignore [unlikely] case where heap data block ends up
              *      contiguous w/heap prefix again.
              */
-            if(FAIL == H5AC_resize_entry(heap->dblk, (size_t)new_heap_size))
+            if (FAIL == H5AC_resize_entry(heap->dblk, (size_t)new_heap_size))
                 H5E_THROW(H5E_CANTRESIZE, "unable to resize heap data block in cache");
 
             /* Relocate the heap data block in the cache */
-            if(FAIL == H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr))
+            if (FAIL == H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr))
                 H5E_THROW(H5E_CANTMOVE, "unable to move heap data block in cache");
 
         } /* end else */
-    } /* end else */
+    }     /* end else */
 
-CATCH
+    CATCH
     /* Restore old heap address & size on errors */
-    if(FAIL == ret_value) {
+    if (FAIL == ret_value) {
         heap->dblk_addr = old_addr;
         heap->dblk_size = old_heap_size;
     } /* end if */
 
 END_FUNC(PKG) /* end H5HL__dblk_realloc() */
-