Clang-format of source files

1 files changed, 384 insertions, 406 deletions

diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 319e528..6042776 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -21,17 +21,16 @@
 
 #include "H5FDdrvr_module.h" /* This source code file is part of the H5FD driver module */
 
-
-#include "H5private.h"          /* Generic Functions                    */
-#include "H5CXprivate.h"        /* API Contexts                         */
-#include "H5Dprivate.h"         /* Dataset functions                    */
-#include "H5Eprivate.h"         /* Error handling                       */
-#include "H5Fprivate.h"         /* File access                          */
-#include "H5FDprivate.h"        /* File drivers                         */
-#include "H5FDmpi.h"            /* MPI-based file drivers               */
-#include "H5Iprivate.h"         /* IDs                                  */
-#include "H5MMprivate.h"        /* Memory management                    */
-#include "H5Pprivate.h"         /* Property lists                       */
+#include "H5private.h"   /* Generic Functions                    */
+#include "H5CXprivate.h" /* API Contexts                         */
+#include "H5Dprivate.h"  /* Dataset functions                    */
+#include "H5Eprivate.h"  /* Error handling                       */
+#include "H5Fprivate.h"  /* File access                          */
+#include "H5FDprivate.h" /* File drivers                         */
+#include "H5FDmpi.h"     /* MPI-based file drivers               */
+#include "H5Iprivate.h"  /* IDs                                  */
+#include "H5MMprivate.h" /* Memory management                    */
+#include "H5Pprivate.h"  /* Property lists                       */
 
 #ifdef H5_HAVE_PARALLEL
 
@@ -58,79 +57,79 @@ static char H5FD_mpi_native_g[] = "native";
  * driver doesn't bother to keep it updated since it's an expensive operation.
  */
 typedef struct H5FD_mpio_t {
-    H5FD_t      pub;        /* Public stuff, must be first                  */
-    MPI_File    f;          /* MPIO file handle                             */
-    MPI_Comm    comm;       /* MPI Communicator                             */
-    MPI_Info    info;       /* MPI info object                              */
-    int         mpi_rank;   /* This process's rank                          */
-    int         mpi_size;   /* Total number of processes                    */
-    haddr_t     eof;        /* End-of-file marker                           */
-    haddr_t     eoa;        /* End-of-address marker                        */
-    haddr_t     last_eoa;   /* Last known end-of-address marker             */
-    haddr_t     local_eof;  /* Local end-of-file address for each process   */
+    H5FD_t   pub;       /* Public stuff, must be first                  */
+    MPI_File f;         /* MPIO file handle                             */
+    MPI_Comm comm;      /* MPI Communicator                             */
+    MPI_Info info;      /* MPI info object                              */
+    int      mpi_rank;  /* This process's rank                          */
+    int      mpi_size;  /* Total number of processes                    */
+    haddr_t  eof;       /* End-of-file marker                           */
+    haddr_t  eoa;       /* End-of-address marker                        */
+    haddr_t  last_eoa;  /* Last known end-of-address marker             */
+    haddr_t  local_eof; /* Local end-of-file address for each process   */
 } H5FD_mpio_t;
 
 /* Private Prototypes */
 
 /* Callbacks */
-static herr_t H5FD__mpio_term(void);
-static H5FD_t *H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id,
-            haddr_t maxaddr);
-static herr_t H5FD__mpio_close(H5FD_t *_file);
-static herr_t H5FD__mpio_query(const H5FD_t *_f1, unsigned long *flags);
-static haddr_t H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
-static haddr_t H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t type);
-static herr_t H5FD__mpio_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle);
-static herr_t H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-            size_t size, void *buf);
-static herr_t H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
-            size_t size, const void *buf);
-static herr_t H5FD__mpio_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static herr_t H5FD__mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
-static int H5FD__mpio_mpi_rank(const H5FD_t *_file);
-static int H5FD__mpio_mpi_size(const H5FD_t *_file);
+static herr_t   H5FD__mpio_term(void);
+static H5FD_t * H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr);
+static herr_t   H5FD__mpio_close(H5FD_t *_file);
+static herr_t   H5FD__mpio_query(const H5FD_t *_f1, unsigned long *flags);
+static haddr_t  H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t   H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t addr);
+static haddr_t  H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t type);
+static herr_t   H5FD__mpio_get_handle(H5FD_t *_file, hid_t fapl, void **file_handle);
+static herr_t   H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                void *buf);
+static herr_t   H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size,
+                                 const void *buf);
+static herr_t   H5FD__mpio_flush(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static herr_t   H5FD__mpio_truncate(H5FD_t *_file, hid_t dxpl_id, hbool_t closing);
+static int      H5FD__mpio_mpi_rank(const H5FD_t *_file);
+static int      H5FD__mpio_mpi_size(const H5FD_t *_file);
 static MPI_Comm H5FD__mpio_communicator(const H5FD_t *_file);
 
 /* The MPIO file driver information */
 static const H5FD_class_mpi_t H5FD_mpio_g = {
-    {   /* Start of superclass information */
-    "mpio",					/*name			*/
-    HADDR_MAX,					/*maxaddr		*/
-    H5F_CLOSE_SEMI,				/*fc_degree		*/
-    H5FD__mpio_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__mpio_open,				/*open			*/
-    H5FD__mpio_close,				/*close			*/
-    NULL,					/*cmp			*/
-    H5FD__mpio_query,		                /*query			*/
-    NULL,					/*get_type_map		*/
-    NULL,					/*alloc			*/
-    NULL,					/*free			*/
-    H5FD__mpio_get_eoa,				/*get_eoa		*/
-    H5FD__mpio_set_eoa, 			/*set_eoa		*/
-    H5FD__mpio_get_eof,				/*get_eof		*/
-    H5FD__mpio_get_handle,                      /*get_handle            */
-    H5FD__mpio_read,				/*read			*/
-    H5FD__mpio_write,				/*write			*/
-    H5FD__mpio_flush,				/*flush			*/
-    H5FD__mpio_truncate,			/*truncate		*/
-    NULL,                                       /*lock                  */
-    NULL,                                       /*unlock                */
-    H5FD_FLMAP_DICHOTOMY                        /*fl_map                */
-    },  /* End of superclass information */
-    H5FD__mpio_mpi_rank,                        /*get_rank              */
-    H5FD__mpio_mpi_size,                        /*get_size              */
-    H5FD__mpio_communicator                     /*get_comm              */
+    {
+        /* Start of superclass information */
+        "mpio",                /*name			*/
+        HADDR_MAX,             /*maxaddr		*/
+        H5F_CLOSE_SEMI,        /*fc_degree		*/
+        H5FD__mpio_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__mpio_open,       /*open			*/
+        H5FD__mpio_close,      /*close			*/
+        NULL,                  /*cmp			*/
+        H5FD__mpio_query,      /*query			*/
+        NULL,                  /*get_type_map		*/
+        NULL,                  /*alloc			*/
+        NULL,                  /*free			*/
+        H5FD__mpio_get_eoa,    /*get_eoa		*/
+        H5FD__mpio_set_eoa,    /*set_eoa		*/
+        H5FD__mpio_get_eof,    /*get_eof		*/
+        H5FD__mpio_get_handle, /*get_handle            */
+        H5FD__mpio_read,       /*read			*/
+        H5FD__mpio_write,      /*write			*/
+        H5FD__mpio_flush,      /*flush			*/
+        H5FD__mpio_truncate,   /*truncate		*/
+        NULL,                  /*lock                  */
+        NULL,                  /*unlock                */
+        H5FD_FLMAP_DICHOTOMY   /*fl_map                */
+    },                         /* End of superclass information */
+    H5FD__mpio_mpi_rank,       /*get_rank              */
+    H5FD__mpio_mpi_size,       /*get_size              */
+    H5FD__mpio_communicator    /*get_comm              */
 };
 
 #ifdef H5FDmpio_DEBUG
@@ -142,18 +141,17 @@ static const H5FD_class_mpi_t H5FD_mpio_g = {
  * 't' trace function entry and exit
  * 'w' show write offset and size
  */
-static int H5FD_mpio_Debug[256] =
-        { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-          0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
+static int H5FD_mpio_Debug[256] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 #endif
 
-
 /*--------------------------------------------------------------------------
 NAME
    H5FD__init_package -- Initialize interface-specific information
@@ -176,14 +174,13 @@ H5FD__init_package(void)
 
     FUNC_ENTER_STATIC
 
-    if(H5FD_mpio_init() < 0)
+    if (H5FD_mpio_init() < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize mpio VFD")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FD__init_package() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_mpio_init
  *
@@ -203,36 +200,36 @@ H5FD_mpio_init(void)
 {
 #ifdef H5FDmpio_DEBUG
     static int H5FD_mpio_Debug_inited = 0;
-#endif /* H5FDmpio_DEBUG */
-    const char *s;                          /* String for environment variables */
-    hid_t ret_value = H5I_INVALID_HID;      /* Return value */
+#endif                                       /* H5FDmpio_DEBUG */
+    const char *s;                           /* String for environment variables */
+    hid_t       ret_value = H5I_INVALID_HID; /* Return value */
 
     FUNC_ENTER_NOAPI(H5I_INVALID_HID)
 
     /* Register the MPI-IO VFD, if it isn't already */
-    if(H5I_VFL != H5I_get_type(H5FD_MPIO_g))
+    if (H5I_VFL != H5I_get_type(H5FD_MPIO_g))
         H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g, sizeof(H5FD_class_mpi_t), FALSE);
 
     /* Allow MPI buf-and-file-type optimizations? */
     s = HDgetenv("HDF5_MPI_OPT_TYPES");
-    if(s && HDisdigit(*s)) {
-        long env_val = HDstrtol(s, NULL, 0);
+    if (s && HDisdigit(*s)) {
+        long env_val         = HDstrtol(s, NULL, 0);
         H5FD_mpi_opt_types_g = (0 == env_val) ? FALSE : TRUE;
     }
 
 #ifdef H5FDmpio_DEBUG
-    if(!H5FD_mpio_Debug_inited) {
+    if (!H5FD_mpio_Debug_inited) {
         /* Retrieve MPI-IO debugging environment variable */
         s = HDgetenv("H5FD_mpio_Debug");
-        if(s) {
+        if (s) {
             /* Set debug mask */
-            while(*s) {
+            while (*s) {
                 H5FD_mpio_Debug[(int)*s]++;
                 s++;
             } /* end while */
-        } /* end if */
+        }     /* end if */
         H5FD_mpio_Debug_inited++;
-    } /* end if */
+    }  /* end if */
 #endif /* H5FDmpio_DEBUG */
 
     /* Set return value */
@@ -242,7 +239,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_mpio_init() */
 
-
 /*---------------------------------------------------------------------------
  * Function:    H5FD__mpio_term
  *
@@ -266,7 +262,6 @@ H5FD__mpio_term(void)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__mpio_term() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_fapl_mpio
  *
@@ -301,24 +296,24 @@ H5FD__mpio_term(void)
 herr_t
 H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
 {
-    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)
     H5TRACE3("e", "iMcMi", fapl_id, comm, info);
 
     /* Check arguments */
-    if(fapl_id == H5P_DEFAULT)
+    if (fapl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    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_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if(MPI_COMM_NULL == comm)
+    if (MPI_COMM_NULL == comm)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "MPI_COMM_NULL is not a valid communicator")
 
     /* Set the MPI communicator and info object */
-    if(H5P_set(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0)
+    if (H5P_set(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI communicator")
-    if(H5P_set(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0)
+    if (H5P_set(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set MPI info object")
 
     /* duplication is done during driver setting. */
@@ -328,7 +323,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* H5Pset_fapl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_fapl_mpio
  *
@@ -353,51 +347,50 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
+H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm /*out*/, MPI_Info *info /*out*/)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("e", "ixx", fapl_id, comm, info);
 
     /* Set comm and info in case we have problems */
-    if(comm)
+    if (comm)
         *comm = MPI_COMM_NULL;
-    if(info)
+    if (info)
         *info = MPI_INFO_NULL;
 
     /* Check arguments */
-    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_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
-    if(H5FD_MPIO != H5P_peek_driver(plist))
+    if (H5FD_MPIO != H5P_peek_driver(plist))
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "VFL driver is not MPI-I/O")
 
     /* Get the MPI communicator and info object */
-    if(comm)
-        if(H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, comm) < 0)
+    if (comm)
+        if (H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, comm) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI communicator")
-    if(info)
-        if(H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, info) < 0)
+    if (info)
+        if (H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, info) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get MPI info object")
 
 done:
     /* Clean up anything duplicated on errors. The free calls will set
      * the output values to MPI_COMM|INFO_NULL.
      */
-    if(ret_value != SUCCEED) {
-        if(comm)
-            if(H5_mpi_comm_free(comm) < 0)
+    if (ret_value != SUCCEED) {
+        if (comm)
+            if (H5_mpi_comm_free(comm) < 0)
                 HDONE_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "unable to free MPI communicator")
-        if(info)
-            if(H5_mpi_info_free(info) < 0)
+        if (info)
+            if (H5_mpi_info_free(info) < 0)
                 HDONE_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "unable to free MPI info object")
     }
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_fapl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio
  *
@@ -423,29 +416,28 @@ done:
 herr_t
 H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDt", dxpl_id, xfer_mode);
 
     /* Check arguments */
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
-    if(H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
+    if (H5FD_MPIO_INDEPENDENT != xfer_mode && H5FD_MPIO_COLLECTIVE != xfer_mode)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "incorrect xfer_mode")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_IO_XFER_MODE_NAME, &xfer_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pget_dxpl_mpio
  *
@@ -463,28 +455,27 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
+H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode /*out*/)
 {
-    H5P_genplist_t *plist;              /* Property list pointer */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "ix", dxpl_id, xfer_mode);
 
     /* Check arguments */
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Get the transfer mode */
-    if(xfer_mode)
-        if(H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, xfer_mode) < 0)
+    if (xfer_mode)
+        if (H5P_get(plist, H5D_XFER_IO_XFER_MODE_NAME, xfer_mode) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to get value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_dxpl_mpio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio_collective_opt
  *
@@ -506,27 +497,26 @@ done:
 herr_t
 H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDc", dxpl_id, opt_mode);
 
     /* Check arguments */
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_COLLECTIVE_OPT_NAME, &opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_collective_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio_chunk_opt
  *
@@ -548,27 +538,26 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iDh", dxpl_id, opt_mode);
 
     /* Check arguments */
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, &opt_mode) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_HARD_NAME, &opt_mode) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio_chunk_opt_num
  *
@@ -588,27 +577,26 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
 
     /* Check arguments */
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, &num_chunk_per_proc) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_NUM_NAME, &num_chunk_per_proc) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt_num() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5Pset_dxpl_mpio_chunk_opt_ratio
  *
@@ -631,27 +619,26 @@ done:
 herr_t
 H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_chunk)
 {
-    H5P_genplist_t *plist;      /* Property list pointer */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5P_genplist_t *plist;               /* Property list pointer */
+    herr_t          ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
 
     /* Check arguments */
-    if(dxpl_id == H5P_DEFAULT)
+    if (dxpl_id == H5P_DEFAULT)
         HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't set values in default property list")
-    if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
+    if (NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a dxpl")
 
     /* Set the transfer mode */
-    if(H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, &percent_num_proc_per_chunk) < 0)
+    if (H5P_set(plist, H5D_XFER_MPIO_CHUNK_OPT_RATIO_NAME, &percent_num_proc_per_chunk) < 0)
         HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value")
 
 done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pset_dxpl_mpio_chunk_opt_ratio() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_set_mpio_atomicity
  *
@@ -667,37 +654,36 @@ done:
 herr_t
 H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    int          mpi_code;               /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* MPI return code */
     int          temp_flag;
     herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
-    if(FALSE == flag)
+    if (FALSE == flag)
         temp_flag = 0;
     else
         temp_flag = 1;
 
     /* set atomicity value */
-    if(MPI_SUCCESS != (mpi_code = MPI_File_set_atomicity(file->f, temp_flag)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_set_atomicity(file->f, temp_flag)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_set_atomicity", mpi_code)
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_set_mpio_atomicity() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD_get_mpio_atomicity
  *
@@ -713,37 +699,36 @@ done:
 herr_t
 H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    int          mpi_code;               /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* MPI return code */
     int          temp_flag;
     herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI_NOINIT
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Get atomicity value */
-    if(MPI_SUCCESS != (mpi_code = MPI_File_get_atomicity(file->f, &temp_flag)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_get_atomicity(file->f, &temp_flag)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_get_atomicity", mpi_code)
 
-    if(0 != temp_flag)
+    if (0 != temp_flag)
         *flag = TRUE;
     else
         *flag = FALSE;
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD_get_mpio_atomicity() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_open
  *
@@ -763,96 +748,96 @@ done:
  *-------------------------------------------------------------------------
  */
 static H5FD_t *
-H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id,
-    haddr_t H5_ATTR_UNUSED maxaddr)
+H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t H5_ATTR_UNUSED maxaddr)
 {
-    H5FD_mpio_t     *file = NULL;
+    H5FD_mpio_t *   file = NULL;
     MPI_File        fh;
     hbool_t         file_opened = FALSE; /* Flag to indicate that the file was successfully opened */
     int             mpi_amode;
-    int             mpi_rank;       /* MPI rank of this process */
-    int             mpi_size;       /* Total number of MPI processes */
-    int             mpi_code;       /* MPI return code */
+    int             mpi_rank; /* MPI rank of this process */
+    int             mpi_size; /* Total number of MPI processes */
+    int             mpi_code; /* MPI return code */
     MPI_Offset      size;
-    H5P_genplist_t *plist;      /* Property list pointer */
-    MPI_Comm        comm = MPI_COMM_NULL;
-    MPI_Info        info = MPI_INFO_NULL;
-    H5FD_t          *ret_value = NULL;     /* Return value */
+    H5P_genplist_t *plist; /* Property list pointer */
+    MPI_Comm        comm      = MPI_COMM_NULL;
+    MPI_Info        info      = MPI_INFO_NULL;
+    H5FD_t *        ret_value = NULL; /* Return value */
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "%s: Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n", FUNC, name, flags, (int)fapl_id, (unsigned long)maxaddr);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "%s: Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n", FUNC,
+                  name, flags, (int)fapl_id, (unsigned long)maxaddr);
 #endif
 
     /* Get a pointer to the fapl */
-    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, NULL, "not a file access property list")
 
     /* Get the MPI communicator and info object from the property list */
-    if(H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0)
+    if (H5P_get(plist, H5F_ACS_MPI_PARAMS_COMM_NAME, &comm) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI communicator")
-    if(H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0)
+    if (H5P_get(plist, H5F_ACS_MPI_PARAMS_INFO_NAME, &info) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, NULL, "can't get MPI info object")
 
     /* Convert HDF5 flags to MPI-IO flags */
     /* Some combinations are illegal; let MPI-IO figure it out */
-    mpi_amode  = (flags & H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
-    if(flags & H5F_ACC_CREAT)
+    mpi_amode = (flags & H5F_ACC_RDWR) ? MPI_MODE_RDWR : MPI_MODE_RDONLY;
+    if (flags & H5F_ACC_CREAT)
         mpi_amode |= MPI_MODE_CREATE;
-    if(flags & H5F_ACC_EXCL)
+    if (flags & H5F_ACC_EXCL)
         mpi_amode |= MPI_MODE_EXCL;
 
 #ifdef H5FDmpio_DEBUG
     /* Check for debug commands in the info parameter */
-    if(MPI_INFO_NULL != info) {
+    if (MPI_INFO_NULL != info) {
         char debug_str[128];
-        int flag;
+        int  flag;
 
         MPI_Info_get(info, H5F_MPIO_DEBUG_KEY, sizeof(debug_str) - 1, debug_str, &flag);
-        if(flag) {
+        if (flag) {
             int i;
 
             HDfprintf(stdout, "H5FD_mpio debug flags = '%s'\n", debug_str);
-            for(i = 0; debug_str[i]/*end of string*/ && i < 128/*just in case*/; ++i)
+            for (i = 0; debug_str[i] /*end of string*/ && i < 128 /*just in case*/; ++i)
                 H5FD_mpio_Debug[(int)debug_str[i]] = 1;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 #endif
 
-    if(MPI_SUCCESS != (mpi_code = MPI_File_open(comm, name, mpi_amode, info, &fh)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_open(comm, name, mpi_amode, info, &fh)))
         HMPI_GOTO_ERROR(NULL, "MPI_File_open failed", mpi_code)
     file_opened = TRUE;
 
     /* Get the MPI rank of this process and the total number of processes */
-    if (MPI_SUCCESS != (mpi_code = MPI_Comm_rank (comm, &mpi_rank)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_rank(comm, &mpi_rank)))
         HMPI_GOTO_ERROR(NULL, "MPI_Comm_rank failed", mpi_code)
-    if (MPI_SUCCESS != (mpi_code = MPI_Comm_size (comm, &mpi_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_size(comm, &mpi_size)))
         HMPI_GOTO_ERROR(NULL, "MPI_Comm_size failed", mpi_code)
 
     /* Build the return value and initialize it */
-    if(NULL == (file = (H5FD_mpio_t *)H5MM_calloc(sizeof(H5FD_mpio_t))))
+    if (NULL == (file = (H5FD_mpio_t *)H5MM_calloc(sizeof(H5FD_mpio_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    file->f = fh;
-    file->comm = comm;
-    file->info = info;
+    file->f        = fh;
+    file->comm     = comm;
+    file->info     = info;
     file->mpi_rank = mpi_rank;
     file->mpi_size = mpi_size;
 
     /* Only processor p0 will get the filesize and broadcast it. */
     if (mpi_rank == 0) {
-        if (MPI_SUCCESS != (mpi_code=MPI_File_get_size(fh, &size)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_get_size(fh, &size)))
             HMPI_GOTO_ERROR(NULL, "MPI_File_get_size failed", mpi_code)
     } /* end if */
 
     /* Broadcast file size */
-    if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, comm)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, comm)))
         HMPI_GOTO_ERROR(NULL, "MPI_Bcast failed", mpi_code)
 
     /* Determine if the file should be truncated */
-    if(size && (flags & H5F_ACC_TRUNC)) {
-        if (MPI_SUCCESS != (mpi_code=MPI_File_set_size(fh, (MPI_Offset)0)))
+    if (size && (flags & H5F_ACC_TRUNC)) {
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_size(fh, (MPI_Offset)0)))
             HMPI_GOTO_ERROR(NULL, "MPI_File_set_size failed", mpi_code)
 
         /* Don't let any proc return until all have truncated the file. */
@@ -864,33 +849,32 @@ H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     } /* end if */
 
     /* Set the size of the file (from library's perspective) */
-    file->eof = H5FD_mpi_MPIOff_to_haddr(size);
+    file->eof       = H5FD_mpi_MPIOff_to_haddr(size);
     file->local_eof = file->eof;
 
     /* Set return value */
-    ret_value = (H5FD_t*)file;
+    ret_value = (H5FD_t *)file;
 
 done:
-    if(ret_value == NULL) {
-        if(file_opened)
+    if (ret_value == NULL) {
+        if (file_opened)
             MPI_File_close(&fh);
-        if(H5_mpi_comm_free(&comm) < 0)
+        if (H5_mpi_comm_free(&comm) < 0)
             HDONE_ERROR(H5E_VFL, H5E_CANTFREE, NULL, "unable to free MPI communicator")
-        if(H5_mpi_info_free(&info) < 0)
+        if (H5_mpi_info_free(&info) < 0)
             HDONE_ERROR(H5E_VFL, H5E_CANTFREE, NULL, "unable to free MPI info object")
-        if(file)
+        if (file)
             H5MM_xfree(file);
     } /* end if */
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_close
  *
@@ -906,14 +890,14 @@ done:
 static herr_t
 H5FD__mpio_close(H5FD_t *_file)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    int         mpi_code;               /* MPI return code */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code;            /* MPI return code */
+    herr_t       ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
@@ -922,7 +906,7 @@ H5FD__mpio_close(H5FD_t *_file)
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* MPI_File_close sets argument to MPI_FILE_NULL */
-    if(MPI_SUCCESS != (mpi_code = MPI_File_close(&(file->f)/*in,out*/)))
+    if (MPI_SUCCESS != (mpi_code = MPI_File_close(&(file->f) /*in,out*/)))
         HMPI_GOTO_ERROR(FAIL, "MPI_File_close failed", mpi_code)
 
     /* Clean up other stuff */
@@ -932,14 +916,13 @@ H5FD__mpio_close(H5FD_t *_file)
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_query
  *
@@ -959,19 +942,19 @@ H5FD__mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
     FUNC_ENTER_STATIC_NOERR
 
     /* Set the VFL feature flags that this driver supports */
-    if(flags) {
+    if (flags) {
         *flags = 0;
-        *flags |= H5FD_FEAT_AGGREGATE_METADATA;     /* OK to aggregate metadata allocations                             */
-        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA;    /* OK to aggregate "small" raw data allocations                     */
-        *flags |= H5FD_FEAT_HAS_MPI;                /* This driver uses MPI                                             */
-        *flags |= H5FD_FEAT_ALLOCATE_EARLY;         /* Allocate space early instead of late                             */
-        *flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the default VFD      */
-    } /* end if */
+        *flags |= H5FD_FEAT_AGGREGATE_METADATA;  /* OK to aggregate metadata allocations  */
+        *flags |= H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
+        *flags |= H5FD_FEAT_HAS_MPI; /* This driver uses MPI                                             */
+        *flags |= H5FD_FEAT_ALLOCATE_EARLY;         /* Allocate space early instead of late         */
+        *flags |= H5FD_FEAT_DEFAULT_VFD_COMPATIBLE; /* VFD creates a file which can be opened with the default
+                                                       VFD      */
+    }                                               /* end if */
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__mpio_query() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_get_eoa
  *
@@ -990,7 +973,7 @@ H5FD__mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
 static haddr_t
 H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1001,7 +984,6 @@ H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_LEAVE_NOAPI(file->eoa)
 } /* end H5FD__mpio_get_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_set_eoa
  *
@@ -1019,7 +1001,7 @@ H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1032,7 +1014,6 @@ H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__mpio_set_eoa() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_get_eof
  *
@@ -1062,7 +1043,7 @@ H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1073,7 +1054,6 @@ H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
     FUNC_LEAVE_NOAPI(file->eof)
 } /* end H5FD__mpio_get_eof() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD__mpio_get_handle
  *
@@ -1085,16 +1065,16 @@ H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  *                 Sept. 16, 2002
  *
  *-------------------------------------------------------------------------
-*/
+ */
 static herr_t
-H5FD__mpio_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void** file_handle)
+H5FD__mpio_get_handle(H5FD_t *_file, hid_t H5_ATTR_UNUSED fapl, void **file_handle)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
-    herr_t      ret_value = SUCCEED;
+    H5FD_mpio_t *file      = (H5FD_mpio_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->f);
@@ -1103,7 +1083,6 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_get_handle() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_read
  *
@@ -1126,63 +1105,63 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD__mpio_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__mpio_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_mpio_t *file = (H5FD_mpio_t*)_file;
-    MPI_Offset  mpi_off;
-    MPI_Status  mpi_stat;       /* Status from I/O operation */
-    int         mpi_code;       /* mpi return code */
-    MPI_Datatype buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
-    int         size_i;         /* Integer copy of 'size' to read */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    MPI_Offset   mpi_off;
+    MPI_Status   mpi_stat;            /* Status from I/O operation */
+    int          mpi_code;            /* mpi return code */
+    MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */
+    int          size_i;              /* Integer copy of 'size' to read */
 #if MPI_VERSION >= 3
-    MPI_Count   bytes_read = 0; /* Number of bytes read in */
-    MPI_Count   type_size;      /* MPI datatype used for I/O's size */
-    MPI_Count   io_size;        /* Actual number of bytes requested */
-    MPI_Count   n;
+    MPI_Count bytes_read = 0; /* Number of bytes read in */
+    MPI_Count type_size;      /* MPI datatype used for I/O's size */
+    MPI_Count io_size;        /* Actual number of bytes requested */
+    MPI_Count n;
 #else
-    int         bytes_read = 0; /* Number of bytes read in */
-    int         type_size;      /* MPI datatype used for I/O's size */
-    int         io_size;        /* Actual number of bytes requested */
-    int         n;
+    int bytes_read = 0; /* Number of bytes read in */
+    int type_size;      /* MPI datatype used for I/O's size */
+    int io_size;        /* Actual number of bytes requested */
+    int n;
 #endif
-    hbool_t     use_view_this_time = FALSE;
-    hbool_t     rank0_bcast = FALSE; /* If read-with-rank0-and-bcast flag was used */
-    herr_t      ret_value = SUCCEED;
+    hbool_t use_view_this_time = FALSE;
+    hbool_t rank0_bcast        = FALSE; /* If read-with-rank0-and-bcast flag was used */
+    herr_t  ret_value          = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
     HDassert(buf);
 
     /* Portably initialize MPI status variable */
-    HDmemset(&mpi_stat,0,sizeof(MPI_Status));
+    HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
 
     /* some numeric conversions */
-    if(H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off/*out*/) < 0)
+    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off /*out*/) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
     size_i = (int)size;
-    if((hsize_t)size_i != size)
+    if ((hsize_t)size_i != size)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from size to size_i")
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'r'])
+    if (H5FD_mpio_Debug[(int)'r'])
         HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", FUNC, (long)mpi_off, size_i);
 #endif
 
     /* Only look for MPI views for raw data transfers */
-    if(type == H5FD_MEM_DRAW) {
-        H5FD_mpio_xfer_t xfer_mode;   /* I/O transfer mode */
+    if (type == H5FD_MEM_DRAW) {
+        H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode */
 
         /* Get the transfer mode from the API context */
-        if(H5CX_get_io_xfer_mode(&xfer_mode) < 0)
+        if (H5CX_get_io_xfer_mode(&xfer_mode) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O transfer mode")
 
         /*
@@ -1191,20 +1170,21 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
          * us to test that btype=ftype=MPI_BYTE (or even MPI_TYPE_NULL, which
          * could mean "use MPI_BYTE" by convention).
          */
-        if(xfer_mode == H5FD_MPIO_COLLECTIVE) {
+        if (xfer_mode == H5FD_MPIO_COLLECTIVE) {
             MPI_Datatype file_type;
 
             /* Remember that views are used */
             use_view_this_time = TRUE;
 
             /* Prepare for a full-blown xfer using btype, ftype, and disp */
-            if(H5CX_get_mpi_coll_datatypes(&buf_type, &file_type) < 0)
+            if (H5CX_get_mpi_coll_datatypes(&buf_type, &file_type) < 0)
                 HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O datatypes")
 
             /*
              * Set the file view when we are using MPI derived types
              */
-            if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g, file->info)))
+            if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type,
+                                                             H5FD_mpi_native_g, file->info)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
             /* When using types, use the address as the displacement for
@@ -1212,72 +1192,74 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
              */
             mpi_off = 0;
         } /* end if */
-    } /* end if */
+    }     /* end if */
 
     /* Read the data. */
-    if(use_view_this_time) {
+    if (use_view_this_time) {
         H5FD_mpio_collective_opt_t coll_opt_mode;
 
 #ifdef H5FDmpio_DEBUG
-        if(H5FD_mpio_Debug[(int)'r'])
+        if (H5FD_mpio_Debug[(int)'r'])
             HDfprintf(stdout, "%s: using MPIO collective mode\n", FUNC);
 #endif
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
-        if(H5CX_get_mpio_coll_opt(&coll_opt_mode) < 0)
+        if (H5CX_get_mpio_coll_opt(&coll_opt_mode) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O collective_op property")
 
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+        if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'r'])
+            if (H5FD_mpio_Debug[(int)'r'])
                 HDfprintf(stdout, "%s: doing MPI collective IO\n", FUNC);
 #endif
             /* Check whether we should read from rank 0 and broadcast to other ranks */
-            if(H5CX_get_mpio_rank0_bcast()) {
+            if (H5CX_get_mpio_rank0_bcast()) {
 #ifdef H5FDmpio_DEBUG
-                if(H5FD_mpio_Debug[(int)'r'])
+                if (H5FD_mpio_Debug[(int)'r'])
                     HDfprintf(stdout, "%s: doing read-rank0-and-MPI_Bcast\n", FUNC);
 #endif
                 /* Indicate path we've taken */
                 rank0_bcast = TRUE;
 
                 /* Read on rank 0 Bcast to other ranks */
-                if(file->mpi_rank == 0)
-                    if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+                if (file->mpi_rank == 0)
+                    if (MPI_SUCCESS !=
+                        (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                         HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
-                if(MPI_SUCCESS != (mpi_code = MPI_Bcast(buf, size_i, buf_type, 0, file->comm)))
+                if (MPI_SUCCESS != (mpi_code = MPI_Bcast(buf, size_i, buf_type, 0, file->comm)))
                     HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed", mpi_code)
             } /* end if */
-            else
-                if(MPI_SUCCESS != (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
-                    HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
+            else if (MPI_SUCCESS !=
+                     (mpi_code = MPI_File_read_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+                HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at_all failed", mpi_code)
         } /* end if */
         else {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'r'])
+            if (H5FD_mpio_Debug[(int)'r'])
                 HDfprintf(stdout, "%s: doing MPI independent IO\n", FUNC);
 #endif
 
-            if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
         } /* end else */
 
         /*
          * Reset the file view when we used MPI derived types
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g, file->info)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE,
+                                                         H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
     } /* end if */
-    else
-        if(MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
-            HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
+    else if (MPI_SUCCESS != (mpi_code = MPI_File_read_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+        HMPI_GOTO_ERROR(FAIL, "MPI_File_read_at failed", mpi_code)
 
     /* Only retrieve bytes read if this rank _actually_ participated in I/O */
-    if(!rank0_bcast || (rank0_bcast && file->mpi_rank == 0) ) {
+    if (!rank0_bcast || (rank0_bcast && file->mpi_rank == 0)) {
         /* How many bytes were actually read? */
 #if MPI_VERSION >= 3
-        if(MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_read)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_read)))
 #else
-        if(MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_read)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_read)))
 #endif
             HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
     } /* end if */
@@ -1288,15 +1270,15 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
     /* NOTE: This could be optimized further to be combined with the broadcast
      *          of the data.  (QAK - 2019/1/2)
      */
-    if(rank0_bcast)
-        if(MPI_SUCCESS != MPI_Bcast(&bytes_read, 1, MPI_LONG_LONG, 0, file->comm))
+    if (rank0_bcast)
+        if (MPI_SUCCESS != MPI_Bcast(&bytes_read, 1, MPI_LONG_LONG, 0, file->comm))
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed", 0)
 
-    /* Get the type's size */
+            /* Get the type's size */
 #if MPI_VERSION >= 3
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size)))
 #else
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
 #endif
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_size failed", mpi_code)
 
@@ -1304,26 +1286,24 @@ H5FD__mpio_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type,
     io_size = type_size * size_i;
 
     /* Check for read failure */
-    if(bytes_read < 0 || bytes_read > io_size)
+    if (bytes_read < 0 || bytes_read > io_size)
         HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed")
 
     /*
      * This gives us zeroes beyond end of physical MPI file.
      */
-    if((n = (io_size - bytes_read)) > 0)
-        HDmemset((char*)buf+bytes_read, 0, (size_t)n);
+    if ((n = (io_size - bytes_read)) > 0)
+        HDmemset((char *)buf + bytes_read, 0, (size_t)n);
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-       HDfprintf(stdout, "%s: Leaving\n", FUNC);
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_read() */
 
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_write
  *
@@ -1346,39 +1326,39 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
-    haddr_t addr, size_t size, const void *buf)
+H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr, size_t size,
+                 const void *buf)
 {
-    H5FD_mpio_t                 *file = (H5FD_mpio_t*)_file;
-    MPI_Offset                  mpi_off;
-    MPI_Status                  mpi_stat;       /* Status from I/O operation */
-    MPI_Datatype                buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
-    int                         mpi_code;   /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    MPI_Offset   mpi_off;
+    MPI_Status   mpi_stat;            /* Status from I/O operation */
+    MPI_Datatype buf_type = MPI_BYTE; /* MPI description of the selection in memory */
+    int          mpi_code;            /* MPI return code */
 #if MPI_VERSION >= 3
-    MPI_Count                   bytes_written;
-    MPI_Count                   type_size;      /* MPI datatype used for I/O's size */
-    MPI_Count                   io_size;        /* Actual number of bytes requested */
+    MPI_Count bytes_written;
+    MPI_Count type_size; /* MPI datatype used for I/O's size */
+    MPI_Count io_size;   /* Actual number of bytes requested */
 #else
-    int                         bytes_written;
-    int                         type_size;      /* MPI datatype used for I/O's size */
-    int                         io_size;        /* Actual number of bytes requested */
+    int bytes_written;
+    int type_size; /* MPI datatype used for I/O's size */
+    int io_size;   /* Actual number of bytes requested */
 #endif
-    int                         size_i;
-    hbool_t                     use_view_this_time = FALSE;
-    hbool_t                     derived_type = FALSE;
-    H5FD_mpio_xfer_t            xfer_mode;   /* I/O transfer mode */
-    herr_t                      ret_value = SUCCEED;
+    int              size_i;
+    hbool_t          use_view_this_time = FALSE;
+    hbool_t          derived_type       = FALSE;
+    H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode */
+    herr_t           ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
     HDassert(file);
-    HDassert(H5FD_MPIO==file->pub.driver_id);
+    HDassert(H5FD_MPIO == file->pub.driver_id);
     HDassert(buf);
 
     /* Verify that no data is written when between MPI_Barrier()s during file flush */
@@ -1388,17 +1368,17 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
     HDmemset(&mpi_stat, 0, sizeof(MPI_Status));
 
     /* some numeric conversions */
-    if(H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0)
+    if (H5FD_mpi_haddr_to_MPIOff(addr, &mpi_off) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off")
     size_i = (int)size;
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'w'])
+    if (H5FD_mpio_Debug[(int)'w'])
         HDfprintf(stdout, "%s: mpi_off = %ld  size_i = %d\n", FUNC, (long)mpi_off, size_i);
 #endif
 
     /* Get the transfer mode from the API context */
-    if(H5CX_get_io_xfer_mode(&xfer_mode) < 0)
+    if (H5CX_get_io_xfer_mode(&xfer_mode) < 0)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O transfer mode")
 
     /*
@@ -1407,20 +1387,21 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
      * us to test that btype=ftype=MPI_BYTE (or even MPI_TYPE_NULL, which
      * could mean "use MPI_BYTE" by convention).
      */
-    if(xfer_mode == H5FD_MPIO_COLLECTIVE) {
-        MPI_Datatype    file_type;
+    if (xfer_mode == H5FD_MPIO_COLLECTIVE) {
+        MPI_Datatype file_type;
 
         /* Remember that views are used */
         use_view_this_time = TRUE;
 
         /* Prepare for a full-blown xfer using btype, ftype, and disp */
-        if(H5CX_get_mpi_coll_datatypes(&buf_type, &file_type) < 0)
+        if (H5CX_get_mpi_coll_datatypes(&buf_type, &file_type) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O datatypes")
 
         /*
          * Set the file view when we are using MPI derived types
          */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type, H5FD_mpi_native_g, file->info)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, mpi_off, MPI_BYTE, file_type,
+                                                         H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
 
         /* When using types, use the address as the displacement for
@@ -1428,7 +1409,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
          */
         mpi_off = 0;
     } /* end if */
-    else if(size != (hsize_t)size_i) {
+    else if (size != (hsize_t)size_i) {
         /* If HERE, then we need to work around the integer size limit
          * of 2GB. The input size_t size variable cannot fit into an integer,
          * but we can get around that limitation by creating a different datatype
@@ -1436,66 +1417,70 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
          * the derived_type.
          */
 
-       if (H5_mpio_create_large_type(size, 0, MPI_BYTE, &buf_type) < 0)
+        if (H5_mpio_create_large_type(size, 0, MPI_BYTE, &buf_type) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "can't create MPI-I/O datatype")
 
         derived_type = TRUE;
-        size_i = 1;
+        size_i       = 1;
     }
 
     /* Write the data. */
-    if(use_view_this_time) {
+    if (use_view_this_time) {
         H5FD_mpio_collective_opt_t coll_opt_mode;
 
 #ifdef H5FDmpio_DEBUG
-        if(H5FD_mpio_Debug[(int)'w'])
+        if (H5FD_mpio_Debug[(int)'w'])
             HDfprintf(stdout, "%s: using MPIO collective mode\n", FUNC);
 #endif
 
         /* Get the collective_opt property to check whether the application wants to do IO individually. */
-        if(H5CX_get_mpio_coll_opt(&coll_opt_mode) < 0)
+        if (H5CX_get_mpio_coll_opt(&coll_opt_mode) < 0)
             HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "can't get MPI-I/O collective_op property")
 
-        if(coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
+        if (coll_opt_mode == H5FD_MPIO_COLLECTIVE_IO) {
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'w'])
+            if (H5FD_mpio_Debug[(int)'w'])
                 HDfprintf(stdout, "%s: doing MPI collective IO\n", FUNC);
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_write_at_all(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at_all failed", mpi_code)
         } /* end if */
         else {
-            if(type != H5FD_MEM_DRAW)
-                HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "Metadata Coll opt property should be collective at this point")
+            if (type != H5FD_MEM_DRAW)
+                HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL,
+                            "Metadata Coll opt property should be collective at this point")
 #ifdef H5FDmpio_DEBUG
-            if(H5FD_mpio_Debug[(int)'w'])
+            if (H5FD_mpio_Debug[(int)'w'])
                 HDfprintf(stdout, "%s: doing MPI independent IO\n", FUNC);
 #endif
-            if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+            if (MPI_SUCCESS !=
+                (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
         } /* end else */
 
         /* Reset the file view when we used MPI derived types */
-        if(MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE, H5FD_mpi_native_g,  file->info)))
+        if (MPI_SUCCESS != (mpi_code = MPI_File_set_view(file->f, (MPI_Offset)0, MPI_BYTE, MPI_BYTE,
+                                                         H5FD_mpi_native_g, file->info)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_set_view failed", mpi_code)
     } /* end if */
-    else
-        if(MPI_SUCCESS != (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
-            HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
+    else if (MPI_SUCCESS !=
+             (mpi_code = MPI_File_write_at(file->f, mpi_off, buf, size_i, buf_type, &mpi_stat)))
+        HMPI_GOTO_ERROR(FAIL, "MPI_File_write_at failed", mpi_code)
 
-    /* How many bytes were actually written? */
+        /* How many bytes were actually written? */
 #if MPI_VERSION >= 3
-    if(MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_written)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Get_elements_x(&mpi_stat, buf_type, &bytes_written)))
 #else
-    if(MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Get_elements(&mpi_stat, MPI_BYTE, &bytes_written)))
 #endif
         HMPI_GOTO_ERROR(FAIL, "MPI_Get_elements failed", mpi_code)
 
-    /* Get the type's size */
+        /* Get the type's size */
 #if MPI_VERSION >= 3
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size_x(buf_type, &type_size)))
 #else
-    if(MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
+    if (MPI_SUCCESS != (mpi_code = MPI_Type_size(buf_type, &type_size)))
 #endif
         HMPI_GOTO_ERROR(FAIL, "MPI_Type_size failed", mpi_code)
 
@@ -1503,7 +1488,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
     io_size = type_size * size_i;
 
     /* Check for write failure */
-    if(bytes_written != io_size || bytes_written < 0)
+    if (bytes_written != io_size || bytes_written < 0)
         HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
     /* Each process will keep track of its perceived EOF value locally, and
@@ -1514,22 +1499,21 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
      * potentially be wrong.) */
     file->eof = HADDR_UNDEF;
 
-    if(bytes_written && (((haddr_t)bytes_written + addr) > file->local_eof))
+    if (bytes_written && (((haddr_t)bytes_written + addr) > file->local_eof))
         file->local_eof = addr + (haddr_t)bytes_written;
 
 done:
-    if(derived_type) {
+    if (derived_type) {
         MPI_Type_free(&buf_type);
     }
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
-        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", FUNC, file->mpi_rank, ret_value );
+    if (H5FD_mpio_Debug[(int)'t'])
+        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", FUNC, file->mpi_rank, ret_value);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_write() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_flush
  *
@@ -1545,14 +1529,14 @@ done:
 static herr_t
 H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 {
-    H5FD_mpio_t     *file = (H5FD_mpio_t*)_file;
-    int             mpi_code;   /* mpi return code */
-    herr_t          ret_value = SUCCEED;
+    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
+    int          mpi_code; /* mpi return code */
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
@@ -1561,20 +1545,19 @@ H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
     /* Only sync the file if we are not going to immediately close it */
-    if(!closing)
-        if(MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
+    if (!closing)
+        if (MPI_SUCCESS != (mpi_code = MPI_File_sync(file->f)))
             HMPI_GOTO_ERROR(FAIL, "MPI_File_sync failed", mpi_code)
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_truncate
  *
@@ -1600,13 +1583,13 @@ done:
 static herr_t
 H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
-    herr_t      ret_value = SUCCEED;
+    H5FD_mpio_t *file      = (H5FD_mpio_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
@@ -1614,10 +1597,10 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
     HDassert(file);
     HDassert(H5FD_MPIO == file->pub.driver_id);
 
-    if(!H5F_addr_eq(file->eoa, file->last_eoa)) {
-        int             mpi_code;       /* mpi return code */
-        MPI_Offset      size;
-        MPI_Offset      needed_eof;
+    if (!H5F_addr_eq(file->eoa, file->last_eoa)) {
+        int        mpi_code; /* mpi return code */
+        MPI_Offset size;
+        MPI_Offset needed_eof;
 
         /* In principle, it is possible for the size returned by the
          * call to MPI_File_get_size() to depend on whether writes from
@@ -1631,29 +1614,29 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
          * Check the "MPI file closing" flag in the API context to determine
          * if we can skip the barrier.
          */
-        if(!H5CX_get_mpi_file_flushing())
-            if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
+        if (!H5CX_get_mpi_file_flushing())
+            if (MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
 
         /* Only processor p0 will get the filesize and broadcast it. */
         /* (Note that throwing an error here will cause non-rank 0 processes
          *      to hang in following Bcast.  -QAK, 3/17/2018)
          */
-        if(0 == file->mpi_rank)
-            if(MPI_SUCCESS != (mpi_code = MPI_File_get_size(file->f, &size)))
+        if (0 == file->mpi_rank)
+            if (MPI_SUCCESS != (mpi_code = MPI_File_get_size(file->f, &size)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_get_size failed", mpi_code)
 
         /* Broadcast file size */
-        if(MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, file->comm)))
+        if (MPI_SUCCESS != (mpi_code = MPI_Bcast(&size, (int)sizeof(MPI_Offset), MPI_BYTE, 0, file->comm)))
             HMPI_GOTO_ERROR(FAIL, "MPI_Bcast failed", mpi_code)
 
-        if(H5FD_mpi_haddr_to_MPIOff(file->eoa, &needed_eof) < 0)
+        if (H5FD_mpi_haddr_to_MPIOff(file->eoa, &needed_eof) < 0)
             HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset")
 
         /* eoa != eof.  Set eof to eoa */
-        if(size != needed_eof) {
+        if (size != needed_eof) {
             /* Extend the file's size */
-            if(MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, needed_eof)))
+            if (MPI_SUCCESS != (mpi_code = MPI_File_set_size(file->f, needed_eof)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_File_set_size failed", mpi_code)
 
             /* In general, we must wait until all processes have finished
@@ -1665,7 +1648,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
              * not be an issue at file close.  If so, we may be able to
              * optimize out the following barrier in that case.
              */
-            if(MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
+            if (MPI_SUCCESS != (mpi_code = MPI_Barrier(file->comm)))
                 HMPI_GOTO_ERROR(FAIL, "MPI_Barrier failed", mpi_code)
         } /* end if */
 
@@ -1675,14 +1658,13 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 
 done:
 #ifdef H5FDmpio_DEBUG
-    if(H5FD_mpio_Debug[(int)'t'])
+    if (H5FD_mpio_Debug[(int)'t'])
         HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_truncate() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_mpi_rank
  *
@@ -1699,7 +1681,7 @@ done:
 static int
 H5FD__mpio_mpi_rank(const H5FD_t *_file)
 {
-    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1710,7 +1692,6 @@ H5FD__mpio_mpi_rank(const H5FD_t *_file)
     FUNC_LEAVE_NOAPI(file->mpi_rank)
 } /* end H5FD__mpio_mpi_rank() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_mpi_size
  *
@@ -1727,7 +1708,7 @@ H5FD__mpio_mpi_rank(const H5FD_t *_file)
 static int
 H5FD__mpio_mpi_size(const H5FD_t *_file)
 {
-    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1738,7 +1719,6 @@ H5FD__mpio_mpi_size(const H5FD_t *_file)
     FUNC_LEAVE_NOAPI(file->mpi_size)
 } /* end H5FD__mpio_mpi_size() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5FD__mpio_communicator
  *
@@ -1755,7 +1735,7 @@ H5FD__mpio_mpi_size(const H5FD_t *_file)
 static MPI_Comm
 H5FD__mpio_communicator(const H5FD_t *_file)
 {
-    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t *file = (const H5FD_mpio_t *)_file;
 
     FUNC_ENTER_STATIC_NOERR
 
@@ -1766,7 +1746,6 @@ H5FD__mpio_communicator(const H5FD_t *_file)
     FUNC_LEAVE_NOAPI(file->comm)
 } /* end H5FD__mpio_communicator() */
 
-
 /*-------------------------------------------------------------------------
  * Function:       H5FD__mpio_get_info
  *
@@ -1778,16 +1757,16 @@ H5FD__mpio_communicator(const H5FD_t *_file)
  *                 April 4, 2017
  *
  *-------------------------------------------------------------------------
-*/
+ */
 static herr_t
 H5FD__mpio_get_info(H5FD_t *_file, void **mpi_info)
 {
-    H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
-    herr_t      ret_value = SUCCEED;
+    H5FD_mpio_t *file      = (H5FD_mpio_t *)_file;
+    herr_t       ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
-    if(!mpi_info)
+    if (!mpi_info)
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "mpi info not valid")
 
     *mpi_info = &(file->info);
@@ -1797,4 +1776,3 @@ done:
 } /* H5FD__mpio_get_info() */
 
 #endif /* H5_HAVE_PARALLEL */
-