Formats the source and updates the gcc warning pragmas

1 files changed, 31 insertions, 43 deletions

diff --git a/src/H5Ctest.c b/src/H5Ctest.c
index b549da5..72aed27 100644
--- a/src/H5Ctest.c
+++ b/src/H5Ctest.c
@@ -27,58 +27,50 @@
 /* Module Setup */
 /****************/
 
-#include "H5Cmodule.h"          /* This source code file is part of the H5C module */
-#define H5C_TESTING		/*suppress warning about H5C testing funcs*/
-#define H5F_FRIEND		/*suppress error about including H5Fpkg	  */
-
+#include "H5Cmodule.h" /* This source code file is part of the H5C module */
+#define H5C_TESTING    /*suppress warning about H5C testing funcs*/
+#define H5F_FRIEND     /*suppress error about including H5Fpkg	  */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			    */
-#include "H5Cpkg.h"		/* Cache				    */
-#include "H5Eprivate.h"		/* Error handling		  	    */
-#include "H5Fpkg.h"		/* Files				    */
-#include "H5Iprivate.h"		/* IDs			  		    */
+#include "H5private.h"          /* Generic Functions			    */
+#include "H5Cpkg.h"             /* Cache				    */
+#include "H5Eprivate.h"         /* Error handling		  	    */
+#include "H5Fpkg.h"             /* Files				    */
+#include "H5Iprivate.h"         /* IDs			  		    */
 #include "H5VLprivate.h"        /* Virtual Object Layer                     */
 #include "H5VLnative_private.h" /* Native VOL connector                     */
 
-
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Typedef for tagged entry iterator callback context - verify cork tag */
 typedef struct {
-    hbool_t status;             /* Corked status */
+    hbool_t status; /* Corked status */
 } H5C_tag_iter_vct_ctx_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C__verify_cork_tag_test_cb
  *
@@ -95,8 +87,8 @@ static int
 H5C__verify_cork_tag_test_cb(H5C_cache_entry_t *entry, void *_ctx)
 {
     H5C_tag_iter_vct_ctx_t *ctx = (H5C_tag_iter_vct_ctx_t *)_ctx; /* Get pointer to iterator context */
-    hbool_t is_corked;                  /* Corked status for entry */
-    int ret_value = H5_ITER_CONT;       /* Return value */
+    hbool_t                 is_corked;                            /* Corked status for entry */
+    int                     ret_value = H5_ITER_CONT;             /* Return value */
 
     /* Function enter macro */
     FUNC_ENTER_STATIC
@@ -109,14 +101,13 @@ H5C__verify_cork_tag_test_cb(H5C_cache_entry_t *entry, void *_ctx)
     is_corked = entry->tag_info ? entry->tag_info->corked : FALSE;
 
     /* Verify corked status for entry */
-    if(is_corked != ctx->status)
+    if (is_corked != ctx->status)
         HGOTO_ERROR(H5E_CACHE, H5E_BADVALUE, H5_ITER_ERROR, "bad cork status")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C__verify_cork_tag_test_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C__verify_cork_tag_test
  *
@@ -133,22 +124,22 @@ done:
 herr_t
 H5C__verify_cork_tag_test(hid_t fid, H5O_token_t tag_token, hbool_t status)
 {
-    H5F_t * f;                  /* File Pointer */
-    H5C_t * cache;              /* Cache Pointer */
-    H5C_tag_iter_vct_ctx_t ctx; /* Context for iterator callback */
-    haddr_t tag;                /* Tagged address */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5F_t *                f;                   /* File Pointer */
+    H5C_t *                cache;               /* Cache Pointer */
+    H5C_tag_iter_vct_ctx_t ctx;                 /* Context for iterator callback */
+    haddr_t                tag;                 /* Tagged address */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     /* Function enter macro */
     FUNC_ENTER_PACKAGE
 
     /* Get file pointer */
-    if(NULL == (f = (H5F_t *)H5VL_object_verify(fid, H5I_FILE)))
+    if (NULL == (f = (H5F_t *)H5VL_object_verify(fid, H5I_FILE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
 
     /* Convert token to address */
     tag = HADDR_UNDEF;
-    if(H5VL_native_token_to_addr(f, H5I_FILE, tag_token, &tag) < 0)
+    if (H5VL_native_token_to_addr(f, H5I_FILE, tag_token, &tag) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTGET, FAIL, "can't get address for token")
 
     /* Get cache pointer */
@@ -158,35 +149,34 @@ H5C__verify_cork_tag_test(hid_t fid, H5O_token_t tag_token, hbool_t status)
     ctx.status = status;
 
     /* Iterate through tagged entries in the cache */
-    if(H5C__iter_tagged_entries(cache, tag, FALSE, H5C__verify_cork_tag_test_cb, &ctx) < 0)
+    if (H5C__iter_tagged_entries(cache, tag, FALSE, H5C__verify_cork_tag_test_cb, &ctx) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_BADITER, FAIL, "iteration of tagged entries failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5C__verify_cork_tag_test() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5C_set_curr_io_type_splitable()
  *
- * Purpose:     To test the meta data entry splitting capability in the page 
+ * Purpose:     To test the meta data entry splitting capability in the page
  *              buffer (needed to deal with H5FA and H5EA's unfortunate
- *              design choice of sub-allocating multiple metadata entries 
+ *              design choice of sub-allocating multiple metadata entries
  *              out of a single file space allocation), we must be able
- *              to configure the metadata cache to report that the 
+ *              to configure the metadata cache to report that the
  *              current I/O request is for such an entry.
  *
- *              To do this, we must set cache_ptr->curr_io_type to 
- *              point to the instance of H5C_class_t with one such 
+ *              To do this, we must set cache_ptr->curr_io_type to
+ *              point to the instance of H5C_class_t with one such
  *              client.
  *
  *              This function does this by setting cache_ptr->curr_io_type
- *              to H5AC_EARRAY_DBLK_PAGE if set_splitable is TRUE, and to 
+ *              to H5AC_EARRAY_DBLK_PAGE if set_splitable is TRUE, and to
  *              NULL otherwise.
  *
  *              Needless to say, this is purely a testing function, and
  *              should not be called otherwise.
- *              
+ *
  * Return:      void
  *
  * Programmer:  John Mainzer
@@ -198,24 +188,22 @@ done:
  */
 
 void
-H5C_set_curr_io_type_splitable(H5C_t * cache_ptr, hbool_t set_splitable)
+H5C_set_curr_io_type_splitable(H5C_t *cache_ptr, hbool_t set_splitable)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOERR
 
     HDassert(cache_ptr);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
-    if ( set_splitable ) {
+    if (set_splitable) {
 
         cache_ptr->curr_io_type = H5AC_EARRAY_DBLK_PAGE;
-
-    } else {
+    }
+    else {
 
         cache_ptr->curr_io_type = NULL;
     }
 
-
     FUNC_LEAVE_NOAPI_VOID
 
 } /* H5C_set_curr_io_type_splitable() */
-