Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 139 insertions, 163 deletions

diff --git a/src/H5Defl.c b/src/H5Defl.c
index 91caa61..215ce03 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -6,13 +6,13 @@
  * 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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer: Quincey Koziol <koziol@ncsa.uiuc.edu>
+ * Programmer: Quincey Koziol
  *	       Thursday, September 30, 2004
  */
 
@@ -20,67 +20,60 @@
 /* Module Setup */
 /****************/
 
-#include "H5Dmodule.h"          /* This source code file is part of the H5D module */
-
+#include "H5Dmodule.h" /* This source code file is part of the H5D module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                        */
-#include "H5Dpkg.h"             /* Datasets                                 */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5Fprivate.h"         /* Files                                    */
-#include "H5HLprivate.h"        /* Local Heaps                              */
-#include "H5MMprivate.h"        /* Memory management                        */
-#include "H5VMprivate.h"        /* Vector and array functions               */
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5Dpkg.h"      /* Datasets                                 */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5Fprivate.h"  /* Files                                    */
+#include "H5HLprivate.h" /* Local Heaps                              */
+#include "H5MMprivate.h" /* Memory management                        */
+#include "H5VMprivate.h" /* Vector and array functions               */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* Callback info for readvv operation */
 typedef struct H5D_efl_readvv_ud_t {
-    const H5O_efl_t *efl;       /* Pointer to efl info */
-    const H5D_t *dset;          /* The dataset */
-    unsigned char *rbuf;        /* Read buffer */
+    const H5O_efl_t *efl;  /* Pointer to efl info */
+    const H5D_t *    dset; /* The dataset */
+    unsigned char *  rbuf; /* Read buffer */
 } H5D_efl_readvv_ud_t;
 
 /* Callback info for writevv operation */
 typedef struct H5D_efl_writevv_ud_t {
-    const H5O_efl_t *efl;       /* Pointer to efl info */
-    const H5D_t *dset;          /* The dataset */
-    const unsigned char *wbuf;  /* Write buffer */
+    const H5O_efl_t *    efl;  /* Pointer to efl info */
+    const H5D_t *        dset; /* The dataset */
+    const unsigned char *wbuf; /* Write buffer */
 } H5D_efl_writevv_ud_t;
 
-
 /********************/
 /* Local Prototypes */
 /********************/
 
 /* Layout operation callbacks */
-static herr_t H5D__efl_construct(H5F_t *f, H5D_t *dset);
-static herr_t H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
-    hsize_t nelmts, const H5S_t *file_space, const H5S_t *mem_space,
-    H5D_chunk_map_t *cm);
-static ssize_t H5D__efl_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
-static ssize_t H5D__efl_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_offset_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static herr_t  H5D__efl_construct(H5F_t *f, H5D_t *dset);
+static herr_t  H5D__efl_io_init(H5D_io_info_t *io_info, const H5D_type_info_t *type_info, hsize_t nelmts,
+                                H5S_t *file_space, H5S_t *mem_space, H5D_chunk_map_t *cm);
+static ssize_t H5D__efl_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                               size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                               size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
+static ssize_t H5D__efl_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                                size_t dset_len_arr[], hsize_t dset_offset_arr[], size_t mem_max_nseq,
+                                size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_offset_arr[]);
 
 /* Helper routines */
-static herr_t H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size,
-    uint8_t *buf);
+static herr_t H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, uint8_t *buf);
 static herr_t H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size,
-    const uint8_t *buf);
-
+                             const uint8_t *buf);
 
 /*********************/
 /* Package Variables */
@@ -88,31 +81,28 @@ static herr_t H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t ad
 
 /* External File List (EFL) storage layout I/O ops */
 const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{
-    H5D__efl_construct,
-    NULL,
-    H5D__efl_is_space_alloc,
-    NULL,
-    H5D__efl_io_init,
-    H5D__contig_read,
-    H5D__contig_write,
+    H5D__efl_construct,      /* construct */
+    NULL,                    /* init */
+    H5D__efl_is_space_alloc, /* is_space_alloc */
+    NULL,                    /* is_data_cached */
+    H5D__efl_io_init,        /* io_init */
+    H5D__contig_read,        /* ser_read */
+    H5D__contig_write,       /* ser_write */
 #ifdef H5_HAVE_PARALLEL
-    NULL,
-    NULL,
-#endif /* H5_HAVE_PARALLEL */
-    H5D__efl_readvv,
-    H5D__efl_writevv,
-    NULL,
-    NULL,
-    NULL
+    NULL, /* par_read */
+    NULL, /* par_write */
+#endif
+    H5D__efl_readvv,  /* readvv */
+    H5D__efl_writevv, /* writevv */
+    NULL,             /* flush */
+    NULL,             /* io_term */
+    NULL              /* dest */
 }};
 
-
 /*******************/
 /* Local Variables */
 /*******************/
 
-
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_construct
  *
@@ -128,15 +118,15 @@ const H5D_layout_ops_t H5D_LOPS_EFL[1] = {{
 static herr_t
 H5D__efl_construct(H5F_t *f, H5D_t *dset)
 {
-    size_t dt_size;                     /* Size of datatype */
-    hssize_t stmp_size;                 /* Temporary holder for raw data size */
-    hsize_t tmp_size;                   /* Temporary holder for raw data size */
-    hsize_t max_points;                 /* Maximum elements */
-    hsize_t max_storage;                /* Maximum storage size */
-    unsigned u;                         /* Local index variable */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    size_t   dt_size;             /* Size of datatype */
+    hssize_t stmp_size;           /* Temporary holder for raw data size */
+    hsize_t  tmp_size;            /* Temporary holder for raw data size */
+    hsize_t  max_points;          /* Maximum elements */
+    hsize_t  max_storage;         /* Maximum storage size */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity checks */
     HDassert(f);
@@ -149,24 +139,24 @@ H5D__efl_construct(H5F_t *f, H5D_t *dset)
      */
 
     /* Check for invalid dataset dimensions */
-    for(u = 1; u < dset->shared->ndims; u++)
-        if(dset->shared->max_dims[u] > dset->shared->curr_dims[u])
+    for (u = 1; u < dset->shared->ndims; u++)
+        if (dset->shared->max_dims[u] > dset->shared->curr_dims[u])
             HGOTO_ERROR(H5E_DATASET, H5E_UNSUPPORTED, FAIL, "only the first dimension can be extendible")
 
     /* Retrieve the size of the dataset's datatype */
-    if(0 == (dt_size = H5T_get_size(dset->shared->type)))
+    if (0 == (dt_size = H5T_get_size(dset->shared->type)))
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to determine datatype size")
 
     /* Check for storage overflows */
-    max_points = H5S_get_npoints_max(dset->shared->space);
+    max_points  = H5S_get_npoints_max(dset->shared->space);
     max_storage = H5O_efl_total_size(&dset->shared->dcpl_cache.efl);
-    if(H5S_UNLIMITED == max_points) {
-        if(H5O_EFL_UNLIMITED != max_storage)
+    if (H5S_UNLIMITED == max_points) {
+        if (H5O_EFL_UNLIMITED != max_storage)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unlimited dataspace but finite storage")
     } /* end if */
-    else if((max_points * dt_size) < max_points)
+    else if ((max_points * dt_size) < max_points)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "dataspace * type size overflowed")
-    else if((max_points * dt_size) > max_storage)
+    else if ((max_points * dt_size) > max_storage)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "dataspace size exceeds external storage size")
 
     /* Compute the total size of dataset */
@@ -182,7 +172,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_construct() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_is_space_alloc
  *
@@ -207,7 +196,6 @@ H5D__efl_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
     FUNC_LEAVE_NOAPI(TRUE)
 } /* end H5D__efl_is_space_alloc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_io_init
  *
@@ -221,18 +209,17 @@ H5D__efl_is_space_alloc(const H5O_storage_t H5_ATTR_UNUSED *storage)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
-    hsize_t H5_ATTR_UNUSED nelmts, const H5S_t H5_ATTR_UNUSED *file_space, const H5S_t H5_ATTR_UNUSED *mem_space,
-    H5D_chunk_map_t H5_ATTR_UNUSED *cm)
+H5D__efl_io_init(H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNUSED *type_info,
+                 hsize_t H5_ATTR_UNUSED nelmts, H5S_t H5_ATTR_UNUSED *file_space,
+                 H5S_t H5_ATTR_UNUSED *mem_space, H5D_chunk_map_t H5_ATTR_UNUSED *cm)
 {
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     H5MM_memcpy(&io_info->store->efl, &(io_info->dset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5D__efl_io_init() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__efl_read
  *
@@ -251,19 +238,19 @@ H5D__efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t H5_ATTR_UNU
 static herr_t
 H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, uint8_t *buf)
 {
-    int		fd = -1;
-    size_t	to_read;
+    int    fd = -1;
+    size_t to_read;
 #ifndef NDEBUG
-    hsize_t     tempto_read;
+    hsize_t tempto_read;
 #endif /* NDEBUG */
-    hsize_t     skip = 0;
-    haddr_t     cur;
-    ssize_t	n;
-    size_t      u;                      /* Local index variable */
-    char *full_name = NULL;             /* File name with prefix */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    hsize_t skip = 0;
+    haddr_t cur;
+    ssize_t n;
+    size_t  u;                   /* Local index variable */
+    char *  full_name = NULL;    /* File name with prefix */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(efl && efl->nused > 0);
@@ -272,8 +259,8 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     HDassert(buf || 0 == size);
 
     /* Find the first efl member from which to read */
-    for (u=0, cur=0; u<efl->nused; u++) {
-        if(H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
+    for (u = 0, cur = 0; u < efl->nused; u++) {
+        if (H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
             skip = addr - cur;
             break;
         } /* end if */
@@ -281,28 +268,28 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     } /* end for */
 
     /* Read the data */
-    while(size) {
+    while (size) {
         HDassert(buf);
-        if(u >= efl->nused)
+        if (u >= efl->nused)
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "read past logical end of file")
-        if(H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip))
+        if (H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip))
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed")
-        if(H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
+        if (H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_NOSPACE, FAIL, "can't build external file name")
-        if((fd = HDopen(full_name, O_RDONLY)) < 0)
+        if ((fd = HDopen(full_name, O_RDONLY)) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file")
-        if(HDlseek(fd, (HDoff_t)(efl->slot[u].offset + (HDoff_t)skip), SEEK_SET) < 0)
+        if (HDlseek(fd, (HDoff_t)(efl->slot[u].offset + (HDoff_t)skip), SEEK_SET) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file")
 #ifndef NDEBUG
-        tempto_read = MIN((size_t)(efl->slot[u].size-skip), (hsize_t)size);
+        tempto_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
         H5_CHECK_OVERFLOW(tempto_read, hsize_t, size_t);
         to_read = (size_t)tempto_read;
-#else /* NDEBUG */
-        to_read = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
+#else  /* NDEBUG */
+        to_read  = MIN((size_t)(efl->slot[u].size - skip), (hsize_t)size);
 #endif /* NDEBUG */
-        if((n = HDread(fd, buf, to_read)) < 0)
+        if ((n = HDread(fd, buf, to_read)) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "read error in external raw data file")
-        else if((size_t)n < to_read)
+        else if ((size_t)n < to_read)
             HDmemset(buf + n, 0, to_read - (size_t)n);
         full_name = (char *)H5MM_xfree(full_name);
         HDclose(fd);
@@ -314,15 +301,14 @@ H5D__efl_read(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size
     } /* end while */
 
 done:
-    if(full_name)
+    if (full_name)
         full_name = (char *)H5MM_xfree(full_name);
-    if(fd >= 0)
+    if (fd >= 0)
         HDclose(fd);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_write
  *
@@ -336,26 +322,23 @@ done:
  * Programmer:	Robb Matzke
  *              Wednesday, March  4, 1998
  *
- * Modifications:
- *		Robb Matzke, 1999-07-28
- *		The ADDR argument is passed by value.
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t size, const uint8_t *buf)
 {
-    int		fd = -1;
-    size_t	to_write;
+    int    fd = -1;
+    size_t to_write;
 #ifndef NDEBUG
-    hsize_t	tempto_write;
+    hsize_t tempto_write;
 #endif /* NDEBUG */
-    haddr_t     cur;
-    hsize_t     skip = 0;
-    size_t	u;                          /* Local index variable */
-    char *full_name = NULL;             /* File name with prefix */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    haddr_t cur;
+    hsize_t skip = 0;
+    size_t  u;                   /* Local index variable */
+    char *  full_name = NULL;    /* File name with prefix */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(efl && efl->nused > 0);
@@ -364,8 +347,8 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     HDassert(buf || 0 == size);
 
     /* Find the first efl member in which to write */
-    for(u = 0, cur = 0; u < efl->nused; u++) {
-        if(H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
+    for (u = 0, cur = 0; u < efl->nused; u++) {
+        if (H5O_EFL_UNLIMITED == efl->slot[u].size || addr < cur + efl->slot[u].size) {
             skip = addr - cur;
             break;
         } /* end if */
@@ -373,33 +356,33 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     } /* end for */
 
     /* Write the data */
-    while(size) {
+    while (size) {
         HDassert(buf);
-        if(u >= efl->nused)
+        if (u >= efl->nused)
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "write past logical end of file")
-        if(H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip))
+        if (H5F_OVERFLOW_HSIZET2OFFT((hsize_t)efl->slot[u].offset + skip))
             HGOTO_ERROR(H5E_EFL, H5E_OVERFLOW, FAIL, "external file address overflowed")
-        if(H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
+        if (H5_combine_path(dset->shared->extfile_prefix, efl->slot[u].name, &full_name) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_NOSPACE, FAIL, "can't build external file name")
-        if((fd = HDopen(full_name, O_CREAT | O_RDWR, H5_POSIX_CREATE_MODE_RW)) < 0) {
-            if(HDaccess(full_name, F_OK) < 0)
+        if ((fd = HDopen(full_name, O_CREAT | O_RDWR, H5_POSIX_CREATE_MODE_RW)) < 0) {
+            if (HDaccess(full_name, F_OK) < 0)
                 HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "external raw data file does not exist")
             else
                 HGOTO_ERROR(H5E_EFL, H5E_CANTOPENFILE, FAIL, "unable to open external raw data file")
-            } /* end if */
-        if(HDlseek(fd, (HDoff_t)(efl->slot[u].offset + (HDoff_t)skip), SEEK_SET) < 0)
+        } /* end if */
+        if (HDlseek(fd, (HDoff_t)(efl->slot[u].offset + (HDoff_t)skip), SEEK_SET) < 0)
             HGOTO_ERROR(H5E_EFL, H5E_SEEKERROR, FAIL, "unable to seek in external raw data file")
 #ifndef NDEBUG
         tempto_write = MIN(efl->slot[u].size - skip, (hsize_t)size);
         H5_CHECK_OVERFLOW(tempto_write, hsize_t, size_t);
         to_write = (size_t)tempto_write;
-#else /* NDEBUG */
+#else  /* NDEBUG */
         to_write = MIN((size_t)(efl->slot[u].size - skip), size);
 #endif /* NDEBUG */
-        if((size_t)HDwrite(fd, buf, to_write) != to_write)
+        if ((size_t)HDwrite(fd, buf, to_write) != to_write)
             HGOTO_ERROR(H5E_EFL, H5E_READERROR, FAIL, "write error in external raw data file")
         full_name = (char *)H5MM_xfree(full_name);
-        HDclose (fd);
+        HDclose(fd);
         fd = -1;
         size -= to_write;
         buf += to_write;
@@ -408,15 +391,14 @@ H5D__efl_write(const H5O_efl_t *efl, const H5D_t *dset, haddr_t addr, size_t siz
     } /* end while */
 
 done:
-    if(full_name)
+    if (full_name)
         full_name = (char *)H5MM_xfree(full_name);
-    if(fd >= 0)
+    if (fd >= 0)
         HDclose(fd);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_readvv_cb
  *
@@ -432,20 +414,19 @@ done:
 static herr_t
 H5D__efl_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_efl_readvv_ud_t *udata     = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
+    herr_t               ret_value = SUCCEED;                       /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Read data */
-    if(H5D__efl_read(udata->efl, udata->dset, dst_off, len, (udata->rbuf + src_off)) < 0)
+    if (H5D__efl_read(udata->efl, udata->dset, dst_off, len, (udata->rbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "EFL read failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_readvv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_readvv
  *
@@ -462,14 +443,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__efl_readvv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__efl_readvv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    H5D_efl_readvv_ud_t udata;  /* User data for H5VM_opvv() operator */
-    ssize_t ret_value = -1;     /* Return value (Total size of sequence in bytes) */
+    H5D_efl_readvv_ud_t udata;          /* User data for H5VM_opvv() operator */
+    ssize_t             ret_value = -1; /* Return value (Total size of sequence in bytes) */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(io_info);
@@ -485,21 +466,19 @@ H5D__efl_readvv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Set up user data for H5VM_opvv() */
-    udata.efl = &(io_info->store->efl);
+    udata.efl  = &(io_info->store->efl);
     udata.dset = io_info->dset;
     udata.rbuf = (unsigned char *)io_info->u.rbuf;
 
     /* Call generic sequence operation routine */
-    if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-            mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-            H5D__efl_readvv_cb, &udata)) < 0)
+    if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                               mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_readvv_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL read")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_readvv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_writevv_cb
  *
@@ -515,20 +494,19 @@ done:
 static herr_t
 H5D__efl_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
 {
-    H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5D_efl_writevv_ud_t *udata     = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5VM_opvv() operator */
+    herr_t                ret_value = SUCCEED;                        /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Write data */
-    if(H5D__efl_write(udata->efl, udata->dset, dst_off, len, (udata->wbuf + src_off)) < 0)
+    if (H5D__efl_write(udata->efl, udata->dset, dst_off, len, (udata->wbuf + src_off)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "EFL write failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_writevv_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	H5D__efl_writevv
  *
@@ -545,14 +523,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static ssize_t
-H5D__efl_writevv(const H5D_io_info_t *io_info,
-    size_t dset_max_nseq, size_t *dset_curr_seq, size_t dset_len_arr[], hsize_t dset_off_arr[],
-    size_t mem_max_nseq, size_t *mem_curr_seq, size_t mem_len_arr[], hsize_t mem_off_arr[])
+H5D__efl_writevv(const H5D_io_info_t *io_info, size_t dset_max_nseq, size_t *dset_curr_seq,
+                 size_t dset_len_arr[], hsize_t dset_off_arr[], size_t mem_max_nseq, size_t *mem_curr_seq,
+                 size_t mem_len_arr[], hsize_t mem_off_arr[])
 {
-    H5D_efl_writevv_ud_t udata;  /* User data for H5VM_opvv() operator */
-    ssize_t ret_value = -1;      /* Return value (Total size of sequence in bytes) */
+    H5D_efl_writevv_ud_t udata;          /* User data for H5VM_opvv() operator */
+    ssize_t              ret_value = -1; /* Return value (Total size of sequence in bytes) */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(io_info);
@@ -568,20 +546,18 @@ H5D__efl_writevv(const H5D_io_info_t *io_info,
     HDassert(mem_off_arr);
 
     /* Set up user data for H5VM_opvv() */
-    udata.efl = &(io_info->store->efl);
+    udata.efl  = &(io_info->store->efl);
     udata.dset = io_info->dset;
     udata.wbuf = (const unsigned char *)io_info->u.wbuf;
 
     /* Call generic sequence operation routine */
-    if((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr,
-            mem_max_nseq, mem_curr_seq, mem_len_arr, mem_off_arr,
-            H5D__efl_writevv_cb, &udata)) < 0)
+    if ((ret_value = H5VM_opvv(dset_max_nseq, dset_curr_seq, dset_len_arr, dset_off_arr, mem_max_nseq,
+                               mem_curr_seq, mem_len_arr, mem_off_arr, H5D__efl_writevv_cb, &udata)) < 0)
         HGOTO_ERROR(H5E_DATASET, H5E_CANTOPERATE, FAIL, "can't perform vectorized EFL write")
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5D__efl_writevv() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5D__efl_bh_info
  *
@@ -598,7 +574,7 @@ done:
 herr_t
 H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -609,7 +585,7 @@ H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size)
     HDassert(heap_size);
 
     /* Get the size of the local heap for EFL's file list */
-    if(H5HL_heapsize(f, efl->heap_addr, heap_size) < 0)
+    if (H5HL_heapsize(f, efl->heap_addr, heap_size) < 0)
         HGOTO_ERROR(H5E_EFL, H5E_CANTINIT, FAIL, "unable to retrieve local heap info")
 
 done: