Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 70 insertions, 99 deletions

diff --git a/src/H5Cepoch.c b/src/H5Cepoch.c
index 8bcab9f..37b83f3 100644
--- a/src/H5Cepoch.c
+++ b/src/H5Cepoch.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -22,24 +22,20 @@
  *-------------------------------------------------------------------------
  */
 
-
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"		/* Generic Functions			*/
-#include "H5ACprivate.h"        /* Metadata cache                       */
-
+#include "H5private.h"   /* Generic Functions			*/
+#include "H5ACprivate.h" /* Metadata cache                       */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -54,59 +50,49 @@
  * epochs so that they can be evicted from the cache.
  *
  ****************************************************************************/
-static herr_t H5C__epoch_marker_get_initial_load_size(void *udata_ptr,
-    size_t *image_len_ptr);
-static herr_t H5C__epoch_marker_get_final_load_size(const void *image_ptr,
-    size_t image_len_ptr, void *udata_ptr, size_t *actual_len);
-static htri_t H5C__epoch_marker_verify_chksum(const void *image_ptr, 
-    size_t len, void *udata_ptr);
-static void * H5C__epoch_marker_deserialize(const void * image_ptr,
-    size_t len, void * udata, hbool_t * dirty_ptr);
-static herr_t H5C__epoch_marker_image_len(const void * thing,
-    size_t *image_len_ptr);
-static herr_t H5C__epoch_marker_pre_serialize(H5F_t *f, void *thing,
-    haddr_t addr, size_t len, haddr_t *new_addr_ptr, size_t *new_len_ptr,
-    unsigned *flags_ptr);
-static herr_t H5C__epoch_marker_serialize(const H5F_t *f,
-    void * image_ptr, size_t len, void * thing);
+static herr_t H5C__epoch_marker_get_initial_load_size(void *udata_ptr, size_t *image_len_ptr);
+static herr_t H5C__epoch_marker_get_final_load_size(const void *image_ptr, size_t image_len_ptr,
+                                                    void *udata_ptr, size_t *actual_len);
+static htri_t H5C__epoch_marker_verify_chksum(const void *image_ptr, size_t len, void *udata_ptr);
+static void * H5C__epoch_marker_deserialize(const void *image_ptr, size_t len, void *udata,
+                                            hbool_t *dirty_ptr);
+static herr_t H5C__epoch_marker_image_len(const void *thing, size_t *image_len_ptr);
+static herr_t H5C__epoch_marker_pre_serialize(H5F_t *f, void *thing, haddr_t addr, size_t len,
+                                              haddr_t *new_addr_ptr, size_t *new_len_ptr,
+                                              unsigned *flags_ptr);
+static herr_t H5C__epoch_marker_serialize(const H5F_t *f, void *image_ptr, size_t len, void *thing);
 static herr_t H5C__epoch_marker_notify(H5C_notify_action_t action, void *thing);
-static herr_t H5C__epoch_marker_free_icr(void * thing);
-static herr_t H5C__epoch_marker_fsf_size(const void H5_ATTR_UNUSED * thing, 
-    hsize_t H5_ATTR_UNUSED * fsf_size_ptr);
-
+static herr_t H5C__epoch_marker_free_icr(void *thing);
+static herr_t H5C__epoch_marker_fsf_size(const void H5_ATTR_UNUSED *thing,
+                                         hsize_t H5_ATTR_UNUSED *fsf_size_ptr);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-
 /*****************************/
 /* Library Private Variables */
 /*****************************/
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-const H5AC_class_t H5AC_EPOCH_MARKER[1] = {{
-    /* id               = */ H5AC_EPOCH_MARKER_ID,
-    /* name             = */ "epoch marker",
-    /* mem_type         = */ H5FD_MEM_DEFAULT, /* value doesn't matter */
-    /* flags		= */ H5AC__CLASS_NO_FLAGS_SET,
-    /* get_initial_load_size = */ H5C__epoch_marker_get_initial_load_size,
-    /* get_final_load_size = */ H5C__epoch_marker_get_final_load_size,
-    /* verify_chksum    = */ H5C__epoch_marker_verify_chksum,
-    /* deserialize      = */ H5C__epoch_marker_deserialize,
-    /* image_len        = */ H5C__epoch_marker_image_len,
-    /* pre_serialize    = */ H5C__epoch_marker_pre_serialize,
-    /* serialize        = */ H5C__epoch_marker_serialize,
-    /* notify           = */ H5C__epoch_marker_notify,
-    /* free_icr         = */ H5C__epoch_marker_free_icr,
-    /* fsf_size         = */ H5C__epoch_marker_fsf_size,
-}};
-
+const H5AC_class_t H5AC_EPOCH_MARKER[1] = {
+    {/* id                    = */ H5AC_EPOCH_MARKER_ID,
+     /* name                  = */ "epoch marker",
+     /* mem_type              = */ H5FD_MEM_DEFAULT, /* value doesn't matter */
+     /* flags                 = */ H5AC__CLASS_NO_FLAGS_SET,
+     /* get_initial_load_size = */ H5C__epoch_marker_get_initial_load_size,
+     /* get_final_load_size   = */ H5C__epoch_marker_get_final_load_size,
+     /* verify_chksum         = */ H5C__epoch_marker_verify_chksum,
+     /* deserialize           = */ H5C__epoch_marker_deserialize,
+     /* image_len             = */ H5C__epoch_marker_image_len,
+     /* pre_serialize         = */ H5C__epoch_marker_pre_serialize,
+     /* serialize             = */ H5C__epoch_marker_serialize,
+     /* notify                = */ H5C__epoch_marker_notify,
+     /* free_icr              = */ H5C__epoch_marker_free_icr,
+     /* fsf_size              = */ H5C__epoch_marker_fsf_size}};
 
 /***************************************************************************
  * Class functions for H5C__EPOCH_MAKER_TYPE:
@@ -117,124 +103,109 @@ const H5AC_class_t H5AC_EPOCH_MARKER[1] = {{
  *
  ***************************************************************************/
 
-
 static herr_t
-H5C__epoch_marker_get_initial_load_size(void H5_ATTR_UNUSED *udata_ptr,
-    size_t H5_ATTR_UNUSED *image_len_ptr)
+H5C__epoch_marker_get_initial_load_size(void H5_ATTR_UNUSED *udata_ptr, size_t H5_ATTR_UNUSED *image_len_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_get_initial_load_size() */
 
-
 static herr_t
-H5C__epoch_marker_get_final_load_size(const void H5_ATTR_UNUSED *image_ptr,
-    size_t H5_ATTR_UNUSED image_len, void H5_ATTR_UNUSED *udata_ptr,
-    size_t H5_ATTR_UNUSED *actual_len)
+H5C__epoch_marker_get_final_load_size(const void H5_ATTR_UNUSED *image_ptr, size_t H5_ATTR_UNUSED image_len,
+                                      void H5_ATTR_UNUSED *udata_ptr, size_t H5_ATTR_UNUSED *actual_len)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_final_get_load_size() */
 
-
-static htri_t 
-H5C__epoch_marker_verify_chksum(const void H5_ATTR_UNUSED *image_ptr, size_t H5_ATTR_UNUSED len, 
-    void H5_ATTR_UNUSED *udata_ptr)
+static htri_t
+H5C__epoch_marker_verify_chksum(const void H5_ATTR_UNUSED *image_ptr, size_t H5_ATTR_UNUSED len,
+                                void H5_ATTR_UNUSED *udata_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FALSE)
 } /* end H5C__epoch_marker_verify_chksum() */
 
-
 static void *
-H5C__epoch_marker_deserialize(const void H5_ATTR_UNUSED * image_ptr, size_t H5_ATTR_UNUSED len,
-    void H5_ATTR_UNUSED * udata, hbool_t H5_ATTR_UNUSED * dirty_ptr)
+H5C__epoch_marker_deserialize(const void H5_ATTR_UNUSED *image_ptr, size_t H5_ATTR_UNUSED len,
+                              void H5_ATTR_UNUSED *udata, hbool_t H5_ATTR_UNUSED *dirty_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(NULL)
 } /* end H5C__epoch_marker_deserialize() */
 
-
 static herr_t
-H5C__epoch_marker_image_len(const void H5_ATTR_UNUSED *thing,
-    size_t H5_ATTR_UNUSED *image_len_ptr)
+H5C__epoch_marker_image_len(const void H5_ATTR_UNUSED *thing, size_t H5_ATTR_UNUSED *image_len_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_image_len() */
 
-
 static herr_t
-H5C__epoch_marker_pre_serialize(H5F_t H5_ATTR_UNUSED *f,
-    void H5_ATTR_UNUSED *thing, haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED len,
-    haddr_t H5_ATTR_UNUSED *new_addr_ptr, size_t H5_ATTR_UNUSED *new_len_ptr,
-    unsigned H5_ATTR_UNUSED *flags_ptr)
+H5C__epoch_marker_pre_serialize(H5F_t H5_ATTR_UNUSED *f, void H5_ATTR_UNUSED *thing,
+                                haddr_t H5_ATTR_UNUSED addr, size_t H5_ATTR_UNUSED len,
+                                haddr_t H5_ATTR_UNUSED *new_addr_ptr, size_t H5_ATTR_UNUSED *new_len_ptr,
+                                unsigned H5_ATTR_UNUSED *flags_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_pre_serialize() */
 
-
 static herr_t
 H5C__epoch_marker_serialize(const H5F_t H5_ATTR_UNUSED *f, void H5_ATTR_UNUSED *image_ptr,
-    size_t H5_ATTR_UNUSED len, void H5_ATTR_UNUSED *thing)
+                            size_t H5_ATTR_UNUSED len, void H5_ATTR_UNUSED *thing)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_serialize() */
 
-
 static herr_t
-H5C__epoch_marker_notify(H5C_notify_action_t H5_ATTR_UNUSED action,
-                       void H5_ATTR_UNUSED * thing)
+H5C__epoch_marker_notify(H5C_notify_action_t H5_ATTR_UNUSED action, void H5_ATTR_UNUSED *thing)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_notify() */
 
-
 static herr_t
-H5C__epoch_marker_free_icr(void H5_ATTR_UNUSED * thing)
+H5C__epoch_marker_free_icr(void H5_ATTR_UNUSED *thing)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_free_icr() */
 
-
-static herr_t 
-H5C__epoch_marker_fsf_size(const void H5_ATTR_UNUSED * thing, hsize_t H5_ATTR_UNUSED *fsf_size_ptr)
+static herr_t
+H5C__epoch_marker_fsf_size(const void H5_ATTR_UNUSED *thing, hsize_t H5_ATTR_UNUSED *fsf_size_ptr)
 {
-    FUNC_ENTER_STATIC_NOERR /* Yes, even though this pushes an error on the stack */
+    FUNC_ENTER_PACKAGE_NOERR /* Yes, even though this pushes an error on the stack */
 
-    HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
+        HERROR(H5E_CACHE, H5E_SYSTEM, "called unreachable fcn.");
 
     FUNC_LEAVE_NOAPI(FAIL)
 } /* end H5C__epoch_marker_fsf_size() */
-