Clang-format of source files

1 files changed, 226 insertions, 288 deletions

diff --git a/testpar/testphdf5.c b/testpar/testphdf5.c
index b89c790..ca38623 100644
--- a/testpar/testphdf5.c
+++ b/testpar/testphdf5.c
@@ -18,23 +18,23 @@
 #include "testphdf5.h"
 
 #ifndef PATH_MAX
-#define PATH_MAX    512
-#endif  /* !PATH_MAX */
+#define PATH_MAX 512
+#endif /* !PATH_MAX */
 
 /* global variables */
 int dim0;
 int dim1;
 int chunkdim0;
 int chunkdim1;
-int nerrors = 0;            /* errors count */
-int ndatasets = 300;            /* number of datasets to create*/
-int ngroups = 512;                      /* number of groups to create in root
- * group. */
-int facc_type = FACC_MPIO;        /*Test file access type */
+int nerrors   = 0;               /* errors count */
+int ndatasets = 300;             /* number of datasets to create*/
+int ngroups   = 512;             /* number of groups to create in root
+                                  * group. */
+int facc_type       = FACC_MPIO; /*Test file access type */
 int dxfer_coll_type = DXFER_COLLECTIVE_IO;
 
-H5E_auto2_t old_func;                /* previous error handler */
-void *old_client_data;            /* previous error handler arg.*/
+H5E_auto2_t old_func;        /* previous error handler */
+void *      old_client_data; /* previous error handler arg.*/
 
 /* other option flags */
 
@@ -43,13 +43,11 @@ void *old_client_data;            /* previous error handler arg.*/
  * created in one test is accessed by a different test.
  * filenames[0] is reserved as the file name for PARATESTFILE.
  */
-#define NFILENAME 2
+#define NFILENAME    2
 #define PARATESTFILE filenames[0]
-const char *FILENAME[NFILENAME]={
-        "ParaTest",
-        NULL};
-char    filenames[NFILENAME][PATH_MAX];
-hid_t    fapl;                /* file access property list */
+const char *FILENAME[NFILENAME] = {"ParaTest", NULL};
+char        filenames[NFILENAME][PATH_MAX];
+hid_t       fapl; /* file access property list */
 
 #ifdef USE_PAUSE
 /* pause the process for a moment to allow debugger to attach if desired. */
@@ -58,15 +56,16 @@ hid_t    fapl;                /* file access property list */
 #include <sys/types.h>
 #include <sys/stat.h>
 
-void pause_proc(void)
+void
+pause_proc(void)
 {
 
-    int pid;
-    h5_stat_t    statbuf;
-    char greenlight[] = "go";
-    int maxloop = 10;
-    int loops = 0;
-    int time_int = 10;
+    int       pid;
+    h5_stat_t statbuf;
+    char      greenlight[] = "go";
+    int       maxloop      = 10;
+    int       loops        = 0;
+    int       time_int     = 10;
 
     /* mpi variables */
     int  mpi_size, mpi_rank;
@@ -79,10 +78,10 @@ void pause_proc(void)
     MPI_Get_processor_name(mpi_name, &mpi_namelen);
 
     if (MAINPROCESS)
-        while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop){
-            if (!loops++){
-                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n",
-                        mpi_rank, mpi_namelen, mpi_name, pid, pid);
+        while ((HDstat(greenlight, &statbuf) == -1) && loops < maxloop) {
+            if (!loops++) {
+                HDprintf("Proc %d (%*s, %d): to debug, attach %d\n", mpi_rank, mpi_namelen, mpi_name, pid,
+                         pid);
             }
             HDprintf("waiting(%ds) for file %s ...\n", time_int, greenlight);
             HDfflush(stdout);
@@ -92,15 +91,15 @@ void pause_proc(void)
 }
 
 /* Use the Profile feature of MPI to call the pause_proc() */
-int MPI_Init(int *argc, char ***argv)
+int
+MPI_Init(int *argc, char ***argv)
 {
     int ret_code;
-    ret_code=PMPI_Init(argc, argv);
+    ret_code = PMPI_Init(argc, argv);
     pause_proc();
     return (ret_code);
 }
-#endif    /* USE_PAUSE */
-
+#endif /* USE_PAUSE */
 
 /*
  * Show command usage
@@ -109,164 +108,165 @@ static void
 usage(void)
 {
     HDprintf("    [-r] [-w] [-m<n_datasets>] [-n<n_groups>] "
-            "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
+             "[-o] [-f <prefix>] [-d <dim0> <dim1>]\n");
     HDprintf("\t-m<n_datasets>"
-            "\tset number of datasets for the multiple dataset test\n");
+             "\tset number of datasets for the multiple dataset test\n");
     HDprintf("\t-n<n_groups>"
-            "\tset number of groups for the multiple group test\n");
+             "\tset number of groups for the multiple group test\n");
     HDprintf("\t-f <prefix>\tfilename prefix\n");
     HDprintf("\t-2\t\tuse Split-file together with MPIO\n");
-    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n",
-            ROW_FACTOR, COL_FACTOR);
+    HDprintf("\t-d <factor0> <factor1>\tdataset dimensions factors. Defaults (%d,%d)\n", ROW_FACTOR,
+             COL_FACTOR);
     HDprintf("\t-c <dim0> <dim1>\tdataset chunk dimensions. Defaults (dim0/10,dim1/10)\n");
     HDprintf("\n");
 }
 
-
 /*
  * parse the command line options
  */
 static int
 parse_options(int argc, char **argv)
 {
-    int mpi_size, mpi_rank;                /* mpi variables */
+    int mpi_size, mpi_rank; /* mpi variables */
 
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
     /* setup default chunk-size. Make sure sizes are > 0 */
 
-    chunkdim0 = (dim0+9)/10;
-    chunkdim1 = (dim1+9)/10;
+    chunkdim0 = (dim0 + 9) / 10;
+    chunkdim1 = (dim1 + 9) / 10;
 
-    while (--argc){
-        if (**(++argv) != '-'){
-            break;
-        }else{
-            switch(*(*argv+1)){
-            case 'm':   ndatasets = atoi((*argv+1)+1);
-            if (ndatasets < 0){
-                nerrors++;
-                return(1);
-            }
-            break;
-            case 'n':   ngroups = atoi((*argv+1)+1);
-            if (ngroups < 0){
-                nerrors++;
-                return(1);
-            }
-            break;
-            case 'f':   if (--argc < 1) {
-                nerrors++;
-                return(1);
-            }
-            if (**(++argv) == '-') {
-                nerrors++;
-                return(1);
-            }
-            paraprefix = *argv;
+    while (--argc) {
+        if (**(++argv) != '-') {
             break;
-            case 'i':   /* Collective MPI-IO access with independent IO  */
-                dxfer_coll_type = DXFER_INDEPENDENT_IO;
-                break;
-            case '2':   /* Use the split-file driver with MPIO access */
-                /* Can use $HDF5_METAPREFIX to define the */
-                /* meta-file-prefix. */
-                facc_type = FACC_MPIO | FACC_SPLIT;
-                break;
-            case 'd':   /* dimensizes */
-                if (--argc < 2){
-                    nerrors++;
-                    return(1);
-                }
-                dim0 = atoi(*(++argv))*mpi_size;
-                argc--;
-                dim1 = atoi(*(++argv))*mpi_size;
-                /* set default chunkdim sizes too */
-                chunkdim0 = (dim0+9)/10;
-                chunkdim1 = (dim1+9)/10;
-                break;
-            case 'c':   /* chunk dimensions */
-                if (--argc < 2){
+        }
+        else {
+            switch (*(*argv + 1)) {
+                case 'm':
+                    ndatasets = atoi((*argv + 1) + 1);
+                    if (ndatasets < 0) {
+                        nerrors++;
+                        return (1);
+                    }
+                    break;
+                case 'n':
+                    ngroups = atoi((*argv + 1) + 1);
+                    if (ngroups < 0) {
+                        nerrors++;
+                        return (1);
+                    }
+                    break;
+                case 'f':
+                    if (--argc < 1) {
+                        nerrors++;
+                        return (1);
+                    }
+                    if (**(++argv) == '-') {
+                        nerrors++;
+                        return (1);
+                    }
+                    paraprefix = *argv;
+                    break;
+                case 'i': /* Collective MPI-IO access with independent IO  */
+                    dxfer_coll_type = DXFER_INDEPENDENT_IO;
+                    break;
+                case '2': /* Use the split-file driver with MPIO access */
+                    /* Can use $HDF5_METAPREFIX to define the */
+                    /* meta-file-prefix. */
+                    facc_type = FACC_MPIO | FACC_SPLIT;
+                    break;
+                case 'd': /* dimensizes */
+                    if (--argc < 2) {
+                        nerrors++;
+                        return (1);
+                    }
+                    dim0 = atoi(*(++argv)) * mpi_size;
+                    argc--;
+                    dim1 = atoi(*(++argv)) * mpi_size;
+                    /* set default chunkdim sizes too */
+                    chunkdim0 = (dim0 + 9) / 10;
+                    chunkdim1 = (dim1 + 9) / 10;
+                    break;
+                case 'c': /* chunk dimensions */
+                    if (--argc < 2) {
+                        nerrors++;
+                        return (1);
+                    }
+                    chunkdim0 = atoi(*(++argv));
+                    argc--;
+                    chunkdim1 = atoi(*(++argv));
+                    break;
+                case 'h': /* print help message--return with nerrors set */
+                    return (1);
+                default:
+                    HDprintf("Illegal option(%s)\n", *argv);
                     nerrors++;
-                    return(1);
-                }
-                chunkdim0 = atoi(*(++argv));
-                argc--;
-                chunkdim1 = atoi(*(++argv));
-                break;
-            case 'h':   /* print help message--return with nerrors set */
-                return(1);
-            default:    HDprintf("Illegal option(%s)\n", *argv);
-            nerrors++;
-            return(1);
+                    return (1);
             }
         }
     } /*while*/
 
     /* check validity of dimension and chunk sizes */
-    if (dim0 <= 0 || dim1 <= 0){
+    if (dim0 <= 0 || dim1 <= 0) {
         HDprintf("Illegal dim sizes (%d, %d)\n", dim0, dim1);
         nerrors++;
-        return(1);
+        return (1);
     }
-    if (chunkdim0 <= 0 || chunkdim1 <= 0){
+    if (chunkdim0 <= 0 || chunkdim1 <= 0) {
         HDprintf("Illegal chunkdim sizes (%d, %d)\n", chunkdim0, chunkdim1);
         nerrors++;
-        return(1);
+        return (1);
     }
 
     /* Make sure datasets can be divided into equal portions by the processes */
-    if ((dim0 % mpi_size) || (dim1 % mpi_size)){
+    if ((dim0 % mpi_size) || (dim1 % mpi_size)) {
         if (MAINPROCESS)
-            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n",
-                    dim0, dim1, mpi_size);
+            HDprintf("dim0(%d) and dim1(%d) must be multiples of processes(%d)\n", dim0, dim1, mpi_size);
         nerrors++;
-        return(1);
+        return (1);
     }
 
     /* compose the test filenames */
     {
         int i, n;
 
-        n = sizeof(FILENAME)/sizeof(FILENAME[0]) - 1;    /* exclude the NULL */
+        n = sizeof(FILENAME) / sizeof(FILENAME[0]) - 1; /* exclude the NULL */
 
-        for (i=0; i < n; i++)
-            if (h5_fixname(FILENAME[i],fapl,filenames[i],sizeof(filenames[i]))
-                    == NULL){
+        for (i = 0; i < n; i++)
+            if (h5_fixname(FILENAME[i], fapl, filenames[i], sizeof(filenames[i])) == NULL) {
                 HDprintf("h5_fixname failed\n");
                 nerrors++;
-                return(1);
+                return (1);
             }
         HDprintf("Test filenames are:\n");
-        for (i=0; i < n; i++)
+        for (i = 0; i < n; i++)
             HDprintf("    %s\n", filenames[i]);
     }
 
-    return(0);
+    return (0);
 }
 
-
 /*
  * Create the appropriate File access property list
  */
 hid_t
 create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
 {
-    hid_t ret_pl = -1;
-    herr_t ret;                 /* generic return value */
-    int mpi_rank;        /* mpi variables */
+    hid_t  ret_pl = -1;
+    herr_t ret;      /* generic return value */
+    int    mpi_rank; /* mpi variables */
 
     /* need the rank for error checking macros */
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
-    ret_pl = H5Pcreate (H5P_FILE_ACCESS);
+    ret_pl = H5Pcreate(H5P_FILE_ACCESS);
     VRFY((ret_pl >= 0), "H5P_FILE_ACCESS");
 
     if (l_facc_type == FACC_DEFAULT)
         return (ret_pl);
 
-    if (l_facc_type == FACC_MPIO){
+    if (l_facc_type == FACC_MPIO) {
         /* set Parallel access with communicator */
         ret = H5Pset_fapl_mpio(ret_pl, comm, info);
         VRFY((ret >= 0), "");
@@ -274,36 +274,36 @@ create_faccess_plist(MPI_Comm comm, MPI_Info info, int l_facc_type)
         VRFY((ret >= 0), "");
         ret = H5Pset_coll_metadata_write(ret_pl, TRUE);
         VRFY((ret >= 0), "");
-        return(ret_pl);
+        return (ret_pl);
     }
 
-    if (l_facc_type == (FACC_MPIO | FACC_SPLIT)){
+    if (l_facc_type == (FACC_MPIO | FACC_SPLIT)) {
         hid_t mpio_pl;
 
-        mpio_pl = H5Pcreate (H5P_FILE_ACCESS);
+        mpio_pl = H5Pcreate(H5P_FILE_ACCESS);
         VRFY((mpio_pl >= 0), "");
         /* set Parallel access with communicator */
         ret = H5Pset_fapl_mpio(mpio_pl, comm, info);
         VRFY((ret >= 0), "");
 
         /* setup file access template */
-        ret_pl = H5Pcreate (H5P_FILE_ACCESS);
+        ret_pl = H5Pcreate(H5P_FILE_ACCESS);
         VRFY((ret_pl >= 0), "");
         /* set Parallel access with communicator */
         ret = H5Pset_fapl_split(ret_pl, ".meta", mpio_pl, ".raw", mpio_pl);
         VRFY((ret >= 0), "H5Pset_fapl_split succeeded");
         H5Pclose(mpio_pl);
-        return(ret_pl);
+        return (ret_pl);
     }
 
     /* unknown file access types */
     return (ret_pl);
 }
 
-
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
-    int mpi_size, mpi_rank;                /* mpi variables */
+    int             mpi_size, mpi_rank; /* mpi variables */
     H5Ptest_param_t ndsets_params, ngroups_params;
     H5Ptest_param_t collngroups_params;
     H5Ptest_param_t io_mode_confusion_params;
@@ -319,21 +319,21 @@ int main(int argc, char **argv)
     MPI_Comm_size(MPI_COMM_WORLD, &mpi_size);
     MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank);
 
-    dim0 = ROW_FACTOR*mpi_size;
-    dim1 = COL_FACTOR*mpi_size;
+    dim0 = ROW_FACTOR * mpi_size;
+    dim1 = COL_FACTOR * mpi_size;
 
-    if (MAINPROCESS){
+    if (MAINPROCESS) {
         HDprintf("===================================\n");
         HDprintf("PHDF5 TESTS START\n");
         HDprintf("===================================\n");
     }
 
     /* Attempt to turn off atexit post processing so that in case errors
-    * happen during the test and the process is aborted, it will not get
-    * hang in the atexit post processing in which it may try to make MPI
-    * calls.  By then, MPI calls may not work.
-    */
-    if (H5dont_atexit() < 0){
+     * happen during the test and the process is aborted, it will not get
+     * hang in the atexit post processing in which it may try to make MPI
+     * calls.  By then, MPI calls may not work.
+     */
+    if (H5dont_atexit() < 0) {
         HDprintf("Failed to turn off atexit processing. Continue.\n");
     };
     H5open();
@@ -343,209 +343,149 @@ int main(int argc, char **argv)
     TestInit(argv[0], usage, parse_options);
 
     /* Tests are generally arranged from least to most complexity... */
-    AddTest("mpiodup", test_fapl_mpio_dup, NULL,
-            "fapl_mpio duplicate", NULL);
+    AddTest("mpiodup", test_fapl_mpio_dup, NULL, "fapl_mpio duplicate", NULL);
 
-    AddTest("split", test_split_comm_access, NULL,
-            "dataset using split communicators", PARATESTFILE);
+    AddTest("split", test_split_comm_access, NULL, "dataset using split communicators", PARATESTFILE);
 
 #ifdef PB_OUT /* temporary: disable page buffering when parallel */
-    AddTest("page_buffer", test_page_buffer_access, NULL,
-            "page buffer usage in parallel", PARATESTFILE);
+    AddTest("page_buffer", test_page_buffer_access, NULL, "page buffer usage in parallel", PARATESTFILE);
 #endif
 
-    AddTest("props", test_file_properties, NULL,
-            "Coll Metadata file property settings", PARATESTFILE);
-
-    AddTest("idsetw", dataset_writeInd, NULL,
-            "dataset independent write", PARATESTFILE);
-    AddTest("idsetr", dataset_readInd, NULL,
-            "dataset independent read", PARATESTFILE);
-
-    AddTest("cdsetw", dataset_writeAll, NULL,
-            "dataset collective write", PARATESTFILE);
-    AddTest("cdsetr", dataset_readAll, NULL,
-            "dataset collective read", PARATESTFILE);
-
-    AddTest("eidsetw", extend_writeInd, NULL,
-            "extendible dataset independent write", PARATESTFILE);
-    AddTest("eidsetr", extend_readInd, NULL,
-            "extendible dataset independent read", PARATESTFILE);
-    AddTest("ecdsetw", extend_writeAll, NULL,
-            "extendible dataset collective write", PARATESTFILE);
-    AddTest("ecdsetr", extend_readAll, NULL,
-            "extendible dataset collective read", PARATESTFILE);
-    AddTest("eidsetw2", extend_writeInd2, NULL,
-            "extendible dataset independent write #2", PARATESTFILE);
-    AddTest("selnone", none_selection_chunk, NULL,
-            "chunked dataset with none-selection", PARATESTFILE);
-    AddTest("calloc", test_chunk_alloc, NULL,
-            "parallel extend Chunked allocation on serial file", PARATESTFILE);
-    AddTest("fltread", test_filter_read, NULL,
-            "parallel read of dataset written serially with filters", PARATESTFILE);
+    AddTest("props", test_file_properties, NULL, "Coll Metadata file property settings", PARATESTFILE);
+
+    AddTest("idsetw", dataset_writeInd, NULL, "dataset independent write", PARATESTFILE);
+    AddTest("idsetr", dataset_readInd, NULL, "dataset independent read", PARATESTFILE);
+
+    AddTest("cdsetw", dataset_writeAll, NULL, "dataset collective write", PARATESTFILE);
+    AddTest("cdsetr", dataset_readAll, NULL, "dataset collective read", PARATESTFILE);
+
+    AddTest("eidsetw", extend_writeInd, NULL, "extendible dataset independent write", PARATESTFILE);
+    AddTest("eidsetr", extend_readInd, NULL, "extendible dataset independent read", PARATESTFILE);
+    AddTest("ecdsetw", extend_writeAll, NULL, "extendible dataset collective write", PARATESTFILE);
+    AddTest("ecdsetr", extend_readAll, NULL, "extendible dataset collective read", PARATESTFILE);
+    AddTest("eidsetw2", extend_writeInd2, NULL, "extendible dataset independent write #2", PARATESTFILE);
+    AddTest("selnone", none_selection_chunk, NULL, "chunked dataset with none-selection", PARATESTFILE);
+    AddTest("calloc", test_chunk_alloc, NULL, "parallel extend Chunked allocation on serial file",
+            PARATESTFILE);
+    AddTest("fltread", test_filter_read, NULL, "parallel read of dataset written serially with filters",
+            PARATESTFILE);
 
 #ifdef H5_HAVE_FILTER_DEFLATE
-    AddTest("cmpdsetr", compress_readAll, NULL,
-            "compressed dataset collective read", PARATESTFILE);
+    AddTest("cmpdsetr", compress_readAll, NULL, "compressed dataset collective read", PARATESTFILE);
 #endif /* H5_HAVE_FILTER_DEFLATE */
 
-    AddTest("zerodsetr", zero_dim_dset, NULL,
-            "zero dim dset", PARATESTFILE);
+    AddTest("zerodsetr", zero_dim_dset, NULL, "zero dim dset", PARATESTFILE);
 
-    ndsets_params.name = PARATESTFILE;
+    ndsets_params.name  = PARATESTFILE;
     ndsets_params.count = ndatasets;
-    AddTest("ndsetw", multiple_dset_write, NULL,
-            "multiple datasets write", &ndsets_params);
+    AddTest("ndsetw", multiple_dset_write, NULL, "multiple datasets write", &ndsets_params);
 
-    ngroups_params.name = PARATESTFILE;
+    ngroups_params.name  = PARATESTFILE;
     ngroups_params.count = ngroups;
-    AddTest("ngrpw", multiple_group_write, NULL,
-            "multiple groups write", &ngroups_params);
-    AddTest("ngrpr", multiple_group_read, NULL,
-            "multiple groups read", &ngroups_params);
+    AddTest("ngrpw", multiple_group_write, NULL, "multiple groups write", &ngroups_params);
+    AddTest("ngrpr", multiple_group_read, NULL, "multiple groups read", &ngroups_params);
 
-    AddTest("compact", compact_dataset, NULL,
-            "compact dataset test", PARATESTFILE);
+    AddTest("compact", compact_dataset, NULL, "compact dataset test", PARATESTFILE);
 
-    collngroups_params.name = PARATESTFILE;
+    collngroups_params.name  = PARATESTFILE;
     collngroups_params.count = ngroups;
     /* combined cngrpw and ingrpr tests because ingrpr reads file created by cngrpw. */
     AddTest("cngrpw-ingrpr", collective_group_write_independent_group_read, NULL,
-            "collective grp/dset write - independent grp/dset read",
-            &collngroups_params);
+            "collective grp/dset write - independent grp/dset read", &collngroups_params);
 #ifndef H5_HAVE_WIN32_API
-    AddTest("bigdset", big_dataset, NULL,
-            "big dataset test", PARATESTFILE);
+    AddTest("bigdset", big_dataset, NULL, "big dataset test", PARATESTFILE);
 #else
     HDprintf("big dataset test will be skipped on Windows (JIRA HDDFV-8064)\n");
 #endif
-    AddTest("fill", dataset_fillvalue, NULL,
-            "dataset fill value", PARATESTFILE);
-
-    AddTest("cchunk1",
-            coll_chunk1,NULL, "simple collective chunk io",PARATESTFILE);
-    AddTest("cchunk2",
-            coll_chunk2,NULL, "noncontiguous collective chunk io",PARATESTFILE);
-    AddTest("cchunk3",
-            coll_chunk3,NULL, "multi-chunk collective chunk io",PARATESTFILE);
-    AddTest("cchunk4",
-            coll_chunk4,NULL, "collective chunk io with partial non-selection ",PARATESTFILE);
-
-    if((mpi_size < 3)&& MAINPROCESS ) {
+    AddTest("fill", dataset_fillvalue, NULL, "dataset fill value", PARATESTFILE);
+
+    AddTest("cchunk1", coll_chunk1, NULL, "simple collective chunk io", PARATESTFILE);
+    AddTest("cchunk2", coll_chunk2, NULL, "noncontiguous collective chunk io", PARATESTFILE);
+    AddTest("cchunk3", coll_chunk3, NULL, "multi-chunk collective chunk io", PARATESTFILE);
+    AddTest("cchunk4", coll_chunk4, NULL, "collective chunk io with partial non-selection ", PARATESTFILE);
+
+    if ((mpi_size < 3) && MAINPROCESS) {
         HDprintf("Collective chunk IO optimization APIs ");
         HDprintf("needs at least 3 processes to participate\n");
         HDprintf("Collective chunk IO API tests will be skipped \n");
     }
-    AddTest((mpi_size <3)? "-cchunk5":"cchunk5" ,
-            coll_chunk5,NULL,
-            "linked chunk collective IO without optimization",PARATESTFILE);
-    AddTest((mpi_size < 3)? "-cchunk6" : "cchunk6",
-            coll_chunk6,NULL,
-            "multi-chunk collective IO with direct request",PARATESTFILE);
-    AddTest((mpi_size < 3)? "-cchunk7" : "cchunk7",
-            coll_chunk7,NULL,
-            "linked chunk collective IO with optimization",PARATESTFILE);
-    AddTest((mpi_size < 3)? "-cchunk8" : "cchunk8",
-            coll_chunk8,NULL,
-            "linked chunk collective IO transferring to multi-chunk",PARATESTFILE);
-    AddTest((mpi_size < 3)? "-cchunk9" : "cchunk9",
-            coll_chunk9,NULL,
-            "multiple chunk collective IO with optimization",PARATESTFILE);
-    AddTest((mpi_size < 3)? "-cchunk10" : "cchunk10",
-            coll_chunk10,NULL,
-            "multiple chunk collective IO transferring to independent IO",PARATESTFILE);
-
-
+    AddTest((mpi_size < 3) ? "-cchunk5" : "cchunk5", coll_chunk5, NULL,
+            "linked chunk collective IO without optimization", PARATESTFILE);
+    AddTest((mpi_size < 3) ? "-cchunk6" : "cchunk6", coll_chunk6, NULL,
+            "multi-chunk collective IO with direct request", PARATESTFILE);
+    AddTest((mpi_size < 3) ? "-cchunk7" : "cchunk7", coll_chunk7, NULL,
+            "linked chunk collective IO with optimization", PARATESTFILE);
+    AddTest((mpi_size < 3) ? "-cchunk8" : "cchunk8", coll_chunk8, NULL,
+            "linked chunk collective IO transferring to multi-chunk", PARATESTFILE);
+    AddTest((mpi_size < 3) ? "-cchunk9" : "cchunk9", coll_chunk9, NULL,
+            "multiple chunk collective IO with optimization", PARATESTFILE);
+    AddTest((mpi_size < 3) ? "-cchunk10" : "cchunk10", coll_chunk10, NULL,
+            "multiple chunk collective IO transferring to independent IO", PARATESTFILE);
 
     /* irregular collective IO tests*/
-    AddTest("ccontw",
-            coll_irregular_cont_write,NULL,
-            "collective irregular contiguous write",PARATESTFILE);
-    AddTest("ccontr",
-            coll_irregular_cont_read,NULL,
-            "collective irregular contiguous read",PARATESTFILE);
-    AddTest("cschunkw",
-            coll_irregular_simple_chunk_write,NULL,
-            "collective irregular simple chunk write",PARATESTFILE);
-    AddTest("cschunkr",
-            coll_irregular_simple_chunk_read,NULL,
-            "collective irregular simple chunk read",PARATESTFILE);
-    AddTest("ccchunkw",
-            coll_irregular_complex_chunk_write,NULL,
-            "collective irregular complex chunk write",PARATESTFILE);
-    AddTest("ccchunkr",
-            coll_irregular_complex_chunk_read,NULL,
-            "collective irregular complex chunk read",PARATESTFILE);
-
-    AddTest("null", null_dataset, NULL,
-            "null dataset test", PARATESTFILE);
+    AddTest("ccontw", coll_irregular_cont_write, NULL, "collective irregular contiguous write", PARATESTFILE);
+    AddTest("ccontr", coll_irregular_cont_read, NULL, "collective irregular contiguous read", PARATESTFILE);
+    AddTest("cschunkw", coll_irregular_simple_chunk_write, NULL, "collective irregular simple chunk write",
+            PARATESTFILE);
+    AddTest("cschunkr", coll_irregular_simple_chunk_read, NULL, "collective irregular simple chunk read",
+            PARATESTFILE);
+    AddTest("ccchunkw", coll_irregular_complex_chunk_write, NULL, "collective irregular complex chunk write",
+            PARATESTFILE);
+    AddTest("ccchunkr", coll_irregular_complex_chunk_read, NULL, "collective irregular complex chunk read",
+            PARATESTFILE);
+
+    AddTest("null", null_dataset, NULL, "null dataset test", PARATESTFILE);
 
     io_mode_confusion_params.name  = PARATESTFILE;
     io_mode_confusion_params.count = 0; /* value not used */
 
-    AddTest("I/Omodeconf", io_mode_confusion, NULL,
-            "I/O mode confusion test -- hangs quickly on failure",
+    AddTest("I/Omodeconf", io_mode_confusion, NULL, "I/O mode confusion test -- hangs quickly on failure",
             &io_mode_confusion_params);
 
-    if((mpi_size < 3) && MAINPROCESS) {
+    if ((mpi_size < 3) && MAINPROCESS) {
         HDprintf("rr_obj_hdr_flush_confusion test needs at least 3 processes.\n");
         HDprintf("rr_obj_hdr_flush_confusion test will be skipped \n");
     }
-    if(mpi_size > 2) {
-        rr_obj_flush_confusion_params.name = PARATESTFILE;
+    if (mpi_size > 2) {
+        rr_obj_flush_confusion_params.name  = PARATESTFILE;
         rr_obj_flush_confusion_params.count = 0; /* value not used */
         AddTest("rrobjflushconf", rr_obj_hdr_flush_confusion, NULL,
-                "round robin object header flush confusion test",
-                &rr_obj_flush_confusion_params);
+                "round robin object header flush confusion test", &rr_obj_flush_confusion_params);
     }
 
-    AddTest("alnbg1",
-            chunk_align_bug_1, NULL,
-            "Chunk allocation with alignment bug.",
-            PARATESTFILE);
+    AddTest("alnbg1", chunk_align_bug_1, NULL, "Chunk allocation with alignment bug.", PARATESTFILE);
 
-    AddTest("tldsc",
-            lower_dim_size_comp_test, NULL,
-            "test lower dim size comp in span tree to mpi derived type",
-            PARATESTFILE);
+    AddTest("tldsc", lower_dim_size_comp_test, NULL,
+            "test lower dim size comp in span tree to mpi derived type", PARATESTFILE);
 
-    AddTest("lccio",
-            link_chunk_collective_io_test, NULL,
-            "test mpi derived type management",
-            PARATESTFILE);
+    AddTest("lccio", link_chunk_collective_io_test, NULL, "test mpi derived type management", PARATESTFILE);
 
-    AddTest("actualio", actual_io_mode_tests, NULL,
-            "test actual io mode proprerty",
-            PARATESTFILE);
+    AddTest("actualio", actual_io_mode_tests, NULL, "test actual io mode proprerty", PARATESTFILE);
 
-    AddTest("nocolcause", no_collective_cause_tests, NULL,
-            "test cause for broken collective io",
+    AddTest("nocolcause", no_collective_cause_tests, NULL, "test cause for broken collective io",
             PARATESTFILE);
 
-    AddTest("edpl", test_plist_ed, NULL,
-            "encode/decode Property Lists", NULL);
+    AddTest("edpl", test_plist_ed, NULL, "encode/decode Property Lists", NULL);
 
-    if((mpi_size < 2) && MAINPROCESS) {
+    if ((mpi_size < 2) && MAINPROCESS) {
         HDprintf("File Image Ops daisy chain test needs at least 2 processes.\n");
         HDprintf("File Image Ops daisy chain test will be skipped \n");
     }
-    AddTest((mpi_size < 2)? "-fiodc" : "fiodc", file_image_daisy_chain_test, NULL,
+    AddTest((mpi_size < 2) ? "-fiodc" : "fiodc", file_image_daisy_chain_test, NULL,
             "file image ops daisy chain", NULL);
 
-    if((mpi_size < 2)&& MAINPROCESS ) {
+    if ((mpi_size < 2) && MAINPROCESS) {
         HDprintf("Atomicity tests need at least 2 processes to participate\n");
         HDprintf("8 is more recommended.. Atomicity tests will be skipped \n");
     }
     else if (facc_type != FACC_MPIO && MAINPROCESS) {
         HDprintf("Atomicity tests will not work with a non MPIO VFD\n");
     }
-    else if(mpi_size >= 2 && facc_type == FACC_MPIO){
-        AddTest("atomicity", dataset_atomicity, NULL,
-                "dataset atomic updates", PARATESTFILE);
+    else if (mpi_size >= 2 && facc_type == FACC_MPIO) {
+        AddTest("atomicity", dataset_atomicity, NULL, "dataset atomic updates", PARATESTFILE);
     }
 
-    AddTest("denseattr", test_dense_attr, NULL,
-            "Store Dense Attributes", PARATESTFILE);
+    AddTest("denseattr", test_dense_attr, NULL, "Store Dense Attributes", PARATESTFILE);
 
     AddTest("noselcollmdread", test_partial_no_selection_coll_md_read, NULL,
             "Collective Metadata read with some ranks having no selection", PARATESTFILE);
@@ -558,25 +498,24 @@ int main(int argc, char **argv)
     TestInfo(argv[0]);
 
     /* setup file access property list */
-    fapl = H5Pcreate (H5P_FILE_ACCESS);
+    fapl = H5Pcreate(H5P_FILE_ACCESS);
     H5Pset_fapl_mpio(fapl, MPI_COMM_WORLD, MPI_INFO_NULL);
 
     /* Parse command line arguments */
     TestParseCmdLine(argc, argv);
 
-    if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS){
+    if (dxfer_coll_type == DXFER_INDEPENDENT_IO && MAINPROCESS) {
         HDprintf("===================================\n"
-                "   Using Independent I/O with file set view to replace collective I/O \n"
-                "===================================\n");
+                 "   Using Independent I/O with file set view to replace collective I/O \n"
+                 "===================================\n");
     }
 
-
     /* Perform requested testing */
     PerformTests();
 
     /* make sure all processes are finished before final report, cleanup
-    * and exit.
-    */
+     * and exit.
+     */
     MPI_Barrier(MPI_COMM_WORLD);
 
     /* Display test summary, if requested */
@@ -592,10 +531,10 @@ int main(int argc, char **argv)
     {
         int temp;
         MPI_Allreduce(&nerrors, &temp, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
-        nerrors=temp;
+        nerrors = temp;
     }
 
-    if (MAINPROCESS){        /* only process 0 reports */
+    if (MAINPROCESS) { /* only process 0 reports */
         HDprintf("===================================\n");
         if (nerrors)
             HDprintf("***PHDF5 tests detected %d errors***\n", nerrors);
@@ -614,6 +553,5 @@ int main(int argc, char **argv)
     MPI_Finalize();
 
     /* cannot just return (nerrors) because exit code is limited to 1byte */
-    return(nerrors!=0);
+    return (nerrors != 0);
 }
-