Source formatted

1 files changed, 263 insertions, 253 deletions

diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 147d08f..7789d39 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -25,16 +25,15 @@
 
 #include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
 
-
-#include "H5private.h"      /* Generic Functions        */
-#include "H5Eprivate.h"     /* Error handling           */
-#include "H5Fprivate.h"     /* File access              */
-#include "H5FDprivate.h"    /* File drivers             */
-#include "H5FDsec2.h"       /* Sec2 file driver         */
-#include "H5FLprivate.h"    /* Free Lists               */
-#include "H5Iprivate.h"     /* IDs                      */
-#include "H5MMprivate.h"    /* Memory management        */
-#include "H5Pprivate.h"     /* Property lists           */
+#include "H5private.h"   /* Generic Functions        */
+#include "H5Eprivate.h"  /* Error handling           */
+#include "H5Fprivate.h"  /* File access              */
+#include "H5FDprivate.h" /* File drivers             */
+#include "H5FDsec2.h"    /* Sec2 file driver         */
+#include "H5FLprivate.h" /* Free Lists               */
+#include "H5Iprivate.h"  /* IDs                      */
+#include "H5MMprivate.h" /* Memory management        */
+#include "H5Pprivate.h"  /* Property lists           */
 
 /* The driver identification number, initialized at runtime */
 static hid_t H5FD_SEC2_g = 0;
@@ -54,14 +53,14 @@ static htri_t ignore_disabled_file_locks_s = FAIL;
  * occurs), and 'op' will be set to H5F_OP_UNKNOWN.
  */
 typedef struct H5FD_sec2_t {
-    H5FD_t          pub;    /* public stuff, must be first      */
-    int             fd;     /* the filesystem file descriptor   */
-    haddr_t         eoa;    /* end of allocated region          */
-    haddr_t         eof;    /* end of file; current file size   */
-    haddr_t         pos;    /* current file I/O position        */
-    H5FD_file_op_t  op;     /* last operation                   */
-    hbool_t         ignore_disabled_file_locks;
-    char            filename[H5FD_MAX_FILENAME_LEN];    /* Copy of file name from open operation */
+    H5FD_t         pub; /* public stuff, must be first      */
+    int            fd;  /* the filesystem file descriptor   */
+    haddr_t        eoa; /* end of allocated region          */
+    haddr_t        eof; /* end of file; current file size   */
+    haddr_t        pos; /* current file I/O position        */
+    H5FD_file_op_t op;  /* last operation                   */
+    hbool_t        ignore_disabled_file_locks;
+    char           filename[H5FD_MAX_FILENAME_LEN]; /* Copy of file name from open operation */
 #ifndef H5_HAVE_WIN32_API
     /* On most systems the combination of device and i-node number uniquely
      * identify a file.  Note that Cygwin, MinGW and other Windows POSIX
@@ -69,8 +68,8 @@ typedef struct H5FD_sec2_t {
      * and will use the 'device + inodes' scheme as opposed to the
      * Windows code further below.
      */
-    dev_t           device;     /* file device number   */
-    ino_t           inode;      /* file i-node number   */
+    dev_t device; /* file device number   */
+    ino_t inode;  /* file i-node number   */
 #else
     /* Files in windows are uniquely identified by the volume serial
      * number and the file index (both low and high parts).
@@ -86,19 +85,19 @@ typedef struct H5FD_sec2_t {
      *
      * http://msdn.microsoft.com/en-us/library/aa363788(v=VS.85).aspx
      */
-    DWORD           nFileIndexLow;
-    DWORD           nFileIndexHigh;
-    DWORD           dwVolumeSerialNumber;
+    DWORD nFileIndexLow;
+    DWORD nFileIndexHigh;
+    DWORD dwVolumeSerialNumber;
 
-    HANDLE          hFile;      /* Native windows file handle */
-#endif  /* H5_HAVE_WIN32_API */
+    HANDLE hFile; /* Native windows file handle */
+#endif /* H5_HAVE_WIN32_API */
 
     /* Information from properties set by 'h5repart' tool
      *
      * Whether to eliminate the family driver info and convert this file to
      * a single file.
      */
-    hbool_t         fam_to_single;
+    hbool_t fam_to_single;
 } H5FD_sec2_t;
 
 /*
@@ -116,71 +115,68 @@ typedef struct H5FD_sec2_t {
  *                  which can be addressed entirely by the second
  *                  argument of the file seek function.
  */
-#define MAXADDR (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
-#define ADDR_OVERFLOW(A)    (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
-#define SIZE_OVERFLOW(Z)    ((Z) & ~(hsize_t)MAXADDR)
-#define REGION_OVERFLOW(A,Z)    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) ||    \
-                                    HADDR_UNDEF == (A) + (Z) ||             \
-                                    (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
+#define MAXADDR          (((haddr_t)1 << (8 * sizeof(HDoff_t) - 1)) - 1)
+#define ADDR_OVERFLOW(A) (HADDR_UNDEF == (A) || ((A) & ~(haddr_t)MAXADDR))
+#define SIZE_OVERFLOW(Z) ((Z) & ~(hsize_t)MAXADDR)
+#define REGION_OVERFLOW(A, Z)                                                                                \
+    (ADDR_OVERFLOW(A) || SIZE_OVERFLOW(Z) || HADDR_UNDEF == (A) + (Z) || (HDoff_t)((A) + (Z)) < (HDoff_t)(A))
 
 /* Prototypes */
-static herr_t H5FD__sec2_term(void);
-static H5FD_t *H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD__sec2_close(H5FD_t *_file);
-static int H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
-static herr_t H5FD__sec2_query(const H5FD_t *_f1, unsigned long *flags);
+static herr_t  H5FD__sec2_term(void);
+static H5FD_t *H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t  H5FD__sec2_close(H5FD_t *_file);
+static int     H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2);
+static herr_t  H5FD__sec2_query(const H5FD_t *_f1, unsigned long *flags);
 static haddr_t H5FD__sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD__sec2_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static herr_t  H5FD__sec2_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
 static haddr_t H5FD__sec2_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t  H5FD__sec2_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD__sec2_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static herr_t H5FD__sec2_lock(H5FD_t *_file, hbool_t rw);
-static herr_t H5FD__sec2_unlock(H5FD_t *_file);
+static herr_t  H5FD__sec2_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t  H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                               void *buf);
+static herr_t  H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t type, hid_t fapl_id, haddr_t addr, size_t size,
+                                const void *buf);
+static herr_t  H5FD__sec2_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t  H5FD__sec2_lock(H5FD_t *_file, hbool_t rw);
+static herr_t  H5FD__sec2_unlock(H5FD_t *_file);
 
 static const H5FD_class_t H5FD_sec2_g = {
-    "sec2",                     /* name                 */
-    MAXADDR,                    /* maxaddr              */
-    H5F_CLOSE_WEAK,             /* fc_degree            */
-    H5FD__sec2_term,            /* terminate            */
-    NULL,                       /* sb_size              */
-    NULL,                       /* sb_encode            */
-    NULL,                       /* sb_decode            */
-    0,                          /* fapl_size            */
-    NULL,                       /* fapl_get             */
-    NULL,                       /* fapl_copy            */
-    NULL,                       /* fapl_free            */
-    0,                          /* dxpl_size            */
-    NULL,                       /* dxpl_copy            */
-    NULL,                       /* dxpl_free            */
-    H5FD__sec2_open,            /* open                 */
-    H5FD__sec2_close,           /* close                */
-    H5FD__sec2_cmp,             /* cmp                  */
-    H5FD__sec2_query,           /* query                */
-    NULL,                       /* get_type_map         */
-    NULL,                       /* alloc                */
-    NULL,                       /* free                 */
-    H5FD__sec2_get_eoa,         /* get_eoa              */
-    H5FD__sec2_set_eoa,         /* set_eoa              */
-    H5FD__sec2_get_eof,         /* get_eof              */
-    H5FD__sec2_get_handle,      /* get_handle           */
-    H5FD__sec2_read,            /* read                 */
-    H5FD__sec2_write,           /* write                */
-    NULL,                       /* flush                */
-    H5FD__sec2_truncate,        /* truncate             */
-    H5FD__sec2_lock,            /* lock                 */
-    H5FD__sec2_unlock,          /* unlock               */
-    H5FD_FLMAP_DICHOTOMY        /* fl_map               */
+    "sec2",                /* name                 */
+    MAXADDR,               /* maxaddr              */
+    H5F_CLOSE_WEAK,        /* fc_degree            */
+    H5FD__sec2_term,       /* terminate            */
+    NULL,                  /* sb_size              */
+    NULL,                  /* sb_encode            */
+    NULL,                  /* sb_decode            */
+    0,                     /* fapl_size            */
+    NULL,                  /* fapl_get             */
+    NULL,                  /* fapl_copy            */
+    NULL,                  /* fapl_free            */
+    0,                     /* dxpl_size            */
+    NULL,                  /* dxpl_copy            */
+    NULL,                  /* dxpl_free            */
+    H5FD__sec2_open,       /* open                 */
+    H5FD__sec2_close,      /* close                */
+    H5FD__sec2_cmp,        /* cmp                  */
+    H5FD__sec2_query,      /* query                */
+    NULL,                  /* get_type_map         */
+    NULL,                  /* alloc                */
+    NULL,                  /* free                 */
+    H5FD__sec2_get_eoa,    /* get_eoa              */
+    H5FD__sec2_set_eoa,    /* set_eoa              */
+    H5FD__sec2_get_eof,    /* get_eof              */
+    H5FD__sec2_get_handle, /* get_handle           */
+    H5FD__sec2_read,       /* read                 */
+    H5FD__sec2_write,      /* write                */
+    NULL,                  /* flush                */
+    H5FD__sec2_truncate,   /* truncate             */
+    H5FD__sec2_lock,       /* lock                 */
+    H5FD__sec2_unlock,     /* unlock               */
+    H5FD_FLMAP_DICHOTOMY   /* fl_map               */
 };
 
 /* Declare a free list to manage the H5FD_sec2_t struct */
 H5FL_DEFINE_STATIC(H5FD_sec2_t);
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__init_package
  *
@@ -193,28 +189,27 @@ H5FL_DEFINE_STATIC(H5FD_sec2_t);
 static herr_t
 H5FD__init_package(void)
 {
-    char    *lock_env_var   = NULL;     /* Environment variable pointer */
-    herr_t ret_value = SUCCEED;
+    char * lock_env_var = NULL; /* Environment variable pointer */
+    herr_t ret_value    = SUCCEED;
 
     FUNC_ENTER_STATIC
 
     /* Check the use disabled file locks environment variable */
     lock_env_var = HDgetenv("HDF5_USE_FILE_LOCKING");
-    if(lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT"))
-        ignore_disabled_file_locks_s = TRUE;    /* Override: Ignore disabled locks */
-    else if(lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1")))
-        ignore_disabled_file_locks_s = FALSE;   /* Override: Don't ignore disabled locks */
+    if (lock_env_var && !HDstrcmp(lock_env_var, "BEST_EFFORT"))
+        ignore_disabled_file_locks_s = TRUE; /* Override: Ignore disabled locks */
+    else if (lock_env_var && (!HDstrcmp(lock_env_var, "TRUE") || !HDstrcmp(lock_env_var, "1")))
+        ignore_disabled_file_locks_s = FALSE; /* Override: Don't ignore disabled locks */
     else
-        ignore_disabled_file_locks_s = FAIL;    /* Environment variable not set, or not set correctly */
+        ignore_disabled_file_locks_s = FAIL; /* Environment variable not set, or not set correctly */
 
-    if(H5FD_sec2_init() < 0)
+    if (H5FD_sec2_init() < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize sec2 VFD")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD__init_package() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_sec2_init
  *
@@ -232,11 +227,11 @@ done:
 hid_t
 H5FD_sec2_init(void)
 {
-    hid_t ret_value = H5I_INVALID_HID;  /* Return value */
+    hid_t ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
-    if(H5I_VFL != H5I_get_type(H5FD_SEC2_g))
+    if (H5I_VFL != H5I_get_type(H5FD_SEC2_g))
         H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), FALSE);
 
     /* Set return value */
@@ -246,7 +241,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_sec2_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD__sec2_term
  *
@@ -270,7 +264,6 @@ H5FD__sec2_term(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__sec2_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_sec2
  *
@@ -288,13 +281,13 @@ H5FD__sec2_term(void)
 herr_t
 H5Pset_fapl_sec2(hid_t fapl_id)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value;
+    H5P_genplist_t *plist; /* Property list pointer */
+    herr_t          ret_value;
 
     FUNC_ENTER_API(FAIL)
     H5TRACE1("e", "i", fapl_id);
 
-    if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
+    if (NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file access property list")
 
     ret_value = H5P_set_driver(plist, H5FD_SEC2, NULL);
@@ -303,7 +296,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_fapl_sec2() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_open
  *
@@ -322,15 +314,15 @@ done:
 static H5FD_t *
 H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
 {
-    H5FD_sec2_t     *file       = NULL;     /* sec2 VFD info            */
-    int             fd          = -1;       /* File descriptor          */
-    int             o_flags;                /* Flags for open() call    */
+    H5FD_sec2_t *file = NULL; /* sec2 VFD info            */
+    int          fd   = -1;   /* File descriptor          */
+    int          o_flags;     /* Flags for open() call    */
 #ifdef H5_HAVE_WIN32_API
     struct _BY_HANDLE_FILE_INFORMATION fileinfo;
 #endif
     h5_stat_t       sb;
-    H5P_genplist_t  *plist;                 /* Property list pointer */
-    H5FD_t          *ret_value = NULL;          /* Return value */
+    H5P_genplist_t *plist;            /* Property list pointer */
+    H5FD_t *        ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -338,66 +330,69 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
 
     /* Check arguments */
-    if(!name || !*name)
+    if (!name || !*name)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "invalid file name")
-    if(0 == maxaddr || HADDR_UNDEF == maxaddr)
+    if (0 == maxaddr || HADDR_UNDEF == maxaddr)
         HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, NULL, "bogus maxaddr")
-    if(ADDR_OVERFLOW(maxaddr))
+    if (ADDR_OVERFLOW(maxaddr))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, NULL, "bogus maxaddr")
 
     /* Build the open flags */
     o_flags = (H5F_ACC_RDWR & flags) ? O_RDWR : O_RDONLY;
-    if(H5F_ACC_TRUNC & flags)
+    if (H5F_ACC_TRUNC & flags)
         o_flags |= O_TRUNC;
-    if(H5F_ACC_CREAT & flags)
+    if (H5F_ACC_CREAT & flags)
         o_flags |= O_CREAT;
-    if(H5F_ACC_EXCL & flags)
+    if (H5F_ACC_EXCL & flags)
         o_flags |= O_EXCL;
 
     /* Open the file */
-    if((fd = HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW)) < 0) {
+    if ((fd = HDopen(name, o_flags, H5_POSIX_CREATE_MODE_RW)) < 0) {
         int myerrno = errno;
-        HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x", name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
+        HGOTO_ERROR(
+            H5E_FILE, H5E_CANTOPENFILE, NULL,
+            "unable to open file: name = '%s', errno = %d, error message = '%s', flags = %x, o_flags = %x",
+            name, myerrno, HDstrerror(myerrno), flags, (unsigned)o_flags);
     } /* end if */
 
-    if(HDfstat(fd, &sb) < 0)
+    if (HDfstat(fd, &sb) < 0)
         HSYS_GOTO_ERROR(H5E_FILE, H5E_BADFILE, NULL, "unable to fstat file")
 
     /* Create the new file struct */
-    if(NULL == (file = H5FL_CALLOC(H5FD_sec2_t)))
+    if (NULL == (file = H5FL_CALLOC(H5FD_sec2_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "unable to allocate file struct")
 
     file->fd = fd;
     H5_CHECKED_ASSIGN(file->eof, haddr_t, sb.st_size, h5_stat_size_t);
     file->pos = HADDR_UNDEF;
-    file->op = OP_UNKNOWN;
+    file->op  = OP_UNKNOWN;
 #ifdef H5_HAVE_WIN32_API
     file->hFile = (HANDLE)_get_osfhandle(fd);
-    if(INVALID_HANDLE_VALUE == file->hFile)
+    if (INVALID_HANDLE_VALUE == file->hFile)
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file handle")
 
-    if(!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
+    if (!GetFileInformationByHandle((HANDLE)file->hFile, &fileinfo))
         HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "unable to get Windows file information")
 
-    file->nFileIndexHigh = fileinfo.nFileIndexHigh;
-    file->nFileIndexLow = fileinfo.nFileIndexLow;
+    file->nFileIndexHigh       = fileinfo.nFileIndexHigh;
+    file->nFileIndexLow        = fileinfo.nFileIndexLow;
     file->dwVolumeSerialNumber = fileinfo.dwVolumeSerialNumber;
-#else /* H5_HAVE_WIN32_API */
+#else  /* H5_HAVE_WIN32_API */
     file->device = sb.st_dev;
-    file->inode = sb.st_ino;
+    file->inode  = sb.st_ino;
 #endif /* H5_HAVE_WIN32_API */
 
     /* Get the FAPL */
-    if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
+    if (NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
         HGOTO_ERROR(H5E_VFL, H5E_BADTYPE, NULL, "not a file access property list")
 
     /* Check the file locking flags in the fapl */
-    if(ignore_disabled_file_locks_s != FAIL)
+    if (ignore_disabled_file_locks_s != FAIL)
         /* The environment variable was set, so use that preferentially */
         file->ignore_disabled_file_locks = ignore_disabled_file_locks_s;
     else {
         /* Use the value in the property list */
-        if(H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)
+        if (H5P_get(plist, H5F_ACS_IGNORE_DISABLED_FILE_LOCKS_NAME, &file->ignore_disabled_file_locks) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get ignore disabled file locks property")
     }
 
@@ -406,33 +401,32 @@ H5FD__sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr
     file->filename[sizeof(file->filename) - 1] = '\0';
 
     /* Check for non-default FAPL */
-    if(H5P_FILE_ACCESS_DEFAULT != fapl_id) {
+    if (H5P_FILE_ACCESS_DEFAULT != fapl_id) {
 
         /* This step is for h5repart tool only. If user wants to change file driver from
          * family to one that uses single files (sec2, etc.) while using h5repart, this
          * private property should be set so that in the later step, the library can ignore
          * the family driver information saved in the superblock.
          */
-        if(H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SINGLE_NAME) > 0)
-            if(H5P_get(plist, H5F_ACS_FAMILY_TO_SINGLE_NAME, &file->fam_to_single) < 0)
+        if (H5P_exist_plist(plist, H5F_ACS_FAMILY_TO_SINGLE_NAME) > 0)
+            if (H5P_get(plist, H5F_ACS_FAMILY_TO_SINGLE_NAME, &file->fam_to_single) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get property of changing family to single")
     } /* end if */
 
     /* Set return value */
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(NULL == ret_value) {
-        if(fd >= 0)
+    if (NULL == ret_value) {
+        if (fd >= 0)
             HDclose(fd);
-        if(file)
+        if (file)
             file = H5FL_FREE(H5FD_sec2_t, file);
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_close
  *
@@ -449,8 +443,8 @@ done:
 static herr_t
 H5FD__sec2_close(H5FD_t *_file)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
-    herr_t      ret_value = SUCCEED;                /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -458,7 +452,7 @@ H5FD__sec2_close(H5FD_t *_file)
     HDassert(file);
 
     /* Close the underlying file */
-    if(HDclose(file->fd) < 0)
+    if (HDclose(file->fd) < 0)
         HSYS_GOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
 
     /* Release the file info */
@@ -468,7 +462,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_cmp
  *
@@ -487,42 +480,53 @@ done:
 static int
 H5FD__sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
 {
-    const H5FD_sec2_t   *f1 = (const H5FD_sec2_t *)_f1;
-    const H5FD_sec2_t   *f2 = (const H5FD_sec2_t *)_f2;
-    int ret_value = 0;
+    const H5FD_sec2_t *f1        = (const H5FD_sec2_t *)_f1;
+    const H5FD_sec2_t *f2        = (const H5FD_sec2_t *)_f2;
+    int                ret_value = 0;
 
     FUNC_ENTER_STATIC_NOERR
 
 #ifdef H5_HAVE_WIN32_API
-    if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
-    if(f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber) HGOTO_DONE(1)
-
-    if(f1->nFileIndexHigh < f2->nFileIndexHigh) HGOTO_DONE(-1)
-    if(f1->nFileIndexHigh > f2->nFileIndexHigh) HGOTO_DONE(1)
-
-    if(f1->nFileIndexLow < f2->nFileIndexLow) HGOTO_DONE(-1)
-    if(f1->nFileIndexLow > f2->nFileIndexLow) HGOTO_DONE(1)
+    if (f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber)
+        HGOTO_DONE(-1)
+    if (f1->dwVolumeSerialNumber > f2->dwVolumeSerialNumber)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexHigh < f2->nFileIndexHigh)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexHigh > f2->nFileIndexHigh)
+        HGOTO_DONE(1)
+
+    if (f1->nFileIndexLow < f2->nFileIndexLow)
+        HGOTO_DONE(-1)
+    if (f1->nFileIndexLow > f2->nFileIndexLow)
+        HGOTO_DONE(1)
 #else /* H5_HAVE_WIN32_API */
 #ifdef H5_DEV_T_IS_SCALAR
-    if(f1->device < f2->device) HGOTO_DONE(-1)
-    if(f1->device > f2->device) HGOTO_DONE(1)
-#else /* H5_DEV_T_IS_SCALAR */
+    if (f1->device < f2->device)
+        HGOTO_DONE(-1)
+    if (f1->device > f2->device)
+        HGOTO_DONE(1)
+#else  /* H5_DEV_T_IS_SCALAR */
     /* If dev_t isn't a scalar value on this system, just use memcmp to
      * determine if the values are the same or not.  The actual return value
      * shouldn't really matter...
      */
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) < 0) HGOTO_DONE(-1)
-    if(HDmemcmp(&(f1->device),&(f2->device),sizeof(dev_t)) > 0) HGOTO_DONE(1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) < 0)
+        HGOTO_DONE(-1)
+    if (HDmemcmp(&(f1->device), &(f2->device), sizeof(dev_t)) > 0)
+        HGOTO_DONE(1)
 #endif /* H5_DEV_T_IS_SCALAR */
-    if(f1->inode < f2->inode) HGOTO_DONE(-1)
-    if(f1->inode > f2->inode) HGOTO_DONE(1)
+    if (f1->inode < f2->inode)
+        HGOTO_DONE(-1)
+    if (f1->inode > f2->inode)
+        HGOTO_DONE(1)
 #endif /* H5_HAVE_WIN32_API */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_cmp() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_query
  *
@@ -539,7 +543,7 @@ done:
 static herr_t
 H5FD__sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;    /* sec2 VFD info */
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file; /* sec2 VFD info */
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -550,25 +554,27 @@ H5FD__sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
      * reflected in H5FDmirror.c
      * -- JOS 2020-01-13
      */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA;     /* OK to aggregate metadata allocations                             */
-        *flags |= H5FD_FEAT_ACCUMULATE_METADATA;    /* OK to accumulate metadata for faster writes                      */
-        *flags |= H5FD_FEAT_DATA_SIEVE;             /* OK to perform data sieving for faster raw data reads & writes    */
-        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA;    /* OK to aggregate "small" raw data allocations                     */
-        *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE;    /* get_handle callback returns a POSIX file descriptor              */
-        *flags |= H5FD_FEAT_SUPPORTS_SWMR_IO;       /* VFD supports the single-writer/multiple-readers (SWMR) pattern   */
-        *flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the default VFD      */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations  */
+        *flags |= H5FD_FEAT_ACCUMULATE_METADATA; /* OK to accumulate metadata for faster writes */
+        *flags |= H5FD_FEAT_DATA_SIEVE; /* OK to perform data sieving for faster raw data reads & writes    */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_POSIX_COMPAT_HANDLE; /* get_handle callback returns a POSIX file descriptor */
+        *flags |=
+            H5FD_FEAT_SUPPORTS_SWMR_IO; /* VFD supports the single-writer/multiple-readers (SWMR) pattern   */
+        *flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the default
+                                                       VFD      */
 
         /* Check for flags that are set by h5repart */
-        if(file && file->fam_to_single)
-            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which eliminates it) */
-    } /* end if */
+        if (file && file->fam_to_single)
+            *flags |= H5FD_FEAT_IGNORE_DRVRINFO; /* Ignore the driver info when file is opened (which
+                                                    eliminates it) */
+    }                                            /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__sec2_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_get_eoa
  *
@@ -586,14 +592,13 @@ H5FD__sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
 static haddr_t
 H5FD__sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_sec2_t	*file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
     FUNC_LEAVE_NOAPI(file->eoa)
 } /* end H5FD__sec2_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_set_eoa
  *
@@ -611,7 +616,7 @@ H5FD__sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD__sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_sec2_t	*file = (H5FD_sec2_t *)_file;
+    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -620,7 +625,6 @@ H5FD__sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__sec2_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_get_eof
  *
@@ -639,14 +643,13 @@ H5FD__sec2_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD__sec2_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_sec2_t   *file = (const H5FD_sec2_t *)_file;
+    const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
     FUNC_LEAVE_NOAPI(file->eof)
 } /* end H5FD__sec2_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD__sec2_get_handle
  *
@@ -662,12 +665,12 @@ H5FD__sec2_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD__sec2_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_sec2_t         *file = (H5FD_sec2_t *)_file;
-    herr_t              ret_value = SUCCEED;
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
-    if(!file_handle)
+    if (!file_handle)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
 
     *file_handle = &(file->fd);
@@ -676,7 +679,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_read
  *
@@ -694,12 +696,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-    haddr_t addr, size_t size, void *buf /*out*/)
+H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+                size_t size, void *buf /*out*/)
 {
-    H5FD_sec2_t     *file       = (H5FD_sec2_t *)_file;
-    HDoff_t         offset      = (HDoff_t)addr;
-    herr_t          ret_value   = SUCCEED;                  /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    HDoff_t      offset    = (HDoff_t)addr;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -707,29 +709,29 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
+    if (REGION_OVERFLOW(addr, size))
         HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu", (unsigned long long)addr)
 
 #ifndef H5_HAVE_PREADWRITE
     /* Seek to the correct location (if we don't have pread) */
-    if(addr != file->pos || OP_READ != file->op)
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+    if (addr != file->pos || OP_READ != file->op)
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 #endif /* H5_HAVE_PREADWRITE */
 
     /* Read data, being careful of interrupted system calls, partial results,
      * and the end of the file.
      */
-    while(size > 0) {
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to read       */
-        h5_posix_io_ret_t   bytes_read      = -1;   /* # of bytes actually read */
+    while (size > 0) {
+        h5_posix_io_t     bytes_in   = 0;  /* # of bytes to read       */
+        h5_posix_io_ret_t bytes_read = -1; /* # of bytes actually read */
 
         /* Trying to read more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
@@ -737,23 +739,29 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
         do {
 #ifdef H5_HAVE_PREADWRITE
             bytes_read = HDpread(file->fd, buf, bytes_in, offset);
-            if(bytes_read > 0)
+            if (bytes_read > 0)
                 offset += bytes_read;
 #else
-            bytes_read = HDread(file->fd, buf, bytes_in);
+            bytes_read  = HDread(file->fd, buf, bytes_in);
 #endif /* H5_HAVE_PREADWRITE */
-        } while(-1 == bytes_read && EINTR == errno);
+        } while (-1 == bytes_read && EINTR == errno);
 
-        if(-1 == bytes_read) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        if (-1 == bytes_read) { /* error */
+            int    myerrno = errno;
+            time_t mytime  = HDtime(NULL);
 
             offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, bytes actually read = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_read, (unsigned long long)offset);
+            HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL,
+                        "file read failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total read size = %llu, bytes this sub-read = %llu, "
+                        "bytes actually read = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_read, (unsigned long long)offset);
         } /* end if */
 
-        if(0 == bytes_read) {
+        if (0 == bytes_read) {
             /* end of file but not end of format address space */
             HDmemset(buf, 0, size);
             break;
@@ -769,19 +777,18 @@ H5FD__sec2_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNU
 
     /* Update current position */
     file->pos = addr;
-    file->op = OP_READ;
+    file->op  = OP_READ;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_read() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_write
  *
@@ -797,12 +804,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id,
-                haddr_t addr, size_t size, const void *buf)
+H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+                 size_t size, const void *buf)
 {
-    H5FD_sec2_t     *file       = (H5FD_sec2_t *)_file;
-    HDoff_t         offset      = (HDoff_t)addr;
-    herr_t          ret_value   = SUCCEED;                  /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    HDoff_t      offset    = (HDoff_t)addr;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -810,29 +817,30 @@ H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
     HDassert(buf);
 
     /* Check for overflow conditions */
-    if(!H5F_addr_defined(addr))
+    if (!H5F_addr_defined(addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "addr undefined, addr = %llu", (unsigned long long)addr)
-    if(REGION_OVERFLOW(addr, size))
-        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu", (unsigned long long)addr, (unsigned long long)size)
+    if (REGION_OVERFLOW(addr, size))
+        HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "addr overflow, addr = %llu, size = %llu",
+                    (unsigned long long)addr, (unsigned long long)size)
 
 #ifndef H5_HAVE_PREADWRITE
     /* Seek to the correct location (if we don't have pwrite) */
-    if(addr != file->pos || OP_WRITE != file->op)
-        if(HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
+    if (addr != file->pos || OP_WRITE != file->op)
+        if (HDlseek(file->fd, (HDoff_t)addr, SEEK_SET) < 0)
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to seek to proper position")
 #endif /* H5_HAVE_PREADWRITE */
 
     /* Write the data, being careful of interrupted system calls and partial
      * results
      */
-    while(size > 0) {
-        h5_posix_io_t       bytes_in        = 0;    /* # of bytes to write  */
-        h5_posix_io_ret_t   bytes_wrote     = -1;   /* # of bytes written   */
+    while (size > 0) {
+        h5_posix_io_t     bytes_in    = 0;  /* # of bytes to write  */
+        h5_posix_io_ret_t bytes_wrote = -1; /* # of bytes written   */
 
         /* Trying to write more bytes than the return type can handle is
          * undefined behavior in POSIX.
          */
-        if(size > H5_POSIX_MAX_IO_BYTES)
+        if (size > H5_POSIX_MAX_IO_BYTES)
             bytes_in = H5_POSIX_MAX_IO_BYTES;
         else
             bytes_in = (h5_posix_io_t)size;
@@ -840,20 +848,26 @@ H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
         do {
 #ifdef H5_HAVE_PREADWRITE
             bytes_wrote = HDpwrite(file->fd, buf, bytes_in, offset);
-            if(bytes_wrote > 0)
+            if (bytes_wrote > 0)
                 offset += bytes_wrote;
 #else
             bytes_wrote = HDwrite(file->fd, buf, bytes_in);
 #endif /* H5_HAVE_PREADWRITE */
-        } while(-1 == bytes_wrote && EINTR == errno);
+        } while (-1 == bytes_wrote && EINTR == errno);
 
-        if(-1 == bytes_wrote) { /* error */
-            int myerrno = errno;
-            time_t mytime = HDtime(NULL);
+        if (-1 == bytes_wrote) { /* error */
+            int    myerrno = errno;
+            time_t mytime  = HDtime(NULL);
 
             offset = HDlseek(file->fd, (HDoff_t)0, SEEK_CUR);
 
-            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = %llu, bytes actually written = %llu, offset = %llu", HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf, (unsigned long long)size, (unsigned long long)bytes_in, (unsigned long long)bytes_wrote, (unsigned long long)offset);
+            HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL,
+                        "file write failed: time = %s, filename = '%s', file descriptor = %d, errno = %d, "
+                        "error message = '%s', buf = %p, total write size = %llu, bytes this sub-write = "
+                        "%llu, bytes actually written = %llu, offset = %llu",
+                        HDctime(&mytime), file->filename, file->fd, myerrno, HDstrerror(myerrno), buf,
+                        (unsigned long long)size, (unsigned long long)bytes_in,
+                        (unsigned long long)bytes_wrote, (unsigned long long)offset);
         } /* end if */
 
         HDassert(bytes_wrote > 0);
@@ -866,21 +880,20 @@ H5FD__sec2_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UN
 
     /* Update current position and eof */
     file->pos = addr;
-    file->op = OP_WRITE;
-    if(file->pos > file->eof)
+    file->op  = OP_WRITE;
+    if (file->pos > file->eof)
         file->eof = file->pos;
 
 done:
-    if(ret_value < 0) {
+    if (ret_value < 0) {
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_truncate
  *
@@ -897,22 +910,22 @@ done:
 static herr_t
 H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
-    herr_t ret_value = SUCCEED;                 /* Return value */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file;
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
     HDassert(file);
 
     /* Extend the file to make sure it's large enough */
-    if(!H5F_addr_eq(file->eoa, file->eof)) {
+    if (!H5F_addr_eq(file->eoa, file->eof)) {
 #ifdef H5_HAVE_WIN32_API
-        LARGE_INTEGER   li;         /* 64-bit (union) integer for SetFilePointer() call */
-        DWORD           dwPtrLow;   /* Low-order pointer bits from SetFilePointer()
-                                     * Only used as an error code here.
-                                     */
-        DWORD           dwError;    /* DWORD error code from GetLastError() */
-        BOOL            bError;     /* Boolean error flag */
+        LARGE_INTEGER li;       /* 64-bit (union) integer for SetFilePointer() call */
+        DWORD         dwPtrLow; /* Low-order pointer bits from SetFilePointer()
+                                 * Only used as an error code here.
+                                 */
+        DWORD dwError;          /* DWORD error code from GetLastError() */
+        BOOL  bError;           /* Boolean error flag */
 
         /* Windows uses this odd QuadPart union for 32/64-bit portability */
         li.QuadPart = (__int64)file->eoa;
@@ -923,17 +936,17 @@ H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
          * from SetFilePointer(), we also need to check GetLastError().
          */
         dwPtrLow = SetFilePointer(file->hFile, li.LowPart, &li.HighPart, FILE_BEGIN);
-        if(INVALID_SET_FILE_POINTER == dwPtrLow) {
+        if (INVALID_SET_FILE_POINTER == dwPtrLow) {
             dwError = GetLastError();
-            if(dwError != NO_ERROR )
+            if (dwError != NO_ERROR)
                 HGOTO_ERROR(H5E_FILE, H5E_FILEOPEN, FAIL, "unable to set file pointer")
         }
 
         bError = SetEndOfFile(file->hFile);
-        if(0 == bError)
+        if (0 == bError)
             HGOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
-#else /* H5_HAVE_WIN32_API */
-        if(-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
+#else  /* H5_HAVE_WIN32_API */
+        if (-1 == HDftruncate(file->fd, (HDoff_t)file->eoa))
             HSYS_GOTO_ERROR(H5E_IO, H5E_SEEKERROR, FAIL, "unable to extend file properly")
 #endif /* H5_HAVE_WIN32_API */
 
@@ -942,14 +955,13 @@ H5FD__sec2_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 
         /* Reset last file I/O information */
         file->pos = HADDR_UNDEF;
-        file->op = OP_UNKNOWN;
+        file->op  = OP_UNKNOWN;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_lock
  *
@@ -967,9 +979,9 @@ done:
 static herr_t
 H5FD__sec2_lock(H5FD_t *_file, hbool_t rw)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;   /* VFD file struct          */
-    int lock_flags;                             /* file locking flags       */
-    herr_t ret_value = SUCCEED;                 /* Return value             */
+    H5FD_sec2_t *file = (H5FD_sec2_t *)_file; /* VFD file struct          */
+    int          lock_flags;                  /* file locking flags       */
+    herr_t       ret_value = SUCCEED;         /* Return value             */
 
     FUNC_ENTER_STATIC
 
@@ -979,8 +991,8 @@ H5FD__sec2_lock(H5FD_t *_file, hbool_t rw)
     lock_flags = rw ? LOCK_EX : LOCK_SH;
 
     /* Place a non-blocking lock on the file */
-    if(HDflock(file->fd, lock_flags | LOCK_NB) < 0) {
-        if(file->ignore_disabled_file_locks && ENOSYS == errno) {
+    if (HDflock(file->fd, lock_flags | LOCK_NB) < 0) {
+        if (file->ignore_disabled_file_locks && ENOSYS == errno) {
             /* When errno is set to ENOSYS, the file system does not support
              * locking, so ignore it.
              */
@@ -994,7 +1006,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_lock() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__sec2_unlock
  *
@@ -1009,15 +1020,15 @@ done:
 static herr_t
 H5FD__sec2_unlock(H5FD_t *_file)
 {
-    H5FD_sec2_t *file = (H5FD_sec2_t *)_file;   /* VFD file struct          */
-    herr_t ret_value = SUCCEED;                 /* Return value             */
+    H5FD_sec2_t *file      = (H5FD_sec2_t *)_file; /* VFD file struct          */
+    herr_t       ret_value = SUCCEED;              /* Return value             */
 
     FUNC_ENTER_STATIC
 
     HDassert(file);
 
-    if(HDflock(file->fd, LOCK_UN) < 0) {
-        if(file->ignore_disabled_file_locks && ENOSYS == errno) {
+    if (HDflock(file->fd, LOCK_UN) < 0) {
+        if (file->ignore_disabled_file_locks && ENOSYS == errno) {
             /* When errno is set to ENOSYS, the file system does not support
              * locking, so ignore it.
              */
@@ -1030,4 +1041,3 @@ H5FD__sec2_unlock(H5FD_t *_file)
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__sec2_unlock() */
-