Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 28 insertions, 35 deletions

diff --git a/src/H5FAint.c b/src/H5FAint.c
index 9d3bce8..2206901 100644
--- a/src/H5FAint.c
+++ b/src/H5FAint.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -15,7 +15,7 @@
  *
  * Created:     H5FAint.c
  *              Fall 2012
- *              Dana Robinson <derobins@hdfgroup.org>
+ *              Dana Robinson
  *
  * Purpose:     Internal routines for fixed arrays.
  *
@@ -26,58 +26,47 @@
 /* Module Declaration */
 /**********************/
 
-#include "H5FAmodule.h"         /* This source code file is part of the H5FA module */
-
+#include "H5FAmodule.h" /* This source code file is part of the H5FA module */
 
 /***********************/
 /* Other Packages Used */
 /***********************/
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"              /* Generic Functions                */
-#include "H5Eprivate.h"             /* Error Handling                   */
-#include "H5FApkg.h"                /* Fixed Arrays                     */
-
+#include "H5private.h"  /* Generic Functions                */
+#include "H5Eprivate.h" /* Error Handling                   */
+#include "H5FApkg.h"    /* Fixed Arrays                     */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
-
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__create_flush_depend
  *
@@ -90,23 +79,25 @@
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__create_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry))
+herr_t
+H5FA__create_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(parent_entry);
     HDassert(child_entry);
 
     /* Create a flush dependency between parent and child entry */
-    if(H5AC_create_flush_dependency(parent_entry, child_entry) < 0)
-        H5E_THROW(H5E_CANTDEPEND, "unable to create flush dependency")
-
-CATCH
+    if (H5AC_create_flush_dependency(parent_entry, child_entry) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTDEPEND, FAIL, "unable to create flush dependency")
 
-END_FUNC(PKG)   /* end H5FA__create_flush_depend() */
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__create_flush_depend() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FA__destroy_flush_depend
  *
@@ -119,19 +110,21 @@ END_FUNC(PKG)   /* end H5FA__create_flush_depend() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR,
-herr_t, SUCCEED, FAIL,
-H5FA__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry))
+herr_t
+H5FA__destroy_flush_depend(H5AC_info_t *parent_entry, H5AC_info_t *child_entry)
+{
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(parent_entry);
     HDassert(child_entry);
 
     /* Destroy a flush dependency between parent and child entry */
-    if(H5AC_destroy_flush_dependency(parent_entry, child_entry) < 0)
-        H5E_THROW(H5E_CANTUNDEPEND, "unable to destroy flush dependency")
-
-CATCH
-
-END_FUNC(PKG)   /* end H5FA__destroy_flush_depend() */
+    if (H5AC_destroy_flush_dependency(parent_entry, child_entry) < 0)
+        HGOTO_ERROR(H5E_FARRAY, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency")
 
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FA__destroy_flush_depend() */