Source formatted

1 files changed, 489 insertions, 444 deletions

diff --git a/test/external.c b/test/external.c
index f66804e..376204a 100644
--- a/test/external.c
+++ b/test/external.c
@@ -23,7 +23,6 @@
 #define AEF_EXNAME_MAX_LEN 12 /* string buffer size for external file name */
                               /* used in __add_external_files()            */
 
-
 /*-------------------------------------------------------------------------
  * Function:    files_have_same_contents
  *
@@ -42,11 +41,11 @@ files_have_same_contents(const char *name1, const char *name2)
 {
     int     fd1 = 0;
     int     fd2 = 0;
-    ssize_t n1 = 0;
-    ssize_t n2 = 0;
+    ssize_t n1  = 0;
+    ssize_t n2  = 0;
     char    buf1[1024];
     char    buf2[1024];
-    hbool_t ret = FALSE;            /* not equal until proven otherwise */
+    hbool_t ret = FALSE; /* not equal until proven otherwise */
 
     if ((fd1 = HDopen(name1, O_RDONLY)) < 0)
         goto out;
@@ -54,39 +53,38 @@ files_have_same_contents(const char *name1, const char *name2)
         goto out;
 
     /* Loop until files are empty or we encounter a problem */
-    while(1) {
+    while (1) {
         HDmemset(buf1, 0, sizeof(buf1));
         HDmemset(buf2, 0, sizeof(buf2));
 
         n1 = HDread(fd1, buf1, sizeof(buf1));
-        if(n1 < 0 || (size_t)n1 > sizeof(buf1))
+        if (n1 < 0 || (size_t)n1 > sizeof(buf1))
             break;
         n2 = HDread(fd2, buf2, sizeof(buf2));
-        if(n2 < 0 || (size_t)n2 > sizeof(buf2))
+        if (n2 < 0 || (size_t)n2 > sizeof(buf2))
             break;
 
-        if(n1 != n2)
+        if (n1 != n2)
             break;
 
-        if(n1 == 0 && n2 == 0) {
+        if (n1 == 0 && n2 == 0) {
             ret = TRUE;
             break;
         }
 
-        if(HDmemcmp(buf1, buf2, (size_t)n1))
+        if (HDmemcmp(buf1, buf2, (size_t)n1))
             break;
 
     } /* end while */
 
 out:
-    if(fd1)
+    if (fd1)
         HDclose(fd1);
-    if(fd2)
+    if (fd2)
         HDclose(fd2);
     return ret;
 } /* end files_have_same_contents() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_non_extendible
  *
@@ -103,51 +101,50 @@ out:
 static int
 test_non_extendible(hid_t file)
 {
-    hid_t   dcpl = -1;               /* dataset creation properties          */
-    hid_t   space = -1;              /* data space                           */
-    hid_t   dset = -1;               /* dataset                              */
-    hsize_t cur_size[1] = {100};     /* data space current size              */
-    hsize_t max_size[1] = {100};     /* data space maximum size              */
-    int     n = 0;                   /* number of external files             */
-    off_t   file_offset = 0;         /* external file offset                 */
-    hsize_t file_size = 0;           /* sizeof external file segment         */
-    haddr_t dset_addr = HADDR_UNDEF; /* address of dataset                   */
+    hid_t   dcpl        = -1;          /* dataset creation properties          */
+    hid_t   space       = -1;          /* data space                           */
+    hid_t   dset        = -1;          /* dataset                              */
+    hsize_t cur_size[1] = {100};       /* data space current size              */
+    hsize_t max_size[1] = {100};       /* data space maximum size              */
+    int     n           = 0;           /* number of external files             */
+    off_t   file_offset = 0;           /* external file offset                 */
+    hsize_t file_size   = 0;           /* sizeof external file segment         */
+    haddr_t dset_addr   = HADDR_UNDEF; /* address of dataset                   */
 
     TESTING("fixed-size data space, exact storage");
 
     /* Create the dataset and close */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int))) < 0)
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int))) < 0)
         FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if(H5Dclose(dset) < 0)
+    if (H5Dclose(dset) < 0)
         FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0)
+    if (H5Sclose(space) < 0)
         FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR
 
     /* Read dataset creation information */
-    if((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0)
+    if ((dset = H5Dopen2(file, "dset1", H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Test dataset address.  Should be undefined. */
-    H5E_BEGIN_TRY {
-        dset_addr = H5Dget_offset(dset);
-    } H5E_END_TRY;
-    if(dset_addr != HADDR_UNDEF)
+    H5E_BEGIN_TRY { dset_addr = H5Dget_offset(dset); }
+    H5E_END_TRY;
+    if (dset_addr != HADDR_UNDEF)
         FAIL_STACK_ERROR
 
     /* Check external count */
-    if((dcpl = H5Dget_create_plist(dset)) < 0)
+    if ((dcpl = H5Dget_create_plist(dset)) < 0)
         FAIL_STACK_ERROR
-    if((n = H5Pget_external_count(dcpl)) < 0)
+    if ((n = H5Pget_external_count(dcpl)) < 0)
         FAIL_STACK_ERROR
-    if(1 != n) {
+    if (1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
         HDprintf("   got: %d\n    ans: 1\n", n);
@@ -155,37 +152,41 @@ test_non_extendible(hid_t file)
     }
 
     /* Verify external file settings */
-    if(H5Pget_external(dcpl, 0, 0, NULL, &file_offset, &file_size) < 0)
+    if (H5Pget_external(dcpl, 0, 0, NULL, &file_offset, &file_size) < 0)
         FAIL_STACK_ERROR
-    if(file_offset != 0) {
+    if (file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
         HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     }
-    if(file_size != (max_size[0] * sizeof(int))) {
+    if (file_size != (max_size[0] * sizeof(int))) {
         H5_FAILED();
         HDputs("    Wrong file size.");
-        HDprintf("    got: %lu\n    ans: %lu\n", (unsigned long)file_size, (unsigned long)max_size[0]*sizeof(int));
+        HDprintf("    got: %lu\n    ans: %lu\n", (unsigned long)file_size,
+                 (unsigned long)max_size[0] * sizeof(int));
         goto error;
     }
 
     /* Done (dataspace was previously closed) */
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dcpl);
         H5Sclose(space);
         H5Dclose(dset);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_non_extendible() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_too_small
  *
@@ -203,44 +204,45 @@ test_non_extendible(hid_t file)
 static int
 test_too_small(hid_t file)
 {
-    hid_t   dcpl = -1;              /* dataset creation properties          */
-    hid_t   space = -1;             /* data space                           */
-    hid_t   dset = -1;              /* dataset                              */
-    hsize_t cur_size[1] = {100};    /* current data space size              */
-    hsize_t max_size[1] = {100};    /* maximum data space size              */
+    hid_t   dcpl        = -1;    /* dataset creation properties          */
+    hid_t   space       = -1;    /* data space                           */
+    hid_t   dset        = -1;    /* dataset                              */
+    hsize_t cur_size[1] = {100}; /* current data space size              */
+    hsize_t max_size[1] = {100}; /* maximum data space size              */
 
     TESTING("external storage is too small");
 
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) - 1)) < 0) /* note -1 */
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) - 1)) <
+        0) /* note -1 */
         FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
 
-    H5E_BEGIN_TRY {
-        dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(dset >= 0)
+    H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+    H5E_END_TRY;
+    if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external file succeeded instead of failing.");
-    if(H5Sclose(space) < 0)
+    if (H5Sclose(space) < 0)
         FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0)
+    if (H5Pclose(dcpl) < 0)
         FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Sclose(space);
         H5Pclose(dcpl);
         H5Dclose(dset);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_too_small() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_large_enough_current_eventual
  *
@@ -259,40 +261,44 @@ test_too_small(hid_t file)
 static int
 test_large_enough_current_eventual(hid_t file)
 {
-    hid_t   dcpl = -1;              /* dataset creation properties          */
-    hid_t   space = -1;             /* data space                           */
-    hid_t   dset = -1;              /* dataset                              */
-    hsize_t cur_size[1] = {100};    /* current data space size              */
-    hsize_t max_size[1] = {200};    /* maximum data space size              */
+    hid_t   dcpl        = -1;    /* dataset creation properties          */
+    hid_t   space       = -1;    /* data space                           */
+    hid_t   dset        = -1;    /* dataset                              */
+    hsize_t cur_size[1] = {100}; /* current data space size              */
+    hsize_t max_size[1] = {200}; /* maximum data space size              */
 
     TESTING("extendible dataspace, exact external size");
 
-    if((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int))) < 0)
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int))) < 0)
         FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dcreate2(file, "dset3", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset3", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_large_enough_current_eventual() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_large_enough_current_not_eventual
  *
@@ -310,43 +316,46 @@ error:
 static int
 test_large_enough_current_not_eventual(hid_t file)
 {
-    hid_t   dcpl = -1;              /* dataset creation properties          */
-    hid_t   space = -1;             /* data space                           */
-    hid_t   dset = -1;              /* dataset                              */
-    hsize_t cur_size[1] = {100};    /* current data space size              */
-    hsize_t max_size[1] = {200};    /* maximum data space size              */
+    hid_t   dcpl        = -1;    /* dataset creation properties          */
+    hid_t   space       = -1;    /* data space                           */
+    hid_t   dset        = -1;    /* dataset                              */
+    hsize_t cur_size[1] = {100}; /* current data space size              */
+    hsize_t max_size[1] = {200}; /* maximum data space size              */
 
     TESTING("extendible dataspace, external storage is too small");
 
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) - 1)) < 0) /* note -1 */
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, (hsize_t)(max_size[0] * sizeof(int) - 1)) <
+        0) /* note -1 */
         FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
 
-    H5E_BEGIN_TRY {
-        dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(dset >= 0)
+    H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+    H5E_END_TRY;
+    if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external file succeeded instead of failing.");
 
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_large_enough_current_not_eventual() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_unlimited
  *
@@ -364,76 +373,82 @@ test_large_enough_current_not_eventual(hid_t file)
 static int
 test_unlimited(hid_t file)
 {
-    hid_t   dcpl = -1;                      /* dataset creation properties   */
-    hid_t   space = -1;                     /* data space                    */
-    hid_t   dset = -1;                      /* dataset                       */
-    hsize_t cur_size[1] = {100};            /* data space current size       */
-    hsize_t max_size[1] = {H5S_UNLIMITED};  /* data space maximum size       */
-    int     n;                              /* number of external files      */
-    off_t   file_offset;                    /* external file offset          */
-    hsize_t file_size;                      /* sizeof external file segment  */
+    hid_t   dcpl        = -1;              /* dataset creation properties   */
+    hid_t   space       = -1;              /* data space                    */
+    hid_t   dset        = -1;              /* dataset                       */
+    hsize_t cur_size[1] = {100};           /* data space current size       */
+    hsize_t max_size[1] = {H5S_UNLIMITED}; /* data space maximum size       */
+    int     n;                             /* number of external files      */
+    off_t   file_offset;                   /* external file offset          */
+    hsize_t file_size;                     /* sizeof external file segment  */
 
     TESTING("unlimited dataspace, unlimited external storage");
 
     /* Create dataset */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED) < 0)
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED) < 0)
         FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dcreate2(file, "dset5", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset5", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
 
     /* Read dataset creation information */
-    if((dset = H5Dopen2(file, "dset5", H5P_DEFAULT)) < 0)
+    if ((dset = H5Dopen2(file, "dset5", H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    if((dcpl = H5Dget_create_plist(dset)) < 0)
+    if ((dcpl = H5Dget_create_plist(dset)) < 0)
         FAIL_STACK_ERROR
-    if((n = H5Pget_external_count(dcpl)) < 0)
+    if ((n = H5Pget_external_count(dcpl)) < 0)
         FAIL_STACK_ERROR
-    if(1 != n) {
+    if (1 != n) {
         H5_FAILED();
         HDputs("    Returned external count is wrong.");
         HDprintf("    got: %d\n    ans: 1\n", n);
         goto error;
     } /* end if */
 
-    if(H5Pget_external(dcpl, 0, 0, NULL, &file_offset, &file_size) < 0)
+    if (H5Pget_external(dcpl, 0, 0, NULL, &file_offset, &file_size) < 0)
         FAIL_STACK_ERROR
-    if(file_offset != 0) {
+    if (file_offset != 0) {
         H5_FAILED();
         HDputs("    Wrong file offset.");
         HDprintf("    got: %lu\n    ans: 0\n", (unsigned long)file_offset);
         goto error;
     }
-    if(H5F_UNLIMITED != file_size) {
+    if (H5F_UNLIMITED != file_size) {
         H5_FAILED();
         HDputs("    Wrong file size.");
         HDprintf("    got: %lu\n    ans: INF\n", (unsigned long)file_size);
         goto error;
     }
 
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_unlimited() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    __add_external_files
  *
@@ -450,27 +465,17 @@ test_unlimited(hid_t file)
  *-------------------------------------------------------------------------
  */
 static int
-__add_external_files(
-        hid_t        dcpl_id,
-        unsigned int n_external_files,
-        off_t        offset,
-        hsize_t      max_ext_size)
+__add_external_files(hid_t dcpl_id, unsigned int n_external_files, off_t offset, hsize_t max_ext_size)
 {
-    char exname[AEF_EXNAME_MAX_LEN+1];
+    char         exname[AEF_EXNAME_MAX_LEN + 1];
     unsigned int i = 0;
 
     if (dcpl_id < 0) {
         return -1;
     }
     for (i = 0; i < n_external_files; i++) {
-        if (HDsnprintf(
-                exname,
-                AEF_EXNAME_MAX_LEN,
-                "ext%d.data",
-                i+1)
-            > AEF_EXNAME_MAX_LEN)
-        {
-            HDfprintf(stderr, "External file %d overflows name buffer\n", i+1);
+        if (HDsnprintf(exname, AEF_EXNAME_MAX_LEN, "ext%d.data", i + 1) > AEF_EXNAME_MAX_LEN) {
+            HDfprintf(stderr, "External file %d overflows name buffer\n", i + 1);
             fflush(stderr);
             return -1;
         }
@@ -483,7 +488,6 @@ __add_external_files(
     return 0;
 } /* end __add_external_files() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_multiple_files
  *
@@ -500,9 +504,9 @@ __add_external_files(
 static int
 test_multiple_files(hid_t file)
 {
-    hid_t        dcpl = -1;           /* dataset creation properties         */
-    hid_t        space = -1;          /* dataspace                           */
-    hid_t        dset = -1;           /* dataset                             */
+    hid_t        dcpl        = -1;    /* dataset creation properties         */
+    hid_t        space       = -1;    /* dataspace                           */
+    hid_t        dset        = -1;    /* dataset                             */
     hsize_t      cur_size[1] = {100}; /* data space current size             */
     hsize_t      max_size[1] = {100}; /* data space maximum size             */
     hsize_t      max_ext_size;        /* maximum size of external files      */
@@ -510,7 +514,7 @@ test_multiple_files(hid_t file)
 
     TESTING("multiple external files");
 
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
 
     max_ext_size = (hsize_t)(sizeof(int) * max_size[0] / n_external_files);
@@ -519,20 +523,22 @@ test_multiple_files(hid_t file)
         FAIL_STACK_ERROR;
     }
 
-    if((space = H5Screate_simple(1, cur_size, max_size)) < 0)
+    if ((space = H5Screate_simple(1, cur_size, max_size)) < 0)
         FAIL_STACK_ERROR
 
-    if((dset = H5Dcreate2(file, "dset6", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset6", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
     /* Re-use space below */
 
     /* ----------------------------------------------
      * Verify that too-small external files will fail
      */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
 
     max_ext_size -= 1;
@@ -541,28 +547,30 @@ test_multiple_files(hid_t file)
         FAIL_STACK_ERROR;
     }
 
-    H5E_BEGIN_TRY {
-        dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(dset >= 0)
+    H5E_BEGIN_TRY { dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT); }
+    H5E_END_TRY;
+    if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external files succeeded instead of failing.");
 
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_multiple_files() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_add_to_unlimited
  *
@@ -580,40 +588,38 @@ error:
 static int
 test_add_to_unlimited(void)
 {
-    hid_t  dcpl = -1;          /* dataset creation properties          */
-    herr_t status = FAIL;      /* function return status               */
-    int    n = 0;              /* number of external files             */
+    hid_t  dcpl   = -1;   /* dataset creation properties          */
+    herr_t status = FAIL; /* function return status               */
+    int    n      = 0;    /* number of external files             */
 
     TESTING("external file following unlimited file");
 
-    if((dcpl = H5Pcreate (H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED) < 0)
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED) < 0)
         FAIL_STACK_ERROR
 
-    H5E_BEGIN_TRY {
-        status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
-    } H5E_END_TRY;
-    if(status >= 0)
+    H5E_BEGIN_TRY { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); }
+    H5E_END_TRY;
+    if (status >= 0)
         FAIL_PUTS_ERROR("    H5Pset_external() succeeded when it should have failed.");
 
-    if((n = H5Pget_external_count(dcpl)) < 0)
+    if ((n = H5Pget_external_count(dcpl)) < 0)
         FAIL_STACK_ERROR
-    if(1 != n)
+    if (1 != n)
         FAIL_PUTS_ERROR("    Wrong external file count returned.");
 
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
-        H5Pclose(dcpl);
-    } H5E_END_TRY;
+error:
+    H5E_BEGIN_TRY { H5Pclose(dcpl); }
+    H5E_END_TRY;
     return 1;
 } /* end test_add_to_unlimited() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_overflow
  *
@@ -631,35 +637,33 @@ test_add_to_unlimited(void)
 static int
 test_overflow(void)
 {
-    hid_t  dcpl = -1;          /* dataset creation properties          */
-    herr_t status = FAIL;      /* return status                        */
+    hid_t  dcpl   = -1;   /* dataset creation properties          */
+    herr_t status = FAIL; /* return status                        */
 
     TESTING("address overflow in external files");
 
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED-1) < 0)
+    if (H5Pset_external(dcpl, "ext1.data", (off_t)0, H5F_UNLIMITED - 1) < 0)
         FAIL_STACK_ERROR
 
-    H5E_BEGIN_TRY {
-        status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
-    } H5E_END_TRY;
-    if(status >= 0)
+    H5E_BEGIN_TRY { status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100); }
+    H5E_END_TRY;
+    if (status >= 0)
         FAIL_PUTS_ERROR("    H5Pset_external() succeeded when it should have failed.");
 
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
-        H5Pclose(dcpl);
-    } H5E_END_TRY;
+error:
+    H5E_BEGIN_TRY { H5Pclose(dcpl); }
+    H5E_END_TRY;
     return 1;
 } /* end test_overflow() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_read_file_set
  *
@@ -676,27 +680,27 @@ test_overflow(void)
 static int
 test_read_file_set(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to write to                     */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    hid_t   grp = -1;           /* group to emit diagnostics            */
-    size_t  i = 0;              /* miscellaneous counter                */
-    char    filename[1024];     /* file names                           */
-    int     part[PART_SIZE];    /* raw data buffer (partial)            */
-    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t cur_size;           /* current data space size              */
-    hid_t   hs_space = -1;      /* hyperslab data space                 */
-    hsize_t hs_start = 30;      /* hyperslab starting offset            */
-    hsize_t hs_count = 25;      /* hyperslab size                       */
+    hid_t   file  = -1;        /* file to write to                     */
+    hid_t   dcpl  = -1;        /* dataset creation properties          */
+    hid_t   space = -1;        /* data space                           */
+    hid_t   dset  = -1;        /* dataset                              */
+    hid_t   grp   = -1;        /* group to emit diagnostics            */
+    size_t  i     = 0;         /* miscellaneous counter                */
+    char    filename[1024];    /* file names                           */
+    int     part[PART_SIZE];   /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE]; /* raw data buffer (total)              */
+    hsize_t cur_size;          /* current data space size              */
+    hid_t   hs_space = -1;     /* hyperslab data space                 */
+    hsize_t hs_start = 30;     /* hyperslab starting offset            */
+    hsize_t hs_count = 25;     /* hyperslab size                       */
 
     TESTING("read external dataset");
 
-    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+    if (HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
         TEST_ERROR
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the file and an initial group.  This causes messages about
@@ -704,80 +708,87 @@ test_read_file_set(hid_t fapl)
      * output looks like.
      */
     h5_fixname(EXT_FNAME[1], fapl, filename, sizeof(filename));
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
-    if((grp = H5Gcreate2(file, "emit-diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((grp = H5Gcreate2(file, "emit-diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
         FAIL_STACK_ERROR
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
 
     /* Create the dcpl */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < N_EXT_FILES; i++) {
-        HDsnprintf(filename, sizeof(filename), "extern_%dr.raw", (int) i + 1);
-        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+    for (i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "extern_%dr.raw", (int)i + 1);
+        if (H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
             FAIL_STACK_ERROR
     }
 
     /* Create the dataspace */
     cur_size = TOTAL_SIZE;
-    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+    if ((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
         FAIL_STACK_ERROR
 
     /* Create the dataset */
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Read the entire dataset */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
 
     /* Compare data */
-    for(i = 0; i < TOTAL_SIZE; i++)
-        if(whole[i] != (signed)i)
+    for (i = 0; i < TOTAL_SIZE; i++)
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
     /* Read via a hypserslab in the middle of the dataset */
 
     /* Set up dataspace */
-    if((hs_space = H5Scopy(space)) < 0)
+    if ((hs_space = H5Scopy(space)) < 0)
         FAIL_STACK_ERROR
-    if(H5Sselect_hyperslab(hs_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
+    if (H5Sselect_hyperslab(hs_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
         FAIL_STACK_ERROR
 
     /* Read */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, hs_space, hs_space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
 
     /* Verify data */
-    for(i = (size_t)hs_start; i < (size_t)(hs_start + hs_count); i++) {
-        if(whole[i] != (signed)i)
+    for (i = (size_t)hs_start; i < (size_t)(hs_start + hs_count); i++) {
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read (hyperslab).");
     } /* end for */
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(hs_space) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(hs_space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Gclose(grp);
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
         H5Sclose(hs_space);
         H5Fclose(file);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_read_file_set() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_write_file_set
  *
@@ -794,112 +805,117 @@ test_read_file_set(hid_t fapl)
 static int
 test_write_file_set(hid_t fapl)
 {
-    hid_t    file = -1;          /* file to which to write               */
-    hid_t    dcpl = -1;          /* dataset creation properties          */
-    hid_t    mem_space = -1;     /* memory data space                    */
-    hid_t    file_space = -1;    /* file data space                      */
-    hid_t    dset = -1;          /* dataset                              */
-    unsigned i = 0;              /* miscellaneous counter                */
-    int      part[PART_SIZE];    /* raw data buffer (partial)            */
-    int      whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t  cur_size = 100;     /* current data space size              */
-    hsize_t  max_size = 200;     /* maximum data space size              */
-    hsize_t  hs_start = 100;     /* hyperslab starting offset            */
-    hsize_t  hs_count = 100;     /* hyperslab size                       */
-    char     filename[1024];     /* file name                            */
+    hid_t    file       = -1;   /* file to which to write               */
+    hid_t    dcpl       = -1;   /* dataset creation properties          */
+    hid_t    mem_space  = -1;   /* memory data space                    */
+    hid_t    file_space = -1;   /* file data space                      */
+    hid_t    dset       = -1;   /* dataset                              */
+    unsigned i          = 0;    /* miscellaneous counter                */
+    int      part[PART_SIZE];   /* raw data buffer (partial)            */
+    int      whole[TOTAL_SIZE]; /* raw data buffer (total)              */
+    hsize_t  cur_size = 100;    /* current data space size              */
+    hsize_t  max_size = 200;    /* maximum data space size              */
+    hsize_t  hs_start = 100;    /* hyperslab starting offset            */
+    hsize_t  hs_count = 100;    /* hyperslab size                       */
+    char     filename[1024];    /* file name                            */
 
     TESTING("write external dataset");
 
-    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+    if (HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
         TEST_ERROR
 
     /* Create another file */
     h5_fixname(EXT_FNAME[2], fapl, filename, sizeof(filename));
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Create the dcpl and external file list */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < N_EXT_FILES; i++) {
+    for (i = 0; i < N_EXT_FILES; i++) {
         hsize_t size;
 
-        HDsnprintf(filename, sizeof(filename), "extern_%dw.raw", (int) i + 1);
+        HDsnprintf(filename, sizeof(filename), "extern_%dw.raw", (int)i + 1);
 
-        if(i != N_EXT_FILES -1)
+        if (i != N_EXT_FILES - 1)
             size = (hsize_t)sizeof(part);
         else
             size = H5F_UNLIMITED;
 
-        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), size) < 0)
+        if (H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), size) < 0)
             FAIL_STACK_ERROR
     } /* end for */
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the dataset */
-    if((mem_space = H5Screate_simple(1, &cur_size, &max_size)) < 0)
+    if ((mem_space = H5Screate_simple(1, &cur_size, &max_size)) < 0)
         FAIL_STACK_ERROR
-    if((file_space = H5Scopy(mem_space)) < 0)
+    if ((file_space = H5Scopy(mem_space)) < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, file_space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, file_space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Write the entire dataset and compare with the original */
-    for(i = 0; i < cur_size; i++)
+    for (i = 0; i < cur_size; i++)
         whole[i] = (int)i;
-    if(H5Dwrite(dset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, whole) < 0)
+    if (H5Dwrite(dset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < N_EXT_FILES; i++) {
+    for (i = 0; i < N_EXT_FILES; i++) {
         char name1[64], name2[64];
 
         HDsprintf(name1, "extern_%dr.raw", i + 1);
         HDsprintf(name2, "extern_%dw.raw", i + 1);
-        if(!files_have_same_contents(name1, name2))
+        if (!files_have_same_contents(name1, name2))
             FAIL_PUTS_ERROR("   Output differs from expected value.")
     } /* end for */
 
     /* Extend the dataset by another 100 elements */
-    if(H5Dset_extent(dset, &max_size) < 0)
+    if (H5Dset_extent(dset, &max_size) < 0)
         FAIL_STACK_ERROR
-    if(H5Sclose(file_space) < 0)
+    if (H5Sclose(file_space) < 0)
         FAIL_STACK_ERROR
-    if((file_space = H5Dget_space(dset)) < 0)
+    if ((file_space = H5Dget_space(dset)) < 0)
         FAIL_STACK_ERROR
 
     /* Write second half of dataset */
-    for(i = 0; i < hs_count; i++)
+    for (i = 0; i < hs_count; i++)
         whole[i] = 100 + (int)i;
-    if(H5Sselect_hyperslab(file_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
+    if (H5Sselect_hyperslab(file_space, H5S_SELECT_SET, &hs_start, NULL, &hs_count, NULL) < 0)
         FAIL_STACK_ERROR
-    if(H5Dwrite(dset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, whole) < 0)
+    if (H5Dwrite(dset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
 
-
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(mem_space) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(file_space) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(mem_space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(file_space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
+error:
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(mem_space);
         H5Sclose(file_space);
         H5Fclose(file);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_write_file_set() */
 
- 
- /*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
  * Function:    test_path_absolute
  *
  * Purpose:     Test absolute filenames for external files.
@@ -919,78 +935,83 @@ test_write_file_set(hid_t fapl)
 static int
 test_path_absolute(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to write to                     */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    size_t  i = 0;              /* miscellaneous counter                */
-    char    cwdpath[1024];      /* working directory                    */
+    hid_t   file  = -1;        /* file to write to                     */
+    hid_t   dcpl  = -1;        /* dataset creation properties          */
+    hid_t   space = -1;        /* data space                           */
+    hid_t   dset  = -1;        /* dataset                              */
+    size_t  i     = 0;         /* miscellaneous counter                */
+    char    cwdpath[1024];     /* working directory                    */
     char    filename[1088];    /* file name                            */
-    int     part[PART_SIZE];    /* raw data buffer (partial)            */
-    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t cur_size;           /* current data space size              */
+    int     part[PART_SIZE];   /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE]; /* raw data buffer (total)              */
+    hsize_t cur_size;          /* current data space size              */
 
     TESTING("absolute filenames for external file");
 
     h5_fixname(EXT_FNAME[3], fapl, filename, sizeof(filename));
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the dcpl */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
+    if (NULL == HDgetcwd(cwdpath, sizeof(cwdpath)))
         TEST_ERROR
-    for(i = 0; i < N_EXT_FILES; i++) {
-        HDsnprintf(filename, sizeof(filename), "%s%sextern_%dr.raw", cwdpath, H5_DIR_SEPS, (int) i + 1);
+    for (i = 0; i < N_EXT_FILES; i++) {
+        HDsnprintf(filename, sizeof(filename), "%s%sextern_%dr.raw", cwdpath, H5_DIR_SEPS, (int)i + 1);
 #if defined(H5_HAVE_WINDOW_PATH)
         /* For windows, test path-absolute case (\dir\file.raw) for the second file */
-        if(i == 1)
+        if (i == 1)
             HDsnprintf(filename, sizeof(filename), "%s%sextern_%dr.raw", cwdpath + 2, H5_DIR_SEPS, i + 1);
 #endif
-        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+        if (H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
             FAIL_STACK_ERROR
     } /* end for */
 
     /* create the dataspace */
     cur_size = TOTAL_SIZE;
-    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+    if ((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
         FAIL_STACK_ERROR
 
     /* create the dataset */
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Read the entire dataset and compare with the original */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < TOTAL_SIZE; i++)
-        if(whole[i] != (signed)i)
+    for (i = 0; i < TOTAL_SIZE; i++)
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Sclose(space);
         H5Pclose(dcpl);
         H5Fclose(file);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_path_absolute() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_path_relative
  *
@@ -1009,73 +1030,78 @@ error:
 static int
 test_path_relative(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to write to                     */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dset = -1;          /* dataset                              */
-    size_t  i = 0;              /* miscellaneous counters               */
-    char    filename[1024];     /* file name                            */
-    int     part[PART_SIZE];    /* raw data buffer (partial)            */
-    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t cur_size;           /* current data space size              */
+    hid_t   file  = -1;        /* file to write to                     */
+    hid_t   dcpl  = -1;        /* dataset creation properties          */
+    hid_t   space = -1;        /* data space                           */
+    hid_t   dset  = -1;        /* dataset                              */
+    size_t  i     = 0;         /* miscellaneous counters               */
+    char    filename[1024];    /* file name                            */
+    int     part[PART_SIZE];   /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE]; /* raw data buffer (total)              */
+    hsize_t cur_size;          /* current data space size              */
 
     TESTING("filenames relative to current directory for external file");
 
-    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+    if (HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
         TEST_ERROR
 
     if (HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
         TEST_ERROR;
 
     h5_fixname(EXT_FNAME[4], fapl, filename, sizeof(filename));
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR;
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the dataset */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
     for (i = 0; i < N_EXT_FILES; i++) {
         HDsnprintf(filename, sizeof(filename), "extern_%dr.raw", (int)i + 1);
-        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+        if (H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
             FAIL_STACK_ERROR
     } /* end for */
 
     cur_size = TOTAL_SIZE;
-    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+    if ((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
 
     /* Read the entire dataset and compare with the original */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < TOTAL_SIZE; i++)
-        if(whole[i] != (signed)i)
+    for (i = 0; i < TOTAL_SIZE; i++)
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(dset);
         H5Pclose(dcpl);
         H5Sclose(space);
         H5Fclose(file);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_path_relative() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_path_relative_cwd
  *
@@ -1096,130 +1122,138 @@ error:
 static int
 test_path_relative_cwd(hid_t fapl)
 {
-    hid_t   file = -1;          /* file to write to                     */
-    hid_t   dcpl = -1;          /* dataset creation properties          */
-    hid_t   space = -1;         /* data space                           */
-    hid_t   dapl = -1;          /* dataset access property list         */
-    hid_t   dapl2 = -1;         /* copy of dapl                         */
-    hid_t   dset = -1;          /* dataset                              */
-    hid_t   dset2 = -1;         /* dataset, opened a second time        */
-    hid_t   dset3 = -1;         /* dataset, opened with different prefix    */
-    size_t  i = 0;              /* miscellaneous counters               */
-    char    filename[1024];     /* file name                            */
-    int     part[PART_SIZE];    /* raw data buffer (partial)            */
-    int     whole[TOTAL_SIZE];  /* raw data buffer (total)              */
-    hsize_t cur_size;           /* current data space size              */
-    char    buffer[1024];       /* buffer to read efile_prefix          */
+    hid_t   file  = -1;        /* file to write to                     */
+    hid_t   dcpl  = -1;        /* dataset creation properties          */
+    hid_t   space = -1;        /* data space                           */
+    hid_t   dapl  = -1;        /* dataset access property list         */
+    hid_t   dapl2 = -1;        /* copy of dapl                         */
+    hid_t   dset  = -1;        /* dataset                              */
+    hid_t   dset2 = -1;        /* dataset, opened a second time        */
+    hid_t   dset3 = -1;        /* dataset, opened with different prefix    */
+    size_t  i     = 0;         /* miscellaneous counters               */
+    char    filename[1024];    /* file name                            */
+    int     part[PART_SIZE];   /* raw data buffer (partial)            */
+    int     whole[TOTAL_SIZE]; /* raw data buffer (total)              */
+    hsize_t cur_size;          /* current data space size              */
+    char    buffer[1024];      /* buffer to read efile_prefix          */
 
     TESTING("filenames relative to HDF5 file for external file");
 
-    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+    if (HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
         TEST_ERROR
 
-    if(HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
+    if (HDmkdir("extern_dir", (mode_t)0755) < 0 && errno != EEXIST)
         TEST_ERROR;
 
     h5_fixname(EXT_FNAME[4], fapl, filename, sizeof(filename));
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         FAIL_STACK_ERROR;
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the dataset */
-    if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < N_EXT_FILES; i++) {
+    for (i = 0; i < N_EXT_FILES; i++) {
         HDsnprintf(filename, sizeof(filename), "..%sextern_%dr.raw", H5_DIR_SEPS, (int)i + 1);
-        if(H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
+        if (H5Pset_external(dcpl, filename, (off_t)(i * GARBAGE_PER_FILE), (hsize_t)sizeof(part)) < 0)
             FAIL_STACK_ERROR
     } /* end for */
 
     cur_size = TOTAL_SIZE;
-    if((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
+    if ((space = H5Screate_simple(1, &cur_size, NULL)) < 0)
         FAIL_STACK_ERROR
-    if((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_efile_prefix(dapl, "${ORIGIN}") < 0)
+    if (H5Pset_efile_prefix(dapl, "${ORIGIN}") < 0)
         FAIL_STACK_ERROR
-    if(H5Pget_efile_prefix(dapl, buffer, sizeof(buffer)) < 0)
+    if (H5Pget_efile_prefix(dapl, buffer, sizeof(buffer)) < 0)
         FAIL_STACK_ERROR
-    if(HDstrcmp(buffer, "${ORIGIN}") != 0)
+    if (HDstrcmp(buffer, "${ORIGIN}") != 0)
         FAIL_PUTS_ERROR("efile prefix not set correctly");
-    if((dapl2 = H5Pcopy(dapl)) < 0)
+    if ((dapl2 = H5Pcopy(dapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Create dataset */
-    if((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, dapl2)) < 0)
+    if ((dset = H5Dcreate2(file, "dset1", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, dapl2)) < 0)
         FAIL_STACK_ERROR
 
     /* Reopen dataset with same efile_prefix property */
-    if((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
+    if ((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
         FAIL_STACK_ERROR
 
     /* Reopen dataset with different efile_prefix property */
-    if(H5Pset_efile_prefix(dapl, "//") < 0)
+    if (H5Pset_efile_prefix(dapl, "//") < 0)
         FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-        dset3 = H5Dopen2(file, "dset1", dapl);
-    } H5E_END_TRY;
-    if(dset3 >= 0)
+    H5E_BEGIN_TRY { dset3 = H5Dopen2(file, "dset1", dapl); }
+    H5E_END_TRY;
+    if (dset3 >= 0)
         FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
 
     /* Read the entire dataset and compare with the original */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < TOTAL_SIZE; i++)
-        if(whole[i] != (signed)i)
+    for (i = 0; i < TOTAL_SIZE; i++)
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
     /* Close dataset */
-    if(H5Dclose(dset2) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
 
     /* Open dataset (use a differend prefix than for create.
      * This works because the dataset was closed.
      */
-    if(H5Pset_efile_prefix(dapl2, "${ORIGIN}/.") < 0)
+    if (H5Pset_efile_prefix(dapl2, "${ORIGIN}/.") < 0)
         FAIL_STACK_ERROR
-    if((dset = H5Dopen2(file, "dset1", dapl2)) < 0)
+    if ((dset = H5Dopen2(file, "dset1", dapl2)) < 0)
         FAIL_STACK_ERROR
 
     /* Reopen dataset with same efile_prefix property */
-    if((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
+    if ((dset2 = H5Dopen2(file, "dset1", dapl2)) < 0)
         FAIL_STACK_ERROR
 
     /* Reopen dataset with different efile_prefix property */
-    if(H5Pset_efile_prefix(dapl, NULL) < 0)
+    if (H5Pset_efile_prefix(dapl, NULL) < 0)
         FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-        dset3 = H5Dopen2(file, "dset1", dapl);
-    } H5E_END_TRY;
-    if(dset3 >= 0)
+    H5E_BEGIN_TRY { dset3 = H5Dopen2(file, "dset1", dapl); }
+    H5E_END_TRY;
+    if (dset3 >= 0)
         FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeded");
 
     /* Read the entire dataset and compare with the original */
     HDmemset(whole, 0, sizeof(whole));
-    if(H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
+    if (H5Dread(dset, H5T_NATIVE_INT, space, space, H5P_DEFAULT, whole) < 0)
         FAIL_STACK_ERROR
-    for(i = 0; i < TOTAL_SIZE; i++)
-        if(whole[i] != (signed)i)
+    for (i = 0; i < TOTAL_SIZE; i++)
+        if (whole[i] != (signed)i)
             FAIL_PUTS_ERROR("Incorrect value(s) read.");
 
-    if(H5Dclose(dset2) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(dset) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dapl2) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dapl) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl) < 0) FAIL_STACK_ERROR
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(dset2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(dset) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dapl2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dapl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl) < 0)
+        FAIL_STACK_ERROR
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(dapl2);
         H5Pclose(dapl);
         H5Dclose(dset3);
@@ -1228,11 +1262,11 @@ error:
         H5Pclose(dcpl);
         H5Sclose(space);
         H5Fclose(file);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_path_relative_cwd() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    test_h5d_get_access_plist
  *
@@ -1249,89 +1283,95 @@ error:
 static int
 test_h5d_get_access_plist(hid_t fapl_id)
 {
-    hid_t    fid = -1;           /* file to write to                     */
-    hid_t    dcpl_id = -1;       /* dataset creation properties          */
-    hid_t    dapl_id = -1;       /* dataset access properties            */
-    hid_t    sid = -1;           /* data space                           */
-    hid_t    did = -1;           /* dataset                              */
-    hsize_t  dims = 0;           /* dataset size                         */
-    char    *buffer = NULL;      /* saved prefix name from dapl          */
-    char     filename[1024];     /* file names                           */
+    hid_t   fid     = -1;   /* file to write to                     */
+    hid_t   dcpl_id = -1;   /* dataset creation properties          */
+    hid_t   dapl_id = -1;   /* dataset access properties            */
+    hid_t   sid     = -1;   /* data space                           */
+    hid_t   did     = -1;   /* dataset                              */
+    hsize_t dims    = 0;    /* dataset size                         */
+    char *  buffer  = NULL; /* saved prefix name from dapl          */
+    char    filename[1024]; /* file names                           */
 
     TESTING("H5Dget_access_plist() returns correct prefix");
 
-    if(HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
+    if (HDsetenv("HDF5_EXTFILE_PREFIX", "", 1) < 0)
         TEST_ERROR
 
     /* Reset the raw data files */
-    if(reset_raw_data_files(FALSE) < 0)
+    if (reset_raw_data_files(FALSE) < 0)
         TEST_ERROR
 
     /* Create the file */
     h5_fixname(EXT_FNAME[5], fapl_id, filename, sizeof(filename));
-    if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         FAIL_STACK_ERROR
 
     /* Create the dcpl and set external storage */
-    if((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_external(dcpl_id, "extern_1r.raw", (off_t)0, (hsize_t)0) < 0)
+    if (H5Pset_external(dcpl_id, "extern_1r.raw", (off_t)0, (hsize_t)0) < 0)
         FAIL_STACK_ERROR
 
     /* Create the dapl and set the prefix */
-    if((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
+    if ((dapl_id = H5Pcreate(H5P_DATASET_ACCESS)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_efile_prefix(dapl_id, "someprefix") < 0)
+    if (H5Pset_efile_prefix(dapl_id, "someprefix") < 0)
         FAIL_STACK_ERROR
 
     /* Create the dataset */
-    if((sid = H5Screate_simple(1, &dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(1, &dims, NULL)) < 0)
         FAIL_STACK_ERROR
-    if((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, dapl_id)) < 0)
+    if ((did = H5Dcreate2(fid, "dset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl_id, dapl_id)) < 0)
         FAIL_STACK_ERROR
 
     /* Close the dapl */
-    if(H5Pclose(dapl_id) < 0)
+    if (H5Pclose(dapl_id) < 0)
         FAIL_STACK_ERROR
     dapl_id = -1;
 
     /* Get a data access property list from the dataset */
-    if((dapl_id = H5Dget_access_plist(did)) < 0)
+    if ((dapl_id = H5Dget_access_plist(did)) < 0)
         FAIL_STACK_ERROR
 
     /* Check the value for the external prefix */
-    if((buffer = (char *)HDcalloc((size_t)64, sizeof(char))) == NULL)
+    if ((buffer = (char *)HDcalloc((size_t)64, sizeof(char))) == NULL)
         TEST_ERROR
-    if(H5Pget_efile_prefix(dapl_id, buffer, (size_t)64) < 0)
+    if (H5Pget_efile_prefix(dapl_id, buffer, (size_t)64) < 0)
         FAIL_STACK_ERROR
-    if(HDstrcmp(buffer, "someprefix") != 0)
+    if (HDstrcmp(buffer, "someprefix") != 0)
         FAIL_PUTS_ERROR("external file prefix from dapl incorrect");
 
     /* Close everything */
     HDfree(buffer);
-    if(H5Sclose(sid) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(did) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dcpl_id) < 0) FAIL_STACK_ERROR
-    if(H5Pclose(dapl_id) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fid) < 0) FAIL_STACK_ERROR
+    if (H5Sclose(sid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dcpl_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Pclose(dapl_id) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(fid) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    if(buffer)
+error:
+    if (buffer)
         HDfree(buffer);
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Dclose(did);
         H5Pclose(dcpl_id);
         H5Pclose(dapl_id);
         H5Sclose(sid);
         H5Fclose(fid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_h5d_get_access_plist() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -1347,13 +1387,13 @@ test_h5d_get_access_plist(hid_t fapl_id)
 int
 main(void)
 {
-    hid_t    fapl_id_old = -1;   /* file access properties (old format)  */
-    hid_t    fapl_id_new = -1;   /* file access properties (new format)  */
-    hid_t    fid = -1;           /* file for test_1* functions           */
-    hid_t    gid = -1;           /* group to emit diagnostics            */
-    char     filename[1024];     /* file name for test_1* funcs          */
-    unsigned latest_format;      /* default or latest file format        */
-    int      nerrors = 0;        /* number of errors                     */
+    hid_t    fapl_id_old = -1; /* file access properties (old format)  */
+    hid_t    fapl_id_new = -1; /* file access properties (new format)  */
+    hid_t    fid         = -1; /* file for test_1* functions           */
+    hid_t    gid         = -1; /* group to emit diagnostics            */
+    char     filename[1024];   /* file name for test_1* funcs          */
+    unsigned latest_format;    /* default or latest file format        */
+    int      nerrors = 0;      /* number of errors                     */
 
     h5_reset();
 
@@ -1362,9 +1402,9 @@ main(void)
     h5_fixname(EXT_FNAME[0], fapl_id_old, filename, sizeof(filename));
 
     /* Copy and set up a fapl for the latest file format */
-    if((fapl_id_new = H5Pcopy(fapl_id_old)) < 0)
+    if ((fapl_id_new = H5Pcopy(fapl_id_old)) < 0)
         FAIL_STACK_ERROR
-    if(H5Pset_libver_bounds(fapl_id_new, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(fapl_id_new, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         FAIL_STACK_ERROR
 
     /* The file format doesn't matter for this test */
@@ -1372,11 +1412,11 @@ main(void)
     HDputs("");
 
     /* Test with old & new format groups */
-    for(latest_format = FALSE; latest_format <= TRUE; latest_format++) {
+    for (latest_format = FALSE; latest_format <= TRUE; latest_format++) {
         hid_t current_fapl_id = -1;
 
         /* Set the fapl for different file formats */
-        if(latest_format) {
+        if (latest_format) {
             HDputs("\nTesting with the latest file format:");
             current_fapl_id = fapl_id_new;
         }
@@ -1386,13 +1426,14 @@ main(void)
         }
 
         /* Create the common file used by some of the tests */
-        if((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, current_fapl_id)) < 0)
+        if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, current_fapl_id)) < 0)
             FAIL_STACK_ERROR
 
         /* Create a group that will be used in the file set read test */
-        if((gid = H5Gcreate2(fid, "emit-diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        if ((gid = H5Gcreate2(fid, "emit-diagnostics", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+            FAIL_STACK_ERROR
+        if (H5Gclose(gid) < 0)
             FAIL_STACK_ERROR
-        if(H5Gclose(gid) < 0) FAIL_STACK_ERROR
 
         /* These tests use a common file */
         nerrors += test_non_extendible(fid);
@@ -1417,19 +1458,22 @@ main(void)
         nerrors += (h5_verify_cached_stabs(EXT_FNAME, current_fapl_id) < 0 ? 1 : 0);
 
         /* Close the common file */
-        if(H5Fclose(fid) < 0) FAIL_STACK_ERROR
+        if (H5Fclose(fid) < 0)
+            FAIL_STACK_ERROR
 
     } /* end for old and new format */
 
-    if(nerrors > 0) goto error;
+    if (nerrors > 0)
+        goto error;
 
     /* Close the new ff fapl. h5_cleanup will take care of the old ff fapl */
-    if(H5Pclose(fapl_id_new) < 0) FAIL_STACK_ERROR
+    if (H5Pclose(fapl_id_new) < 0)
+        FAIL_STACK_ERROR
 
     HDputs("All external storage tests passed.");
 
     /* Clean up files used by file set tests */
-    if(h5_cleanup(EXT_FNAME, fapl_id_old)) {
+    if (h5_cleanup(EXT_FNAME, fapl_id_old)) {
         HDremove("extern_1r.raw");
         HDremove("extern_2r.raw");
         HDremove("extern_3r.raw");
@@ -1446,14 +1490,15 @@ main(void)
     return EXIT_SUCCESS;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Fclose(fid);
         H5Pclose(fapl_id_old);
         H5Pclose(fapl_id_new);
         H5Gclose(gid);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     nerrors = MAX(1, nerrors);
     HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;
 } /* end main() */
-