Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 1818 insertions, 1544 deletions

diff --git a/test/mount.c b/test/mount.c
index b7d2858..b23de30 100644
--- a/test/mount.c
+++ b/test/mount.c
@@ -6,40 +6,30 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Wednesday, October  7, 1998
  *
  * Purpose:	Tests file mounting.
  */
 #include "h5test.h"
-#include "H5Fprivate.h"		/* File access				*/
-#include "H5Iprivate.h"		/* IDs			  		*/
-
-const char *FILENAME[] = {
-    "mount_1",
-    "mount_2",
-    "mount_3",
-    "mount_4",
-    "mount_5",
-    "mount_6",
-    "mount_7",
-    NULL
-};
+#include "H5Fprivate.h" /* File access				*/
+#include "H5Iprivate.h" /* IDs			  		*/
+
+const char *FILENAME[] = {"mount_1", "mount_2", "mount_3", "mount_4", "mount_5", "mount_6", "mount_7", NULL};
 
 /* For "mount_after_close" test */
-#define RANK 2
-#define NX 4
-#define NY 5
-#define NAME_BUF_SIZE   40
+#define RANK          2
+#define NX            4
+#define NY            5
+#define NAME_BUF_SIZE 40
 int bm[NX][NY], bm_out[NX][NY]; /* Data buffers */
 
-
 /*-------------------------------------------------------------------------
  * Function:	setup
  *
@@ -59,44 +49,61 @@ int bm[NX][NY], bm_out[NX][NY]; /* Data buffers */
 static int
 setup(hid_t fapl)
 {
-    hid_t	file = -1;
-    char	filename[1024];
+    hid_t file = -1;
+    char  filename[1024];
 
     /* file 1 */
     h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/mnt1/file1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/mnt_unlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/mnt_move_a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Lcreate_hard(file, "/mnt1/file1", H5L_SAME_LOC, "/file1", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Lcreate_hard(file, "/mnt1", H5L_SAME_LOC, "/mnt1_link", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/mnt1/file1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/mnt_unlink", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/mnt_move_a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Lcreate_hard(file, "/mnt1/file1", H5L_SAME_LOC, "/file1", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Lcreate_hard(file, "/mnt1", H5L_SAME_LOC, "/mnt1_link", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
 
     /* file 2 */
     h5_fixname(FILENAME[1], fapl, filename, sizeof filename);
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/file2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/rename_a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/rename_b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(H5Gcreate2(file, "/rename_a/x", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/file2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/rename_a", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/rename_b", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(H5Gcreate2(file, "/rename_a/x", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
 
     /* file 3 */
     h5_fixname(FILENAME[2], fapl, filename, sizeof filename);
-    if((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file) < 0) FAIL_STACK_ERROR
+    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file) < 0)
+        FAIL_STACK_ERROR
 
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file);
+    }
+    H5E_END_TRY;
     return -1;
 } /* end setup() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_basic
  *
@@ -117,35 +124,42 @@ error:
 static int
 test_basic(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1, grp = -1;
-    char	filename1[1024], filename2[1024];
+    hid_t file1 = -1, file2 = -1, grp = -1;
+    char  filename1[1024], filename2[1024];
 
     TESTING("basic functionality");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-           (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if ((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
+        FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
         FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+error:
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_basic() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_illegal
  *
@@ -166,34 +180,35 @@ test_basic(hid_t fapl)
 static int
 test_illegal(hid_t fapl)
 {
-    hid_t	file1 = -1, file1b = -1, file2 = -1, file3 = -1, file3b = -1, mnt = -1;
-    char	filename1[1024], filename2[1024], filename3[1024];
-    herr_t	status;
+    hid_t  file1 = -1, file1b = -1, file2 = -1, file3 = -1, file3b = -1, mnt = -1;
+    char   filename1[1024], filename2[1024], filename3[1024];
+    herr_t status;
 
     TESTING("illegal mount operations");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
-
     /* Open the files */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file3 = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-	if((file1b = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if((file3b = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file3 = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((file1b = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((file3b = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     /* Try mounting a file on itself */
-    H5E_BEGIN_TRY {
-	status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Mounting a file on itself should have failed.");
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(file1, "/mnt1", file1, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Mounting a file on itself should have failed.");
+        TEST_ERROR
     } /* end if */
 
     /*
@@ -201,18 +216,24 @@ test_illegal(hid_t fapl)
      * point before we mount the first file or we'll end up mounting file3 at
      * the root of file2 and the mount will succeed.
      */
-    if((mnt = H5Gopen2(file1, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Fmount(mnt, ".", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Fmount(mnt, ".", file3, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Mounting two files at one mount point should have failed.");
-	TEST_ERROR
+    if ((mnt = H5Gopen2(file1, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(mnt, ".", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(mnt, ".", file3, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Mounting two files at one mount point should have failed.");
+        TEST_ERROR
     } /* end if */
-    if(H5Funmount(mnt, ".") < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(mnt, ".") < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Try mounting the same file opened twice at the same place.
@@ -220,54 +241,70 @@ test_illegal(hid_t fapl)
      * We have to open the mount point before we mount the first file or we'll
      * end up mounting file3b at the root of file3 and the mount will succeed.
      */
-    if((mnt = H5Gopen2(file1, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Fmount(mnt, ".", file3, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Mounting same file opened twice at one mount point should have failed.");
-	TEST_ERROR
+    if ((mnt = H5Gopen2(file1, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(mnt, ".", file3, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(mnt, ".", file3b, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Mounting same file opened twice at one mount point should have failed.");
+        TEST_ERROR
     } /* end if */
-    if(H5Funmount(mnt, ".") < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(mnt, ".") < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt) < 0)
+        FAIL_STACK_ERROR
 
     /* Try to create a "weak" cycle */
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Creating a cycle with mount points should have failed.");
-	TEST_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(file2, "/mnt1/file2", file1b, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Creating a cycle with mount points should have failed.");
+        TEST_ERROR
     } /* end if */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
 
     /* Close everything and return */
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1b) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file3) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file3b) < 0) FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1b) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file3) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file3b) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(mnt);
-	H5Fclose(file1);
-	H5Fclose(file1b);
-	H5Fclose(file2);
-	H5Fclose(file3);
-	H5Fclose(file3b);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(mnt);
+        H5Fclose(file1);
+        H5Fclose(file1b);
+        H5Fclose(file2);
+        H5Fclose(file3);
+        H5Fclose(file3b);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_illegal() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_samefile
  *
@@ -285,27 +322,26 @@ error:
 static int
 test_samefile(hid_t fapl)
 {
-    hid_t	file1a = -1, file1b = -1, file2 = -1, file3 = -1;
-    hid_t	mnt1a = -1, mnt1b = -1;
-    char	filename1[1024], filename2[1024], filename3[1024];
-    H5G_info_t  grp_info;
-    herr_t	status;
+    hid_t      file1a = -1, file1b = -1, file2 = -1, file3 = -1;
+    hid_t      mnt1a = -1, mnt1b = -1;
+    char       filename1[1024], filename2[1024], filename3[1024];
+    H5G_info_t grp_info;
+    herr_t     status;
 
     TESTING("same file mount operations");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
-
     /* Open the files */
-    if((file1a = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if((file1b = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if((file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if((file3 = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
+    if ((file1a = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((file1b = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((file3 = H5Fopen(filename3, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Try mounting different files at the same place in each of the "top"
@@ -314,22 +350,37 @@ test_samefile(hid_t fapl)
      * We have to open the mount point before we mount the first file or we'll
      * end up mounting file4 at the root of file3 and the mount will succeed.
      */
-    if((mnt1a = H5Gopen2(file1a, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1a, &grp_info) < 0) FAIL_STACK_ERROR
-    if(grp_info.mounted) FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
-    if((mnt1b = H5Gopen2(file1b, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1b, &grp_info) < 0) FAIL_STACK_ERROR
-    if(grp_info.mounted) FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
-    if(H5Fmount(mnt1a, ".", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1a, &grp_info) < 0) FAIL_STACK_ERROR
-    if(!grp_info.mounted) FAIL_PUTS_ERROR("    Group should have 'mounted' flag set.")
-    H5E_BEGIN_TRY {
-	status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) FAIL_PUTS_ERROR("    Mounting different files at one mount point should have failed.")
-    if(H5Funmount(mnt1a, ".") < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt1a) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt1b) < 0) FAIL_STACK_ERROR
+    if ((mnt1a = H5Gopen2(file1a, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1a, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
+    if ((mnt1b = H5Gopen2(file1b, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1b, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
+    if (H5Fmount(mnt1a, ".", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1a, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (!grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group should have 'mounted' flag set.")
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(mnt1b, ".", file3, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0)
+        FAIL_PUTS_ERROR("    Mounting different files at one mount point should have failed.")
+    if (H5Funmount(mnt1a, ".") < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt1a) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt1b) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Try mounting same files at the same place in each of the "top"
@@ -338,46 +389,65 @@ test_samefile(hid_t fapl)
      * We have to open the mount point before we mount the first file or we'll
      * end up mounting file4 at the root of file3 and the mount will succeed.
      */
-    if((mnt1a = H5Gopen2(file1a, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1a, &grp_info) < 0) FAIL_STACK_ERROR
-    if(grp_info.mounted) FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
-    if((mnt1b = H5Gopen2(file1b, "/mnt1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1b, &grp_info) < 0) FAIL_STACK_ERROR
-    if(grp_info.mounted) FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
-    if(H5Fmount(mnt1a, ".", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Gget_info(mnt1a, &grp_info) < 0) FAIL_STACK_ERROR
-    if(!grp_info.mounted) FAIL_PUTS_ERROR("    Group should have 'mounted' flag set.")
-    H5E_BEGIN_TRY {
-	status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) FAIL_PUTS_ERROR("    Mounting same files at one mount point should have failed.")
-    if(H5Funmount(mnt1a, ".") < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt1a) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(mnt1b) < 0) FAIL_STACK_ERROR
-
+    if ((mnt1a = H5Gopen2(file1a, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1a, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
+    if ((mnt1b = H5Gopen2(file1b, "/mnt1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1b, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group shouldn't have 'mounted' flag set.")
+    if (H5Fmount(mnt1a, ".", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gget_info(mnt1a, &grp_info) < 0)
+        FAIL_STACK_ERROR
+    if (!grp_info.mounted)
+        FAIL_PUTS_ERROR("    Group should have 'mounted' flag set.")
+    H5E_BEGIN_TRY
+    {
+        status = H5Fmount(mnt1b, ".", file2, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0)
+        FAIL_PUTS_ERROR("    Mounting same files at one mount point should have failed.")
+    if (H5Funmount(mnt1a, ".") < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt1a) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(mnt1b) < 0)
+        FAIL_STACK_ERROR
 
     /* Close everything and return */
-    if(H5Fclose(file1a) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1b) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file3) < 0) FAIL_STACK_ERROR
+    if (H5Fclose(file1a) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1b) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file3) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(mnt1a);
-	H5Gclose(mnt1b);
-	H5Fclose(file1a);
-	H5Fclose(file1b);
-	H5Fclose(file2);
-	H5Fclose(file3);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(mnt1a);
+        H5Gclose(mnt1b);
+        H5Fclose(file1a);
+        H5Fclose(file1b);
+        H5Fclose(file2);
+        H5Fclose(file3);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_samefile() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_hide
  *
@@ -399,63 +469,86 @@ error:
 static int
 test_hide(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1, grp = -1;
-    H5O_info_t	oi1, oi2;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1, grp = -1;
+    H5O_info2_t oi1, oi2;
+    char        filename1[1024], filename2[1024];
+    hbool_t     same_obj;
 
     TESTING("name hiding under mount point");
-    h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
-    h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
+    h5_fixname(FILENAME[0], fapl, filename1, sizeof(filename1));
+    h5_fixname(FILENAME[1], fapl, filename2, sizeof(filename2));
 
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Get information about file1:/mnt1/file1 for later */
-    if(H5Oget_info_by_name2(file1, "/mnt1/file1", &oi1, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt1/file1", &oi1, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Build the virtual file */
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Original names under file1:/mnt1 should not be accessible */
-    H5E_BEGIN_TRY {
-	grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(grp >= 0) {
-	H5_FAILED();
-	HDputs("    Name is still accessible under mount point.");
-	TEST_ERROR
-    } /* end if */
+    H5E_BEGIN_TRY
+    {
+        grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (grp >= 0) {
+        H5_FAILED();
+        HDputs("    Name is still accessible under mount point.");
+        TEST_ERROR
+    }
 
     /*
      * The original objects under file1:/mnt1 are still accessible by their
      * other names.  This is a rather stupid test but demonstrates a point.
      */
-    if(H5Oget_info_by_name2(file1, "/file1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(oi1.fileno != oi2.fileno || H5F_addr_ne(oi1.addr, oi2.addr)) {
-	H5_FAILED();
-	HDputs("    Hard link failed for hidden object.");
-	TEST_ERROR
-    } /* end if */
+    if (H5Oget_info_by_name3(file1, "/file1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+
+    same_obj = TRUE;
+    if (oi1.fileno == oi2.fileno) {
+        int token_cmp;
+
+        if (H5Otoken_cmp(file1, &oi1.token, &oi2.token, &token_cmp) < 0)
+            FAIL_STACK_ERROR
+        if (token_cmp)
+            same_obj = FALSE;
+    }
+    else
+        same_obj = FALSE;
+
+    if (!same_obj) {
+        H5_FAILED();
+        HDputs("    Hard link failed for hidden object.");
+        TEST_ERROR
+    }
 
     /* Unmount and close objects */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(grp);
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(grp);
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_hide() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_assoc
  *
@@ -476,54 +569,74 @@ error:
 static int
 test_assoc(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
-    H5O_info_t	oi1, oi2;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1;
+    H5O_info2_t oi1, oi2;
+    char        filename1[1024], filename2[1024];
+    hbool_t     same_obj;
 
     TESTING("mount point open");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Open the files */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
         FAIL_STACK_ERROR
 
     /* Get information about the root of file2 */
-    if(H5Oget_info2(file2, &oi1, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info3(file2, &oi1, H5O_INFO_BASIC) < 0)
+        FAIL_STACK_ERROR
 
     /* Create the virtual file */
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Get info about the mount point -- should be the same as the root group
      * of file2.
      */
-    if(H5Oget_info_by_name2(file1, "/mnt1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt1", &oi2, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
-    if(oi1.fileno != oi2.fileno || H5F_addr_ne(oi1.addr, oi2.addr)) {
-	H5_FAILED();
-	HDputs("    Association failed.");
+    same_obj = TRUE;
+    if (oi1.fileno == oi2.fileno) {
+        int token_cmp;
+
+        if (H5Otoken_cmp(file1, &oi1.token, &oi2.token, &token_cmp) < 0)
+            FAIL_STACK_ERROR
+        if (token_cmp)
+            same_obj = FALSE;
+    }
+    else
+        same_obj = FALSE;
+
+    if (!same_obj) {
+        H5_FAILED();
+        HDputs("    Association failed.");
         TEST_ERROR
     } /* end if */
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt1_link") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1_link") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file2);
-	H5Fclose(file1);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file2);
+        H5Fclose(file1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_assoc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_mntlnk
  *
@@ -545,47 +658,55 @@ error:
 static int
 test_mntlnk(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1, grp = -1;
-    char	filename1[1024], filename2[1024];
+    hid_t file1 = -1, file2 = -1, grp = -1;
+    char  filename1[1024], filename2[1024];
 
     TESTING("multi-linked mount point");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
-
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Can we see file2:/file2 as both file1:/mnt1/file2 and
      * file1:/mnt1_link/file2?
      */
-    if((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
-    if((grp = H5Gopen2(file1, "/mnt1_link/file2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
+    if ((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
+        FAIL_STACK_ERROR
+    if ((grp = H5Gopen2(file1, "/mnt1_link/file2", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
+        FAIL_STACK_ERROR
 
     /* Unlink using second name */
-    if(H5Funmount(file1, "/mnt1_link") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1_link") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(grp);
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(grp);
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_mntlnk() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_move
  *
@@ -607,48 +728,56 @@ error:
 static int
 test_move(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
-    herr_t	status;
-    char	filename1[1024], filename2[1024];
+    hid_t  file1 = -1, file2 = -1;
+    herr_t status;
+    char   filename1[1024], filename2[1024];
 
     TESTING("object renaming");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* First rename an object in the mounted file, then try it across files */
-    if(H5Lmove(file1, "/mnt1/rename_a/x", H5L_SAME_LOC, "/mnt1/rename_b/y", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Lmove(file1, "/mnt1/rename_b/y", H5L_SAME_LOC, "/y", H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Moving an object across files should't have been possible");
-	TEST_ERROR
+    if (H5Lmove(file1, "/mnt1/rename_a/x", H5L_SAME_LOC, "/mnt1/rename_b/y", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Lmove(file1, "/mnt1/rename_b/y", H5L_SAME_LOC, "/y", H5P_DEFAULT, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Moving an object across files shouldn't have been possible");
+        TEST_ERROR
     } /* end if */
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_move() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_preopen
  *
@@ -669,46 +798,54 @@ error:
 static int
 test_preopen(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1, grp = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1, grp = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
 
     TESTING("preopening objects under the mount point");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-	(file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     /* Open something under the mount point */
-    if((grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((grp = H5Gopen2(file1, "/mnt1/file1", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Build the virtual file */
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Now access the thing we previously opened */
-    if(H5Oget_info2(grp, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info3(grp, &oinfo, H5O_INFO_BASIC) < 0)
+        FAIL_STACK_ERROR
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(grp);
-	H5Fclose(file2);
-	H5Fclose(file1);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(grp);
+        H5Fclose(file2);
+        H5Fclose(file1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_preopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_postopen
  *
@@ -731,50 +868,59 @@ static int
 test_postopen(hid_t fapl)
 {
 
-    hid_t	file1 = -1, file2 = -1, grp = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1, grp = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
 
     TESTING("open object access after unmount");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Open some object in the mounted file */
-    if((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((grp = H5Gopen2(file1, "/mnt1/file2", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Unmount the file */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
 
     /* Now access the thing we previously opened */
-    if(H5Oget_info2(grp, &oinfo, H5O_INFO_BASIC) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info3(grp, &oinfo, H5O_INFO_BASIC) < 0)
+        FAIL_STACK_ERROR
 
     /* Try accessing it from the file */
-    if(H5Oget_info_by_name2(file2, "/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Shut down */
-    if(H5Gclose(grp) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(grp) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(grp);
-	H5Fclose(file2);
-	H5Fclose(file1);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(grp);
+        H5Fclose(file2);
+        H5Fclose(file1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_postopen() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_unlink
  *
@@ -796,28 +942,31 @@ error:
 static int
 test_unlink(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1, mnt = -1, root = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
-    herr_t	status;
+    hid_t       file1 = -1, file2 = -1, mnt = -1, root = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
+    herr_t      status;
 
     TESTING("mount point unlinking");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Open files */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Opening the mount point before mounting opens the group in the parent
      * file, but opening the mount point after mounting is the same as
      * opening the root group of the child file.
      */
-    if((mnt = H5Gopen2(file1, "/mnt_unlink", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt_unlink", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if((root = H5Gopen2(file1, "/mnt_unlink", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((mnt = H5Gopen2(file1, "/mnt_unlink", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt_unlink", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if ((root = H5Gopen2(file1, "/mnt_unlink", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * "/file2" of file2 should be visible as an absolute name through either
@@ -825,42 +974,54 @@ test_unlink(hid_t fapl)
      * before the H5Fmount() and thus refers to the mount point itself rather
      * than the group mounted there.
      */
-    if(H5Oget_info_by_name2(file1, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(mnt, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(root, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Incorrect traversal from mount point!");
-	TEST_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(mnt, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(root, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Incorrect traversal from mount point!");
+        TEST_ERROR
     } /* end if */
 
     /* Unlink the mount point */
-    if(H5Ldelete(file1, "/mnt_unlink", H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Ldelete(file1, "/mnt_unlink", H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * We should still be able to get to "/file2" of file2 by starting at
      * `root' which is still open, but not by name.
      */
-    if(H5Oget_info_by_name2(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	status = H5Oget_info_by_name2(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Traversal through mount point should not have worked!");
-	TEST_ERROR
+    if (H5Oget_info_by_name3(root, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Oget_info_by_name3(mnt, "file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Traversal through mount point should not have worked!");
+        TEST_ERROR
     } /* end if */
-    H5E_BEGIN_TRY {
-	status = H5Oget_info_by_name2(file2, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Traversal through mount point should not have worked!");
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Oget_info_by_name3(file2, "/mnt_unlink/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Traversal through mount point should not have worked!");
+        TEST_ERROR
     } /* end if */
 
     /*
@@ -868,44 +1029,54 @@ test_unlink(hid_t fapl)
      * the mount point because the name doesn't exist anymore.  We must
      * supply the mount point directly.
      */
-    H5E_BEGIN_TRY {
-	status = H5Funmount(file1, "/mnt_unlink");
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDprintf("    %d: Unmount by name should not have been allowed!\n",__LINE__);
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Funmount(file1, "/mnt_unlink");
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDprintf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
+        TEST_ERROR
     } /* end if */
-    H5E_BEGIN_TRY {
-	status = H5Funmount(file2, "/");
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDprintf("    %d: Unmount by name should not have been allowed!\n",__LINE__);
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Funmount(file2, "/");
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDprintf("    %d: Unmount by name should not have been allowed!\n", __LINE__);
+        TEST_ERROR
     } /* end if */
-    if(H5Funmount(mnt, ".") < 0) FAIL_STACK_ERROR
+    if (H5Funmount(mnt, ".") < 0)
+        FAIL_STACK_ERROR
 
     /* Close files */
-    if(H5Gclose(mnt) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(root) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(mnt) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(root) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(mnt);
-	H5Gclose(root);
-	H5Fclose(file2);
-	H5Fclose(file1);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(mnt);
+        H5Gclose(root);
+        H5Fclose(file2);
+        H5Fclose(file1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_unlink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_mvmpt
  *
@@ -925,43 +1096,50 @@ error:
 static int
 test_mvmpt(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
 
     TESTING("mount point renaming");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt_move_a", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt_move_a", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Rename the mount point */
-    if(H5Lmove(file1, "/mnt_move_a", H5L_SAME_LOC, "/mnt_move_b", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Lmove(file1, "/mnt_move_a", H5L_SAME_LOC, "/mnt_move_b", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Access something under the new name */
-    if(H5Oget_info_by_name2(file1, "/mnt_move_b/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt_move_b/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt_move_b") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt_move_b") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_mvmpt() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_interlink
  *
@@ -981,42 +1159,47 @@ error:
 static int
 test_interlink(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
+    hid_t file1 = -1, file2 = -1;
 #ifdef NOT_NOW
-    hid_t	type = -1, space = -1, dset = -1;
-    hsize_t	cur_dims[1] = {2};
+    hid_t   type = -1, space = -1, dset = -1;
+    hsize_t cur_dims[1] = {2};
 #endif /* NOT_NOW */
-    char	filename1[1024], filename2[1024];
-    herr_t	status;
+    char   filename1[1024], filename2[1024];
+    herr_t status;
 
     TESTING("interfile hard links");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Try an interfile hard link directly */
-    H5E_BEGIN_TRY {
-	status = H5Lcreate_hard(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Interfile hard link should not have been allowed!");
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Lcreate_hard(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Interfile hard link should not have been allowed!");
+        TEST_ERROR
     } /* end if */
 
     /* Try an interfile hard link by renaming something */
-    H5E_BEGIN_TRY {
-	status = H5Lmove(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(status >= 0) {
-	H5_FAILED();
-	HDputs("    Interfile renaming should not have been allowed!");
-	TEST_ERROR
+    H5E_BEGIN_TRY
+    {
+        status = H5Lmove(file1, "/mnt1/file2", H5L_SAME_LOC, "/file2", H5P_DEFAULT, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (status >= 0) {
+        H5_FAILED();
+        HDputs("    Interfile renaming should not have been allowed!");
+        TEST_ERROR
     } /* end if */
 
 /* Commented this code out until Jira issue #7638 is resolved.  Once that
@@ -1025,48 +1208,59 @@ test_interlink(hid_t fapl)
  */
 #ifdef NOT_NOW
     /* Try an interfile hard link by sharing a data type */
-    if((type = H5Tcopy(H5T_NATIVE_INT)) < 0) FAIL_STACK_ERROR
-    if(H5Tcommit2(file1, "/type1", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if((space = H5Screate_simple(1, cur_dims, NULL)) < 0) FAIL_STACK_ERROR
-    H5E_BEGIN_TRY {
-	dset = H5Dcreate2(file1, "/mnt1/file2/dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(dset >= 0) {
-	H5_FAILED();
-	HDputs("    Dataset and shared type must be in the same file!");
-	TEST_ERROR
+    if ((type = H5Tcopy(H5T_NATIVE_INT)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tcommit2(file1, "/type1", type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if ((space = H5Screate_simple(1, cur_dims, NULL)) < 0)
+        FAIL_STACK_ERROR
+    H5E_BEGIN_TRY
+    {
+        dset = H5Dcreate2(file1, "/mnt1/file2/dset", type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    }
+    H5E_END_TRY;
+    if (dset >= 0) {
+        H5_FAILED();
+        HDputs("    Dataset and shared type must be in the same file!");
+        TEST_ERROR
     } /* end if */
 
     /* Close IDs */
-    if(H5Sclose(space) < 0) FAIL_STACK_ERROR
-    if(H5Tclose(type) < 0) FAIL_STACK_ERROR
-#else /* NOT_NOW */
+    if (H5Sclose(space) < 0)
+        FAIL_STACK_ERROR
+    if (H5Tclose(type) < 0)
+        FAIL_STACK_ERROR
+#else  /* NOT_NOW */
     SKIPPED();
     HDputs("    Test skipped due file pointer sharing issue (Jira 7638).");
 #endif /* NOT_NOW */
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
 #ifdef NOT_NOW
-	H5Dclose(dset);
-	H5Sclose(space);
-	H5Tclose(type);
+        H5Dclose(dset);
+        H5Sclose(space);
+        H5Tclose(type);
 #endif /* NOT_NOW */
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_interlink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_uniformity
  *
@@ -1087,51 +1281,66 @@ error:
 static int
 test_uniformity(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
 
     TESTING("file handle uniformity");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Access some things from the file1 handle */
-    if(H5Oget_info_by_name2(file1, "/", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file1, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file1, "mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file1, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file1, "mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Access the same things from the file2 handle */
-    if(H5Oget_info_by_name2(file2, "/", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file2, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file2, "mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file2, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file2, "mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "/", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Shut down */
-    if(H5Funmount(file1, "/mnt1") < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Funmount(file1, "/mnt1") < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_uniformity() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_close
  *
@@ -1151,66 +1360,76 @@ error:
 static int
 test_close(hid_t fapl)
 {
-    hid_t	file1 = -1, file2 = -1;
-    H5O_info_t  oinfo;
-    char	filename1[1024], filename2[1024];
+    hid_t       file1 = -1, file2 = -1;
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024];
 
     TESTING("file handle close");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Build the virtual file */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-	(file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Close file1 unmounting it from the virtual file.  Objects in file1 are
      * still accessible through the file2 handle.
      */
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file2, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) {
-	H5_FAILED();
-	HDputs("    File1 contents are not accessible!");
-	TEST_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file2, "/mnt1", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) {
+        H5_FAILED();
+        HDputs("    File1 contents are not accessible!");
+        TEST_ERROR
     } /* end if */
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0) TEST_ERROR
+    if (H5I_nmembers(H5I_FILE) != 0)
+        TEST_ERROR
     H5F_sfile_assert_num(0);
 
     /* Build the virtual file again */
-    if((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
-            (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
-	FAIL_STACK_ERROR
-    if(H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if ((file1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0 ||
+        (file2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fmount(file1, "/mnt1", file2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /*
      * Close file2.  It is not actually closed because it's a child of file1.
      */
-    if(H5Fclose(file2) < 0) FAIL_STACK_ERROR
-    if(H5Oget_info_by_name2(file1, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(file1) < 0) FAIL_STACK_ERROR
+    if (H5Fclose(file2) < 0)
+        FAIL_STACK_ERROR
+    if (H5Oget_info_by_name3(file1, "/mnt1/file2", &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(file1) < 0)
+        FAIL_STACK_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0) TEST_ERROR
+    if (H5I_nmembers(H5I_FILE) != 0)
+        TEST_ERROR
     H5F_sfile_assert_num(0);
 
     /* Shut down */
     PASSED();
     return 0;
 
- error:
-    H5E_BEGIN_TRY {
-	H5Fclose(file1);
-	H5Fclose(file2);
-    } H5E_END_TRY;
+error:
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(file1);
+        H5Fclose(file2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_mount_after_close
  *
@@ -1231,25 +1450,25 @@ test_close(hid_t fapl)
 static int
 test_mount_after_close(hid_t fapl)
 {
-    hid_t	fid1 = -1, fid2 = -1;                     /* File IDs */
-    hid_t       gidA = -1, gidAB = -1, gidABM = -1, gidX = -1, gidXY = -1;  /* Group identifiers */
-    hid_t       gidABMX = -1, gidABC = -1, gidABT = -1;       /* Group IDs for testing */
-    hid_t       didABMXYD = -1;                           /* Dataset ID for testing */
-    hid_t       did = -1, sid = -1;                         /* Dataset and dataspace identifiers */
-    char	filename1[1024], filename2[1024];       /* Name of files to mount */
-    char        objname[NAME_BUF_SIZE];                 /* Name of object opened */
-    hsize_t     dims[] = {NX,NY};                       /* Dataset dimensions */
-    int         i, j;                                   /* Local index variable */
+    hid_t   fid1 = -1, fid2 = -1;                                      /* File IDs */
+    hid_t   gidA = -1, gidAB = -1, gidABM = -1, gidX = -1, gidXY = -1; /* Group identifiers */
+    hid_t   gidABMX = -1, gidABC = -1, gidABT = -1;                    /* Group IDs for testing */
+    hid_t   didABMXYD = -1;                                            /* Dataset ID for testing */
+    hid_t   did = -1, sid = -1;                                        /* Dataset and dataspace identifiers */
+    char    filename1[1024], filename2[1024];                          /* Name of files to mount */
+    char    objname[NAME_BUF_SIZE];                                    /* Name of object opened */
+    hsize_t dims[] = {NX, NY};                                         /* Dataset dimensions */
+    int     i, j;                                                      /* Local index variable */
 
     TESTING("mounting on group after file is closed");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /*
-    * Initialization of buffer matrix "bm"
-    */
-    for(i =0; i < NX; i++)
-        for(j = 0; j < NY; j++)
+     * Initialization of buffer matrix "bm"
+     */
+    for (i = 0; i < NX; i++)
+        for (j = 0; j < NY; j++)
             bm[i][j] = i + j;
 
     /* Create first file and a groups in it. */
@@ -1260,146 +1479,192 @@ test_mount_after_close(hid_t fapl)
       /A/B/M                   Group
       /A/B/T                   -> /A
     */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((gidAB = H5Gcreate2(gidA, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if ((gidAB = H5Gcreate2(gidA, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
     /* Mount point */
-    if((gidABM = H5Gcreate2(gidAB, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((gidABM = H5Gcreate2(gidAB, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
     /* Soft link */
-    if(H5Lcreate_soft("./M/X/Y", gidAB, "C", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Lcreate_soft("./M/X/Y", gidAB, "C", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
     /* Soft link */
-    if(H5Lcreate_soft("/A", gidAB, "T", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Lcreate_soft("/A", gidAB, "T", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Close groups and file */
-    if(H5Gclose(gidABM) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(gidAB) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(gidA) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fid1) < 0) FAIL_STACK_ERROR
-
-   /* Create second file and dataset "D" in it. */
-   /* h5ls shows: */
-   /* /X                       Group
-      /X/T                     -> ./Y
-      /X/Y                     Group
-      /X/Y/D                   Dataset {4, 5}
-    */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(gidABM) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(gidAB) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(gidA) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(fid1) < 0)
+        FAIL_STACK_ERROR
+
+    /* Create second file and dataset "D" in it. */
+    /* h5ls shows: */
+    /* /X                       Group
+       /X/T                     -> ./Y
+       /X/Y                     Group
+       /X/Y/D                   Dataset {4, 5}
+     */
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+        FAIL_STACK_ERROR
 
     dims[0] = NX;
     dims[1] = NY;
-    if((sid = H5Screate_simple(RANK, dims, NULL)) < 0) FAIL_STACK_ERROR
+    if ((sid = H5Screate_simple(RANK, dims, NULL)) < 0)
+        FAIL_STACK_ERROR
 
-    if((gidX = H5Gcreate2(fid2, "/X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((gidXY = H5Gcreate2(gidX, "Y", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
-    if((did = H5Dcreate2(gidXY, "D", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((gidX = H5Gcreate2(fid2, "/X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if ((gidXY = H5Gcreate2(gidX, "Y", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
+    if ((did = H5Dcreate2(gidXY, "D", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
     /* Soft link */
-    if(H5Lcreate_soft("./Y", gidX, "T", H5P_DEFAULT, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    if (H5Lcreate_soft("./Y", gidX, "T", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Write data to the dataset. */
-    if(H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm) < 0) FAIL_STACK_ERROR
+    if (H5Dwrite(did, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, bm) < 0)
+        FAIL_STACK_ERROR
 
     /* Close all identifiers. */
-    if(H5Sclose(sid) < 0) FAIL_STACK_ERROR
-    if(H5Dclose(did) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(gidXY) < 0) FAIL_STACK_ERROR
-    if(H5Gclose(gidX) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fid2) < 0) FAIL_STACK_ERROR
+    if (H5Sclose(sid) < 0)
+        FAIL_STACK_ERROR
+    if (H5Dclose(did) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(gidXY) < 0)
+        FAIL_STACK_ERROR
+    if (H5Gclose(gidX) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(fid2) < 0)
+        FAIL_STACK_ERROR
 
-/* Beginning of the actual test code */
+    /* Beginning of the actual test code */
 
-   /*
-    * Reopen both files
-    */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0) FAIL_STACK_ERROR
-   /*
-    *  Open /A/B to use as a mount point
-    */
-    if((gidAB = H5Gopen2(fid1, "/A/B", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    /*
+     * Reopen both files
+     */
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl)) < 0)
+        FAIL_STACK_ERROR
+    /*
+     *  Open /A/B to use as a mount point
+     */
+    if ((gidAB = H5Gopen2(fid1, "/A/B", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
-   /*
-    *  Close the parent file. This keeps the file open because of the other handle on the group within
-    */
+    /*
+     *  Close the parent file. This keeps the file open because of the other handle on the group within
+     */
     /* We close the file (it should stay open from the group) */
-    if(H5Fclose(fid1) < 0) FAIL_STACK_ERROR
+    if (H5Fclose(fid1) < 0)
+        FAIL_STACK_ERROR
 
-   /*
-    * Mount second file under G in the first file.
-    */
-    if(H5Fmount(gidAB, "M", fid2, H5P_DEFAULT) < 0) FAIL_STACK_ERROR
+    /*
+     * Mount second file under G in the first file.
+     */
+    if (H5Fmount(gidAB, "M", fid2, H5P_DEFAULT) < 0)
+        FAIL_STACK_ERROR
 
     /* Open "normal" group in mounted file */
     /* (This shows we successfully mounted) */
-    if((gidABMX = H5Gopen2(gidAB, "M/X", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((gidABMX = H5Gopen2(gidAB, "M/X", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name(gidABMX, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
-    if(HDstrcmp(objname, "/A/B/M/X")) TEST_ERROR
+    if (H5Iget_name(gidABMX, objname, (size_t)NAME_BUF_SIZE) < 0)
+        FAIL_STACK_ERROR
+    if (HDstrcmp(objname, "/A/B/M/X") != 0)
+        TEST_ERROR
 
     /* Close object in mounted file */
-    if(H5Gclose(gidABMX) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(gidABMX) < 0)
+        FAIL_STACK_ERROR
 
     /* Open group in mounted file through softlink */
-    if((gidABC = H5Gopen2(gidAB, "C", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((gidABC = H5Gopen2(gidAB, "C", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name(gidABC, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
-    if(HDstrcmp(objname, "/A/B/C")) TEST_ERROR
+    if (H5Iget_name(gidABC, objname, (size_t)NAME_BUF_SIZE) < 0)
+        FAIL_STACK_ERROR
+    if (HDstrcmp(objname, "/A/B/C") != 0)
+        TEST_ERROR
 
     /* Close object in mounted file */
-    if(H5Gclose(gidABC) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(gidABC) < 0)
+        FAIL_STACK_ERROR
 
     /* Open group in original file through softlink */
-    if((gidABT = H5Gopen2(gidAB, "T", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((gidABT = H5Gopen2(gidAB, "T", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name(gidABT, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
-    if(HDstrcmp(objname, "/A/B/T")) TEST_ERROR
+    if (H5Iget_name(gidABT, objname, (size_t)NAME_BUF_SIZE) < 0)
+        FAIL_STACK_ERROR
+    if (HDstrcmp(objname, "/A/B/T") != 0)
+        TEST_ERROR
 
     /* Close object in original file */
-    if(H5Gclose(gidABT) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(gidABT) < 0)
+        FAIL_STACK_ERROR
 
     /* Open "normal" dataset in mounted file */
-    if((didABMXYD = H5Dopen2(gidAB, "M/X/Y/D", H5P_DEFAULT)) < 0) FAIL_STACK_ERROR
+    if ((didABMXYD = H5Dopen2(gidAB, "M/X/Y/D", H5P_DEFAULT)) < 0)
+        FAIL_STACK_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name(didABMXYD, objname, (size_t)NAME_BUF_SIZE) < 0) FAIL_STACK_ERROR
-    if(HDstrcmp(objname, "/A/B/M/X/Y/D")) TEST_ERROR
+    if (H5Iget_name(didABMXYD, objname, (size_t)NAME_BUF_SIZE) < 0)
+        FAIL_STACK_ERROR
+    if (HDstrcmp(objname, "/A/B/M/X/Y/D") != 0)
+        TEST_ERROR
 
     /* Close object in mounted file */
-    if(H5Dclose(didABMXYD) < 0) FAIL_STACK_ERROR
+    if (H5Dclose(didABMXYD) < 0)
+        FAIL_STACK_ERROR
 
-    if(H5Gclose(gidAB) < 0) FAIL_STACK_ERROR
-    if(H5Fclose(fid2) < 0) FAIL_STACK_ERROR
+    if (H5Gclose(gidAB) < 0)
+        FAIL_STACK_ERROR
+    if (H5Fclose(fid2) < 0)
+        FAIL_STACK_ERROR
 
     /* Shut down */
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Sclose(sid);
-	H5Dclose(did);
-	H5Gclose(didABMXYD);
-	H5Gclose(gidABT);
-	H5Gclose(gidABC);
-	H5Gclose(gidABMX);
-	H5Gclose(gidXY);
-	H5Gclose(gidX);
-	H5Gclose(gidABM);
-	H5Gclose(gidAB);
-	H5Gclose(gidA);
-	H5Fclose(fid1);
+    H5E_BEGIN_TRY
+    {
+        H5Sclose(sid);
+        H5Dclose(did);
+        H5Gclose(didABMXYD);
+        H5Gclose(gidABT);
+        H5Gclose(gidABC);
+        H5Gclose(gidABMX);
+        H5Gclose(gidXY);
+        H5Gclose(gidX);
+        H5Gclose(gidABM);
+        H5Gclose(gidAB);
+        H5Gclose(gidA);
+        H5Fclose(fid1);
         H5Fclose(fid2);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_mount_after_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_mount_after_unmount
  *
@@ -1420,21 +1685,18 @@ error:
 static int
 test_mount_after_unmount(hid_t fapl)
 {
-    hid_t	fid1=-1, fid2=-1, fid3=-1, fid4=-1;      /* File IDs */
-    hid_t       gidA=-1, gidB=-1, gidX=-1, gidY=-1, gidZ=-1;  	/* Group identifiers */
-    hid_t       gidBM=-1;  			/* Group identifiers */
-    hid_t       gidBMZ=-1;  			/* Group identifiers */
-    hid_t       gidAM=-1;  			/* Group identifiers */
-    hid_t       gidAMX=-1;  			/* Group identifiers */
-    hid_t       gidAMXX=-1;  			/* Group identifiers */
-    hid_t       gidAMXMY=-1;  			/* Group identifiers */
-    hid_t       gidXM=-1;  			/* Group identifiers */
-    hid_t       gidXX=-1;  			/* Group identifiers */
-    char	filename1[1024],
-		filename2[1024],
-		filename3[1024],
-		filename4[1024];       		/* Name of files to mount */
-    char        objname[NAME_BUF_SIZE];                 /* Name of object opened */
+    hid_t fid1 = -1, fid2 = -1, fid3 = -1, fid4 = -1;                         /* File IDs */
+    hid_t gidA = -1, gidB = -1, gidX = -1, gidY = -1, gidZ = -1;              /* Group identifiers */
+    hid_t gidBM    = -1;                                                      /* Group identifiers */
+    hid_t gidBMZ   = -1;                                                      /* Group identifiers */
+    hid_t gidAM    = -1;                                                      /* Group identifiers */
+    hid_t gidAMX   = -1;                                                      /* Group identifiers */
+    hid_t gidAMXX  = -1;                                                      /* Group identifiers */
+    hid_t gidAMXMY = -1;                                                      /* Group identifiers */
+    hid_t gidXM    = -1;                                                      /* Group identifiers */
+    hid_t gidXX    = -1;                                                      /* Group identifiers */
+    char  filename1[1024], filename2[1024], filename3[1024], filename4[1024]; /* Name of files to mount */
+    char  objname[NAME_BUF_SIZE];                                             /* Name of object opened */
 
     TESTING("mounting after file is unmounted");
     h5_fixname(FILENAME[0], fapl, filename1, sizeof filename1);
@@ -1443,205 +1705,204 @@ test_mount_after_unmount(hid_t fapl)
     h5_fixname(FILENAME[3], fapl, filename4, sizeof filename4);
 
     /* Create first file and some groups in it. */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gidAM = H5Gcreate2(gidA, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gcreate2(gidA, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
-    if((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gidBM = H5Gcreate2(gidB, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidBM = H5Gcreate2(gidB, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidBM) < 0)
+    if (H5Gclose(gidBM) < 0)
         TEST_ERROR
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-   /* Create second file and a group in it. */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    /* Create second file and a group in it. */
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR
-    if((gidX = H5Gcreate2(fid2, "/X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidX = H5Gcreate2(fid2, "/X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gidXM = H5Gcreate2(gidX, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidXM = H5Gcreate2(gidX, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidXM) < 0)
+    if (H5Gclose(gidXM) < 0)
         TEST_ERROR
-    if((gidXX = H5Gcreate2(gidX, "X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidXX = H5Gcreate2(gidX, "X", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidXX) < 0)
+    if (H5Gclose(gidXX) < 0)
         TEST_ERROR
-    if(H5Gclose(gidX) < 0)
+    if (H5Gclose(gidX) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-   /* Create third file and a group in it. */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    /* Create third file and a group in it. */
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR
-    if((gidY = H5Gcreate2(fid3, "/Y", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidY = H5Gcreate2(fid3, "/Y", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidY) < 0)
+    if (H5Gclose(gidY) < 0)
         TEST_ERROR
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
-   /* Create fourth file and a group in it. */
-    if((fid4 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    /* Create fourth file and a group in it. */
+    if ((fid4 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
         TEST_ERROR
-    if((gidZ = H5Gcreate2(fid4, "/Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidZ = H5Gcreate2(fid4, "/Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidZ) < 0)
+    if (H5Gclose(gidZ) < 0)
         TEST_ERROR
-    if(H5Fclose(fid4) < 0)
+    if (H5Fclose(fid4) < 0)
         TEST_ERROR
 
+    /* Beginning of the actual test code */
 
-/* Beginning of the actual test code */
-
-   /*
-    * Reopen all three files
-    */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0)
+    /*
+     * Reopen all three files
+     */
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDWR, fapl)) < 0)
         TEST_ERROR
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDWR, fapl)) < 0)
         TEST_ERROR
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDWR, fapl)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDWR, fapl)) < 0)
         TEST_ERROR
-    if((fid4 = H5Fopen(filename4, H5F_ACC_RDWR, fapl)) < 0)
+    if ((fid4 = H5Fopen(filename4, H5F_ACC_RDWR, fapl)) < 0)
         TEST_ERROR
 
-   /*
-    *  Open /A & /B to use as a mount points
-    */
-    if((gidA = H5Gopen2(fid1, "/A", H5P_DEFAULT)) < 0)
+    /*
+     *  Open /A & /B to use as a mount points
+     */
+    if ((gidA = H5Gopen2(fid1, "/A", H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gidB = H5Gopen2(fid1, "/B", H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gopen2(fid1, "/B", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-   /*
-    * Mount second file on /A/M in the first file.
-    */
-    if(H5Fmount(gidA, "M", fid2, H5P_DEFAULT) < 0)
+    /*
+     * Mount second file on /A/M in the first file.
+     */
+    if (H5Fmount(gidA, "M", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
     /* (This shows we successfully mounted) */
-    if((gidAMXX = H5Gopen2(gidA, "M/X/X", H5P_DEFAULT)) < 0)
+    if ((gidAMXX = H5Gopen2(gidA, "M/X/X", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name( gidAMXX, objname, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidAMXX, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(objname, "/A/M/X/X"))
+    if (HDstrcmp(objname, "/A/M/X/X") != 0)
         TEST_ERROR
 
     /* Open group in mounted file #2 */
-    if((gidAMX = H5Gopen2(gidA, "M/X", H5P_DEFAULT)) < 0)
+    if ((gidAMX = H5Gopen2(gidA, "M/X", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount third file */
-    if(H5Fmount(gidAMX, "M", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidAMX, "M", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file #3 */
     /* (This shows we successfully mounted) */
-    if((gidAMXMY = H5Gopen2(gidAMX, "M/Y", H5P_DEFAULT)) < 0)
+    if ((gidAMXMY = H5Gopen2(gidAMX, "M/Y", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidAMXMY, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(objname, "/A/M/X/M/Y"))
+    if (HDstrcmp(objname, "/A/M/X/M/Y") != 0)
         TEST_ERROR
 
     /* Unmount second file */
-    if(H5Funmount(fid1, "/A/M") < 0)
-	TEST_ERROR
+    if (H5Funmount(fid1, "/A/M") < 0)
+        TEST_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidAMXMY, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(objname, "/X/M/Y"))
+    if (HDstrcmp(objname, "/X/M/Y") != 0)
         TEST_ERROR
 
-    /* Rename object in file #3 that is "disconnected" from name hiearchy */
+    /* Rename object in file #3 that is "disconnected" from name hierarchy */
     /* (It is "disconnected" because it's parent file has been unmounted) */
-    if(H5Lmove(gidAMX,"M/Y",gidAMX,"M/Z", H5P_DEFAULT, H5P_DEFAULT) < 0)
-	TEST_ERROR
+    if (H5Lmove(gidAMX, "M/Y", gidAMX, "M/Z", H5P_DEFAULT, H5P_DEFAULT) < 0)
+        TEST_ERROR
 
     /* Close group in file #3 */
-    if(H5Gclose(gidAMXMY) < 0)
-	TEST_ERROR
+    if (H5Gclose(gidAMXMY) < 0)
+        TEST_ERROR
 
     /* Re-open group in file #3 */
-    if((gidAMXMY = H5Gopen2(gidAMX, "M/Z", H5P_DEFAULT)) < 0)
+    if ((gidAMXMY = H5Gopen2(gidAMX, "M/Z", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name again */
     *objname = '\0';
-    if(H5Iget_name( gidAMXMY, objname, (size_t)NAME_BUF_SIZE ) < 0)
-	TEST_ERROR
-    if(HDstrcmp(objname, "/X/M/Z"))
-	TEST_ERROR
+    if (H5Iget_name(gidAMXMY, objname, (size_t)NAME_BUF_SIZE) < 0)
+        TEST_ERROR
+    if (HDstrcmp(objname, "/X/M/Z") != 0)
+        TEST_ERROR
 
     /* Mount fourth file */
-    if(H5Fmount(gidB, "M", fid4, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidB, "M", fid4, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
     /* (This shows we successfully mounted) */
-    if((gidBMZ = H5Gopen2(gidB, "M/Z", H5P_DEFAULT)) < 0)
+    if ((gidBMZ = H5Gopen2(gidB, "M/Z", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *objname = '\0';
-    if(H5Iget_name( gidBMZ, objname, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidBMZ, objname, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(objname, "/B/M/Z"))
+    if (HDstrcmp(objname, "/B/M/Z") != 0)
         TEST_ERROR
 
     /* Unmount third file */
     if (H5Funmount(fid2, "/X/M") < 0)
-	TEST_ERROR
+        TEST_ERROR
 
     /* Unmount fourth file */
     if (H5Funmount(fid1, "/B/M") < 0)
-	TEST_ERROR
+        TEST_ERROR
 
     /* Close objects in mounted files */
-    if(H5Gclose(gidBMZ) < 0)
-	TEST_ERROR
-    if(H5Gclose(gidAMXMY) < 0)
-	TEST_ERROR
-    if(H5Gclose(gidAMXX) < 0)
-	TEST_ERROR
-    if(H5Gclose(gidAMX) < 0)
-	TEST_ERROR
+    if (H5Gclose(gidBMZ) < 0)
+        TEST_ERROR
+    if (H5Gclose(gidAMXMY) < 0)
+        TEST_ERROR
+    if (H5Gclose(gidAMXX) < 0)
+        TEST_ERROR
+    if (H5Gclose(gidAMX) < 0)
+        TEST_ERROR
 
     /* Close objects in original file */
-    if(H5Gclose(gidB) < 0)
-	TEST_ERROR
-    if(H5Gclose(gidA) < 0)
-	TEST_ERROR
+    if (H5Gclose(gidB) < 0)
+        TEST_ERROR
+    if (H5Gclose(gidA) < 0)
+        TEST_ERROR
 
     /* Close files */
-    if(H5Fclose(fid4) < 0)
+    if (H5Fclose(fid4) < 0)
         TEST_ERROR
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Shut down */
@@ -1649,29 +1910,30 @@ test_mount_after_unmount(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidZ);
-	H5Gclose(gidY);
-	H5Gclose(gidXX);
-	H5Gclose(gidXM);
-	H5Gclose(gidX);
-	H5Gclose(gidBMZ);
-	H5Gclose(gidBM);
-	H5Gclose(gidB);
-	H5Gclose(gidAMXMY);
-	H5Gclose(gidAMXX);
-	H5Gclose(gidAMX);
-	H5Gclose(gidAM);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidZ);
+        H5Gclose(gidY);
+        H5Gclose(gidXX);
+        H5Gclose(gidXM);
+        H5Gclose(gidX);
+        H5Gclose(gidBMZ);
+        H5Gclose(gidBM);
+        H5Gclose(gidB);
+        H5Gclose(gidAMXMY);
+        H5Gclose(gidAMXX);
+        H5Gclose(gidAMX);
+        H5Gclose(gidAM);
+        H5Gclose(gidA);
         H5Fclose(fid4);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 }
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_missing_unmount
  *
@@ -1692,12 +1954,10 @@ error:
 static int
 test_missing_unmount(hid_t fapl)
 {
-    hid_t fid1=-1, fid2=-1, fid3=-1;    /* File IDs */
-    hid_t gidA=-1, gidE=-1, gidM=-1;    /* Group IDs */
-    hid_t gidAE=-1, gidAEM=-1;          /* Group IDs */
-    char	filename1[1024],
-		filename2[1024],
-		filename3[1024]; 	/* Name of files to mount */
+    hid_t fid1 = -1, fid2 = -1, fid3 = -1;                   /* File IDs */
+    hid_t gidA = -1, gidE = -1, gidM = -1;                   /* Group IDs */
+    hid_t gidAE = -1, gidAEM = -1;                           /* Group IDs */
+    char  filename1[1024], filename2[1024], filename3[1024]; /* Name of files to mount */
 
     TESTING("missing unmount");
 
@@ -1706,107 +1966,104 @@ test_missing_unmount(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidE) < 0)
+    if (H5Gclose(gidE) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create file #3 */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid3, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid3, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 and file #3 in file #2 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAE = H5Gopen2(fid2, "A/E", H5P_DEFAULT)) < 0)
+    if ((gidAE = H5Gopen2(fid2, "A/E", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Fmount(gidAE, ".", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidAE, ".", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAEM = H5Gopen2(fid3, "A/E/M", H5P_DEFAULT)) < 0)
+    if ((gidAEM = H5Gopen2(fid3, "A/E/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #3 */
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* (Still have all file #2 & #3 mounted and groups open in all three files) */
 
     /* Unmount file #2 & #3 */
-    if(H5Funmount(gidAE,".") < 0)
+    if (H5Funmount(gidAE, ".") < 0)
         TEST_ERROR
 
     /* Skip unmounting file #2 from file #1 */
 
     /* Close groups in mounted file */
-    if(H5Gclose(gidAEM) < 0)
+    if (H5Gclose(gidAEM) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidAE) < 0)
+    if (H5Gclose(gidAE) < 0)
         TEST_ERROR
 
     /* Close group in top file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -1814,20 +2071,21 @@ test_missing_unmount(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidM);
-	H5Gclose(gidE);
-	H5Gclose(gidAEM);
-	H5Gclose(gidAE);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidM);
+        H5Gclose(gidE);
+        H5Gclose(gidAEM);
+        H5Gclose(gidAE);
+        H5Gclose(gidA);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_missing_unmount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_hold_open_file
  *
@@ -1848,10 +2106,9 @@ error:
 static int
 test_hold_open_file(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;           	/* File IDs */
-    hid_t gidA = -1, gidM = -1, gidAM = -1;    	/* Group IDs */
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
+    hid_t fid1 = -1, fid2 = -1;             /* File IDs */
+    hid_t gidA = -1, gidM = -1, gidAM = -1; /* Group IDs */
+    char  filename1[1024], filename2[1024]; /* Name of files to mount */
 
     TESTING("hold open w/file");
 
@@ -1859,89 +2116,87 @@ test_hold_open_file(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Attempt to open group in mounted file */
     /* (Should work because file is still mounted) */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Attempt to open group in mounted file */
     /* (Should work because file is still mounted) */
-    if((gidAM = H5Gopen2(gidA, "/A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(gidA, "/A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Unmount file #2 */
-    if(H5Funmount(gidA, ".") < 0)
+    if (H5Funmount(gidA, ".") < 0)
         TEST_ERROR
 
     /* Close group in top file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -1949,17 +2204,18 @@ test_hold_open_file(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidM);
-	H5Gclose(gidAM);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidM);
+        H5Gclose(gidAM);
+        H5Gclose(gidA);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_hold_open_file() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_hold_open_group
  *
@@ -1980,10 +2236,9 @@ error:
 static int
 test_hold_open_group(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;           	/* File IDs */
-    hid_t gid = -1, gidA = -1, gidM = -1, gidAM = -1, gidAM2 = -1;    	/* Group IDs */
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
+    hid_t fid1 = -1, fid2 = -1;                                    /* File IDs */
+    hid_t gid = -1, gidA = -1, gidM = -1, gidAM = -1, gidAM2 = -1; /* Group IDs */
+    char  filename1[1024], filename2[1024];                        /* Name of files to mount */
 
     TESTING("hold open w/group");
 
@@ -1991,113 +2246,111 @@ test_hold_open_group(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close group in parent file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Keep fid1 & gidAM open, everything else closed */
 
     /* Retry to opening group in mounted file */
     /* (Should work because file is still mounted) */
-    if((gidAM2 = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM2 = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM2) < 0)
+    if (H5Gclose(gidAM2) < 0)
         TEST_ERROR
 
     /* Close original group in mount file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Attempt to open group in mounted file */
     /* (Should work because file is still mounted) */
-    if((gidAM2 = H5Gopen2(fid1, "/A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM2 = H5Gopen2(fid1, "/A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Get ID of file #2 */
-    if((fid2 = H5Iget_file_id(gidAM2)) < 0)
+    if ((fid2 = H5Iget_file_id(gidAM2)) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM2) < 0)
+    if (H5Gclose(gidAM2) < 0)
         TEST_ERROR
 
     /* Attempt to open group in mounted file */
     /* (Should work because file is still mounted) */
-    if((gidAM2 = H5Gopen2(fid2, "/A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM2 = H5Gopen2(fid2, "/A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Attempt to open group in parent file */
     /* (Should work because files should be mounted together) */
-    if((gid = H5Gopen2(gidAM2, "/", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(gidAM2, "/", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM2) < 0)
+    if (H5Gclose(gidAM2) < 0)
         TEST_ERROR
 
     /* Close group in parent file */
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2105,19 +2358,20 @@ test_hold_open_group(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidM);
-	H5Gclose(gidAM);
-	H5Gclose(gidAM2);
-	H5Gclose(gidA);
-	H5Gclose(gid);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidM);
+        H5Gclose(gidAM);
+        H5Gclose(gidAM2);
+        H5Gclose(gidA);
+        H5Gclose(gid);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_hold_open_group() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_fcdegree_same
  *
@@ -2138,12 +2392,11 @@ error:
 static int
 test_fcdegree_same(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;           	/* File IDs */
-    hid_t gidA = -1, gidM = -1, gidAM = -1;    	/* Group IDs */
-    hid_t fapl_id = -1;                         /* FAPL IDs */
-    herr_t ret;                                 /* Generic return value */
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
+    hid_t  fid1 = -1, fid2 = -1;             /* File IDs */
+    hid_t  gidA = -1, gidM = -1, gidAM = -1; /* Group IDs */
+    hid_t  fapl_id = -1;                     /* FAPL IDs */
+    herr_t ret;                              /* Generic return value */
+    char   filename1[1024], filename2[1024]; /* Name of files to mount */
 
     TESTING("file close degrees must be same");
 
@@ -2151,98 +2404,98 @@ test_fcdegree_same(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create FAPL & set file close degree for file #2 to be different */
-    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         TEST_ERROR
 
     /* Set file close mode to H5F_CLOSE_STRONG */
-    if(H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG) < 0)
+    if (H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
     /* Try mounting file with different file close degree (should fail) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         ret = H5Fmount(gidA, ".", fid2, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(ret >= 0)
+    }
+    H5E_END_TRY;
+    if (ret >= 0)
         TEST_ERROR
 
     /* Set file close mode to H5F_CLOSE_WEAK */
-    if(H5Pset_fclose_degree(fapl_id, H5F_CLOSE_WEAK) < 0)
+    if (H5Pset_fclose_degree(fapl_id, H5F_CLOSE_WEAK) < 0)
         TEST_ERROR
 
     /* Close file #2 & re-open with same file close degree as file #1 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
     /* Try mounting files again (should work now) */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Verify opening group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Close group in parent file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Close FAPL ID */
-    if(H5Pclose(fapl_id) < 0)
+    if (H5Pclose(fapl_id) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2250,18 +2503,19 @@ test_fcdegree_same(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(fapl_id);
-	H5Gclose(gidM);
-	H5Gclose(gidAM);
-	H5Gclose(gidA);
+        H5Gclose(gidM);
+        H5Gclose(gidAM);
+        H5Gclose(gidA);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_fcdegree_same() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_fcdegree_semi
  *
@@ -2282,12 +2536,11 @@ error:
 static int
 test_fcdegree_semi(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;           	/* File IDs */
-    hid_t gidA = -1, gidM = -1, gidAM = -1;    	/* Group IDs */
-    hid_t fapl_id = -1;                         /* FAPL IDs */
-    herr_t ret;                                 /* Generic return value */
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
+    hid_t  fid1 = -1, fid2 = -1;             /* File IDs */
+    hid_t  gidA = -1, gidM = -1, gidAM = -1; /* Group IDs */
+    hid_t  fapl_id = -1;                     /* FAPL IDs */
+    herr_t ret;                              /* Generic return value */
+    char   filename1[1024], filename2[1024]; /* Name of files to mount */
 
     TESTING("'semi' file close degree");
 
@@ -2295,95 +2548,97 @@ test_fcdegree_semi(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create FAPL & set file close degree to be "semi" */
-    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         TEST_ERROR
 
     /* Set file close mode to H5F_CLOSE_SEMI */
-    if(H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI) < 0)
+    if (H5Pset_fclose_degree(fapl_id, H5F_CLOSE_SEMI) < 0)
         TEST_ERROR
 
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Verify opening group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #1 (should succeed, since file #2 is open still) */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Try closing file #2 (should fail, since there are still objects open) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         ret = H5Fclose(fid2);
-    } H5E_END_TRY;
-    if(ret >= 0)
+    }
+    H5E_END_TRY;
+    if (ret >= 0)
         TEST_ERROR
 
     /* Close group in parent file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Try closing file #2 (should still fail, since there are still objects open in child file) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         ret = H5Fclose(fid2);
-    } H5E_END_TRY;
-    if(ret >= 0)
+    }
+    H5E_END_TRY;
+    if (ret >= 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Close file #2 (should succeed now) */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close FAPL ID */
-    if(H5Pclose(fapl_id) < 0)
+    if (H5Pclose(fapl_id) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2391,18 +2646,19 @@ test_fcdegree_semi(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(fapl_id);
-	H5Gclose(gidM);
-	H5Gclose(gidAM);
-	H5Gclose(gidA);
+        H5Gclose(gidM);
+        H5Gclose(gidAM);
+        H5Gclose(gidA);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_fcdegree_semi() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_fcdegree_strong
  *
@@ -2423,13 +2679,12 @@ error:
 static int
 test_fcdegree_strong(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;           	/* File IDs */
-    hid_t gidA = -1, gidM = -1, gidAM = -1;    	/* Group IDs */
-    hid_t fapl_id = -1;                         /* FAPL IDs */
-    H5O_info_t  oinfo;
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
-    herr_t ret;                                 /* Generic return value */
+    hid_t       fid1 = -1, fid2 = -1;             /* File IDs */
+    hid_t       gidA = -1, gidM = -1, gidAM = -1; /* Group IDs */
+    hid_t       fapl_id = -1;                     /* FAPL IDs */
+    H5O_info2_t oinfo;
+    char        filename1[1024], filename2[1024]; /* Name of files to mount */
+    herr_t      ret;                              /* Generic return value */
 
     TESTING("'strong' file close degree");
 
@@ -2437,91 +2692,93 @@ test_fcdegree_strong(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create FAPL & set file close degree to be "strong" */
-    if((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
+    if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0)
         TEST_ERROR
 
     /* Set file close mode to H5F_CLOSE_STRONG */
-    if(H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG) < 0)
+    if (H5Pset_fclose_degree(fapl_id, H5F_CLOSE_STRONG) < 0)
         TEST_ERROR
 
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, fapl_id)) < 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Check that objects are still open */
-    if(H5Oget_info2(gidA, &oinfo, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(gidA, &oinfo, H5O_INFO_BASIC) < 0)
         TEST_ERROR
-    if(H5Oget_info2(gidAM, &oinfo, H5O_INFO_BASIC) < 0)
+    if (H5Oget_info3(gidAM, &oinfo, H5O_INFO_BASIC) < 0)
         TEST_ERROR
 
     /* Close file #2 (should close open objects also) */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Check that objects are closed */
-    H5E_BEGIN_TRY {
-        ret = H5Oget_info2(gidA, &oinfo, H5O_INFO_BASIC);
-    } H5E_END_TRY;
-    if(ret >= 0)
+    H5E_BEGIN_TRY
+    {
+        ret = H5Oget_info3(gidA, &oinfo, H5O_INFO_BASIC);
+    }
+    H5E_END_TRY;
+    if (ret >= 0)
         TEST_ERROR
-    H5E_BEGIN_TRY {
-        ret = H5Oget_info2(gidAM, &oinfo, H5O_INFO_BASIC);
-    } H5E_END_TRY;
-    if(ret >= 0)
+    H5E_BEGIN_TRY
+    {
+        ret = H5Oget_info3(gidAM, &oinfo, H5O_INFO_BASIC);
+    }
+    H5E_END_TRY;
+    if (ret >= 0)
         TEST_ERROR
 
     /* Close FAPL ID */
-    if(H5Pclose(fapl_id) < 0)
+    if (H5Pclose(fapl_id) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2529,18 +2786,19 @@ test_fcdegree_strong(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         H5Pclose(fapl_id);
-	H5Gclose(gidM);
-	H5Gclose(gidAM);
-	H5Gclose(gidA);
+        H5Gclose(gidM);
+        H5Gclose(gidAM);
+        H5Gclose(gidA);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_fcdegree_strong() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_acc_perm
  *
@@ -2563,13 +2821,11 @@ error:
 static int
 test_acc_perm(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1, fid3 = -1;           	/* File IDs */
-    hid_t gidA = -1, gidB = -1, gidC = -1, gidM = -1, gidAM = -1, gidAMZ = -1;    	/* Group IDs */
-    hid_t bad_id = -1;                          /* Bad ID from object create */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    char	filename1[1024],
-		filename2[1024],
-		filename3[1024]; 	/* Name of files to mount */
+    hid_t fid1 = -1, fid2 = -1, fid3 = -1;                                     /* File IDs */
+    hid_t gidA = -1, gidB = -1, gidC = -1, gidM = -1, gidAM = -1, gidAMZ = -1; /* Group IDs */
+    hid_t bad_id = -1;                                                         /* Bad ID from object create */
+    char  name[NAME_BUF_SIZE];                               /* Buffer for filename retrieved */
+    char  filename1[1024], filename2[1024], filename3[1024]; /* Name of files to mount */
 
     TESTING("access permissions");
 
@@ -2578,152 +2834,154 @@ test_acc_perm(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Get and verify file name */
-    if(H5Fget_name(gidA, name, NAME_BUF_SIZE) < 0)
+    if (H5Fget_name(gidA, name, NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, filename1) != 0)
+    if (HDstrcmp(name, filename1) != 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Get and verify file name */
-    if(H5Fget_name(fid2, name, NAME_BUF_SIZE) < 0)
+    if (H5Fget_name(fid2, name, NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, filename2) != 0)
+    if (HDstrcmp(name, filename2) != 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Get and verify file name */
-    if(H5Fget_name(fid2, name, NAME_BUF_SIZE) < 0)
+    if (H5Fget_name(fid2, name, NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, filename2) != 0)
+    if (HDstrcmp(name, filename2) != 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Get and verify file name */
-    if(H5Fget_name(gidAM, name, NAME_BUF_SIZE) < 0)
+    if (H5Fget_name(gidAM, name, NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, filename2) != 0)
+    if (HDstrcmp(name, filename2) != 0)
         TEST_ERROR
 
     /* Attempt to create objects in read only file (should fail) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         bad_id = H5Gcreate2(gidAM, "Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(bad_id >= 0)
+    }
+    H5E_END_TRY;
+    if (bad_id >= 0)
         TEST_ERROR
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(bad_id >= 0)
+    }
+    H5E_END_TRY;
+    if (bad_id >= 0)
         TEST_ERROR
 
     /* Attempt to create objects in read/write file (should succeed) */
-    if((gidB = H5Gcreate2(fid2, "/B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gcreate2(fid2, "/B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
 
     /* (Note that this object should get created in the "hidden" group for "A" in parent file) */
-    if((gidC = H5Gcreate2(gidA, "C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidC = H5Gcreate2(gidA, "C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidC) < 0)
+    if (H5Gclose(gidC) < 0)
         TEST_ERROR
 
     /* Create file #3 (it will have R/W permissions) */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #3 on file #2 */
-    if(H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Attempt to create objects in read/write file (should succeed) */
-    if((gidAMZ = H5Gcreate2(fid1, "/A/M/Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidAMZ = H5Gcreate2(fid1, "/A/M/Z", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Get and verify file name */
-    if(H5Fget_name(gidAMZ, name, NAME_BUF_SIZE) < 0)
+    if (H5Fget_name(gidAMZ, name, NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, filename3) != 0)
+    if (HDstrcmp(name, filename3) != 0)
         TEST_ERROR
 
     /* Close object in file #3 */
-    if(H5Gclose(gidAMZ) < 0)
+    if (H5Gclose(gidAMZ) < 0)
         TEST_ERROR
 
-
     /* Attempt to create objects in read only file again (should fail) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         bad_id = H5Gcreate2(fid1, "/A/L", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(bad_id >= 0)
+    }
+    H5E_END_TRY;
+    if (bad_id >= 0)
         TEST_ERROR
 
     /* Close group in mounted file */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Close group in parent file */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Close file #3 */
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2731,21 +2989,22 @@ test_acc_perm(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidM);
-	H5Gclose(gidAMZ);
-	H5Gclose(gidAM);
-	H5Gclose(gidC);
-	H5Gclose(gidB);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidM);
+        H5Gclose(gidAMZ);
+        H5Gclose(gidAM);
+        H5Gclose(gidC);
+        H5Gclose(gidB);
+        H5Gclose(gidA);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_acc_perm() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_mult_mount
  *
@@ -2766,14 +3025,12 @@ error:
 static int
 test_mult_mount(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1, fid3 = -1, fid3_2 = -1;	/* File IDs */
-    hid_t gidA = -1, gidB = -1;         /* Group IDs in file #1 */
-    hid_t gidM = -1, gidN = -1, gidAM = -1;         /* Group IDs in file #2 */
-    hid_t gidS = -1, gidT = -1, gidU = -1, gidBS = -1, gidAMT = -1;	/* Group IDs in file #3 */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    char	filename1[1024],
-		filename2[1024],
-		filename3[1024]; 	/* Name of files to mount */
+    hid_t fid1 = -1, fid2 = -1, fid3 = -1, fid3_2 = -1;             /* File IDs */
+    hid_t gidA = -1, gidB = -1;                                     /* Group IDs in file #1 */
+    hid_t gidM = -1, gidN = -1, gidAM = -1;                         /* Group IDs in file #2 */
+    hid_t gidS = -1, gidT = -1, gidU = -1, gidBS = -1, gidAMT = -1; /* Group IDs in file #3 */
+    char  name[NAME_BUF_SIZE];                                      /* Buffer for filename retrieved */
+    char  filename1[1024], filename2[1024], filename3[1024];        /* Name of files to mount */
 
     TESTING("multiple mounts");
 
@@ -2782,171 +3039,167 @@ test_mult_mount(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if((gidN = H5Gcreate2(fid2, "N", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidN = H5Gcreate2(fid2, "N", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidN) < 0)
+    if (H5Gclose(gidN) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create file #3 */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidS = H5Gcreate2(fid3, "S", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidS = H5Gcreate2(fid3, "S", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidS) < 0)
+    if (H5Gclose(gidS) < 0)
         TEST_ERROR
 
-    if((gidT = H5Gcreate2(fid3, "T", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidT = H5Gcreate2(fid3, "T", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidT) < 0)
+    if (H5Gclose(gidT) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidB = H5Gopen2(fid1, "B", H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gopen2(fid1, "B", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Open file #3 again */
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #3 on file #2 */
-    if(H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Re-open file #3 */
-    if((fid3_2 = H5Freopen(fid3)) < 0)
+    if ((fid3_2 = H5Freopen(fid3)) < 0)
         TEST_ERROR
 
     /* Mount file #3 on file #1 also */
-    if(H5Fmount(gidB, ".", fid3_2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidB, ".", fid3_2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #2 mount path */
-    if((gidAMT = H5Gopen2(fid1, "A/M/T", H5P_DEFAULT)) < 0)
+    if ((gidAMT = H5Gopen2(fid1, "A/M/T", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if(H5Iget_name(gidAMT, name, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidAMT, name, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, "/A/M/T"))
+    if (HDstrcmp(name, "/A/M/T") != 0)
         TEST_ERROR
 
     /* Create object in file #3 */
-    if((gidU = H5Gcreate2(gidAMT, "U", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidU = H5Gcreate2(gidAMT, "U", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidU) < 0)
+    if (H5Gclose(gidU) < 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #1 mount path */
-    if((gidBS = H5Gopen2(fid1, "B/S", H5P_DEFAULT)) < 0)
+    if ((gidBS = H5Gopen2(fid1, "B/S", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if(H5Iget_name(gidBS, name, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidBS, name, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, "/B/S"))
+    if (HDstrcmp(name, "/B/S") != 0)
         TEST_ERROR
 
     /* Re-open object created in file #3 through file #1 mount path */
-    if((gidU = H5Gopen2(gidBS, "/B/T/U", H5P_DEFAULT)) < 0)
+    if ((gidU = H5Gopen2(gidBS, "/B/T/U", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidU) < 0)
+    if (H5Gclose(gidU) < 0)
         TEST_ERROR
 
     /* Close groups in file #3 */
-    if(H5Gclose(gidBS) < 0)
+    if (H5Gclose(gidBS) < 0)
         TEST_ERROR
-    if(H5Gclose(gidAMT) < 0)
+    if (H5Gclose(gidAMT) < 0)
         TEST_ERROR
 
     /* Close group in file #2 */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Close groups in file #1 */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
 
     /* Close file #3 IDs */
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
-    if(H5Fclose(fid3_2) < 0)
+    if (H5Fclose(fid3_2) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -2954,26 +3207,27 @@ test_mult_mount(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidU);
-	H5Gclose(gidAMT);
-	H5Gclose(gidT);
-	H5Gclose(gidBS);
-	H5Gclose(gidS);
-	H5Gclose(gidAM);
-	H5Gclose(gidN);
-	H5Gclose(gidM);
-	H5Gclose(gidB);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidU);
+        H5Gclose(gidAMT);
+        H5Gclose(gidT);
+        H5Gclose(gidBS);
+        H5Gclose(gidS);
+        H5Gclose(gidAM);
+        H5Gclose(gidN);
+        H5Gclose(gidM);
+        H5Gclose(gidB);
+        H5Gclose(gidA);
         H5Fclose(fid3_2);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_mult_mount() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_nested_survive
  *
@@ -2994,15 +3248,13 @@ error:
 static int
 test_nested_survive(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1, fid3 = -1;	/* File IDs */
-    hid_t gidA = -1;                    /* Group IDs in file #1 */
-    hid_t gidM = -1, gidAM = -1;        /* Group IDs in file #2 */
-    hid_t gidS = -1, gidMS = -1, gidAMS = -1;	/* Group IDs in file #3 */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    ssize_t name_len;                   /* Filename length */
-    char	filename1[1024],
-		filename2[1024],
-		filename3[1024]; 	/* Name of files to mount */
+    hid_t   fid1 = -1, fid2 = -1, fid3 = -1;                   /* File IDs */
+    hid_t   gidA = -1;                                         /* Group IDs in file #1 */
+    hid_t   gidM = -1, gidAM = -1;                             /* Group IDs in file #2 */
+    hid_t   gidS = -1, gidMS = -1, gidAMS = -1;                /* Group IDs in file #3 */
+    char    name[NAME_BUF_SIZE];                               /* Buffer for filename retrieved */
+    ssize_t name_len;                                          /* Filename length */
+    char    filename1[1024], filename2[1024], filename3[1024]; /* Name of files to mount */
 
     TESTING("nested mounts survive");
 
@@ -3011,163 +3263,161 @@ test_nested_survive(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create file #3 */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidS = H5Gcreate2(fid3, "S", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidS = H5Gcreate2(fid3, "S", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidS) < 0)
+    if (H5Gclose(gidS) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidAM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Open file #3 again */
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #3 on file #2 */
-    if(H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidAM, ".", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #1 mount path */
-    if((gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT)) < 0)
+    if ((gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in file #3 */
-    if(H5Gclose(gidAMS) < 0)
+    if (H5Gclose(gidAMS) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/A/M"))
+    if (name_len == 0 || HDstrcmp(name, "/A/M") != 0)
         TEST_ERROR
 
     /* Unmount file #2 from file #1 */
-    if(H5Funmount(gidA, ".") < 0)
+    if (H5Funmount(gidA, ".") < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidAM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len != 0 || HDstrcmp(name, ""))
+    if (name_len != 0 || HDstrcmp(name, "") != 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #1 mount path (should fail) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(gidAMS >= 0)
+    }
+    H5E_END_TRY;
+    if (gidAMS >= 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #2 mount path */
-    if((gidMS = H5Gopen2(fid2, "M/S", H5P_DEFAULT)) < 0)
+    if ((gidMS = H5Gopen2(fid2, "M/S", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if(H5Iget_name(gidMS, name, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidMS, name, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, "/M/S"))
+    if (HDstrcmp(name, "/M/S") != 0)
         TEST_ERROR
 
     /* Close group in file #3 */
-    if(H5Gclose(gidMS) < 0)
+    if (H5Gclose(gidMS) < 0)
         TEST_ERROR
 
     /* Re-mount file #2 on file #1 */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open object in file #3 through file #1 mount path again */
-    if((gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT)) < 0)
+    if ((gidAMS = H5Gopen2(fid1, "A/M/S", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if(H5Iget_name(gidAMS, name, (size_t)NAME_BUF_SIZE ) < 0)
+    if (H5Iget_name(gidAMS, name, (size_t)NAME_BUF_SIZE) < 0)
         TEST_ERROR
-    if(HDstrcmp(name, "/A/M/S"))
+    if (HDstrcmp(name, "/A/M/S") != 0)
         TEST_ERROR
 
     /* Close group in file #3 */
-    if(H5Gclose(gidAMS) < 0)
+    if (H5Gclose(gidAMS) < 0)
         TEST_ERROR
 
     /* Close group in file #2 */
-    if(H5Gclose(gidAM) < 0)
+    if (H5Gclose(gidAM) < 0)
         TEST_ERROR
 
     /* Close groups in file #1 */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Close file #3 IDs */
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Close file #2 */
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -3175,21 +3425,22 @@ test_nested_survive(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidAMS);
-	H5Gclose(gidMS);
-	H5Gclose(gidS);
-	H5Gclose(gidAM);
-	H5Gclose(gidM);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidAMS);
+        H5Gclose(gidMS);
+        H5Gclose(gidS);
+        H5Gclose(gidAM);
+        H5Gclose(gidM);
+        H5Gclose(gidA);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_nested_survive() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_close_parent
  *
@@ -3210,13 +3461,12 @@ error:
 static int
 test_close_parent(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1;		/* File IDs */
-    hid_t gidA = -1;                    /* Group IDs in file #1 */
-    hid_t gidM = -1;                    /* Group IDs in file #2 */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    ssize_t name_len;                   /* Filename length */
-    char	filename1[1024],
-		filename2[1024]; 	/* Name of files to mount */
+    hid_t   fid1 = -1, fid2 = -1;             /* File IDs */
+    hid_t   gidA = -1;                        /* Group IDs in file #1 */
+    hid_t   gidM = -1;                        /* Group IDs in file #2 */
+    char    name[NAME_BUF_SIZE];              /* Buffer for filename retrieved */
+    ssize_t name_len;                         /* Filename length */
+    char    filename1[1024], filename2[1024]; /* Name of files to mount */
 
     TESTING("close parent");
 
@@ -3224,63 +3474,61 @@ test_close_parent(hid_t fapl)
     h5_fixname(FILENAME[1], fapl, filename2, sizeof filename2);
 
     /* Create file #1 */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid2, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Re-open files and mount file #2 in file #1 */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gopen2(fid1, "A", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount files together */
-    if(H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gidA, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Open group in mounted file */
-    if((gidM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gopen2(fid1, "A/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Close group in file #1 */
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
     /* Close files #1 & #2 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
 
     /* Both underlying shared files should be open still */
@@ -3288,27 +3536,27 @@ test_close_parent(hid_t fapl)
 
     /* Check the name of "M" is still defined */
     *name = '\0';
-    if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/A/M"))
+    if (name_len == 0 || HDstrcmp(name, "/A/M") != 0)
         TEST_ERROR
 
     /* Unmount file #2 from file #1, closing file #1 */
-    if(H5Funmount(gidM, "/A") < 0)
+    if (H5Funmount(gidM, "/A") < 0)
         TEST_ERROR
 
     /* Check the name of "M" is defined in its file */
     *name = '\0';
-    if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/M"))
+    if (name_len == 0 || HDstrcmp(name, "/M") != 0)
         TEST_ERROR
 
     /* Just file #2's underlying shared file should be open still */
     H5F_sfile_assert_num(1);
 
     /* Close group in file #2, letting file #2 close */
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
     /* All underlying shared file structs should be closed */
@@ -3318,16 +3566,17 @@ test_close_parent(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidM);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidM);
+        H5Gclose(gidA);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_close_parent() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_cut_graph
  *
@@ -3383,25 +3632,20 @@ error:
 static int
 test_cut_graph(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1, fid3 = -1,
-        fid4 = -1, fid5 = -1, fid6 = -1, fid7 = -1;	/* File IDs */
-    hid_t gidA = -1, gidB = -1;         /* Group IDs in file #1 */
-    hid_t gidD = -1, gidE = -1;         /* Group IDs in file #2 */
-    hid_t gidH = -1, gidI = -1;         /* Group IDs in file #3 */
-    hid_t gidK = -1;                    /* Group IDs in file #4 */
-    hid_t gidM = -1;                    /* Group IDs in file #5 */
-    hid_t gidO = -1;                    /* Group IDs in file #6 */
-    hid_t gidQ = -1;                    /* Group IDs in file #7 */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    ssize_t name_len;                   /* Filename length */
-    ssize_t obj_count;                  /* Number of objects open */
-    char	filename1[NAME_BUF_SIZE],
-		filename2[NAME_BUF_SIZE],
-		filename3[NAME_BUF_SIZE],
-		filename4[NAME_BUF_SIZE],
-		filename5[NAME_BUF_SIZE],
-		filename6[NAME_BUF_SIZE],
-		filename7[NAME_BUF_SIZE]; 	/* Name of files to mount */
+    hid_t   fid1 = -1, fid2 = -1, fid3 = -1, fid4 = -1, fid5 = -1, fid6 = -1, fid7 = -1; /* File IDs */
+    hid_t   gidA = -1, gidB = -1; /* Group IDs in file #1 */
+    hid_t   gidD = -1, gidE = -1; /* Group IDs in file #2 */
+    hid_t   gidH = -1, gidI = -1; /* Group IDs in file #3 */
+    hid_t   gidK = -1;            /* Group IDs in file #4 */
+    hid_t   gidM = -1;            /* Group IDs in file #5 */
+    hid_t   gidO = -1;            /* Group IDs in file #6 */
+    hid_t   gidQ = -1;            /* Group IDs in file #7 */
+    char    name[NAME_BUF_SIZE];  /* Buffer for filename retrieved */
+    ssize_t name_len;             /* Filename length */
+    ssize_t obj_count;            /* Number of objects open */
+    char    filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE], filename3[NAME_BUF_SIZE],
+        filename4[NAME_BUF_SIZE], filename5[NAME_BUF_SIZE], filename6[NAME_BUF_SIZE],
+        filename7[NAME_BUF_SIZE]; /* Name of files to mount */
 
     TESTING("cutting mount graph");
 
@@ -3414,292 +3658,290 @@ test_cut_graph(hid_t fapl)
     h5_fixname(FILENAME[6], fapl, filename7, sizeof filename3);
 
     /* Create file #1 & it's groups */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 & it's groups */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidD = H5Gcreate2(fid2, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidD = H5Gcreate2(fid2, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidD) < 0)
+    if (H5Gclose(gidD) < 0)
         TEST_ERROR
 
-    if((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidE) < 0)
+    if (H5Gclose(gidE) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create file #3 & it's groups */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidH = H5Gcreate2(fid3, "H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidH = H5Gcreate2(fid3, "H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidH) < 0)
+    if (H5Gclose(gidH) < 0)
         TEST_ERROR
 
-    if((gidI = H5Gcreate2(fid3, "I", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidI = H5Gcreate2(fid3, "I", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidI) < 0)
+    if (H5Gclose(gidI) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Create file #4 & it's group */
-    if((fid4 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid4 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidK = H5Gcreate2(fid4, "K", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidK = H5Gcreate2(fid4, "K", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidK) < 0)
+    if (H5Gclose(gidK) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid4) < 0)
+    if (H5Fclose(fid4) < 0)
         TEST_ERROR
 
     /* Create file #5 & it's group */
-    if((fid5 = H5Fcreate(filename5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid5 = H5Fcreate(filename5, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidM = H5Gcreate2(fid5, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gcreate2(fid5, "M", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid5) < 0)
+    if (H5Fclose(fid5) < 0)
         TEST_ERROR
 
     /* Create file #6 & it's group */
-    if((fid6 = H5Fcreate(filename6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid6 = H5Fcreate(filename6, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidO = H5Gcreate2(fid6, "O", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidO = H5Gcreate2(fid6, "O", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidO) < 0)
+    if (H5Gclose(gidO) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid6) < 0)
+    if (H5Fclose(fid6) < 0)
         TEST_ERROR
 
     /* Create file #7 & it's group */
-    if((fid7 = H5Fcreate(filename7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid7 = H5Fcreate(filename7, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidQ = H5Gcreate2(fid7, "Q", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidQ = H5Gcreate2(fid7, "Q", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidQ) < 0)
+    if (H5Gclose(gidQ) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid7) < 0)
+    if (H5Fclose(fid7) < 0)
         TEST_ERROR
 
-
     /* Re-open files and build mount hierarchy */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #2 at /A */
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/A", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/A", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Mount file #3 at /B */
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/B", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/B", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Mount file #4 at /A/D */
-    if((fid4 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid4 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/A/D", fid4, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/A/D", fid4, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid4) < 0)
+    if (H5Fclose(fid4) < 0)
         TEST_ERROR
 
     /* Mount file #5 at /A/E */
-    if((fid5 = H5Fopen(filename5, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid5 = H5Fopen(filename5, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/A/E", fid5, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/A/E", fid5, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid5) < 0)
+    if (H5Fclose(fid5) < 0)
         TEST_ERROR
 
     /* Mount file #6 at /B/H */
-    if((fid6 = H5Fopen(filename6, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid6 = H5Fopen(filename6, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/B/H", fid6, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/B/H", fid6, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid6) < 0)
+    if (H5Fclose(fid6) < 0)
         TEST_ERROR
 
     /* Mount file #7 at /B/H */
-    if((fid7 = H5Fopen(filename7, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid7 = H5Fopen(filename7, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/B/I", fid7, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/B/I", fid7, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid7) < 0)
+    if (H5Fclose(fid7) < 0)
         TEST_ERROR
 
     /* Open object in file #5 */
-    if((gidM = H5Gopen2(fid1, "A/E/M", H5P_DEFAULT)) < 0)
+    if ((gidM = H5Gopen2(fid1, "A/E/M", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/A/E/M"))
+    if (name_len == 0 || HDstrcmp(name, "/A/E/M") != 0)
         TEST_ERROR
 
     /* Open object in file #7 */
-    if((gidQ = H5Gopen2(fid1, "B/I/Q", H5P_DEFAULT)) < 0)
+    if ((gidQ = H5Gopen2(fid1, "B/I/Q", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check name */
     *name = '\0';
-    if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/B/I/Q"))
+    if (name_len == 0 || HDstrcmp(name, "/B/I/Q") != 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Get a new file ID for file #5 */
-    if((fid5 = H5Iget_file_id(gidM)) < 0)
+    if ((fid5 = H5Iget_file_id(gidM)) < 0)
         TEST_ERROR
 
     /* Check the number of objects currently open */
-    if((obj_count = H5Fget_obj_count(fid5, H5F_OBJ_ALL)) < 0)
+    if ((obj_count = H5Fget_obj_count(fid5, H5F_OBJ_ALL)) < 0)
         TEST_ERROR
-    if(obj_count != 2)  /* one object and the file ID */
+    if (obj_count != 2) /* one object and the file ID */
         TEST_ERROR
 
     /* Close ID on file #5 */
-    if(H5Fclose(fid5) < 0)
+    if (H5Fclose(fid5) < 0)
         TEST_ERROR
 
-
     /* Get a new file ID for file #7 */
-    if((fid7 = H5Iget_file_id(gidQ)) < 0)
+    if ((fid7 = H5Iget_file_id(gidQ)) < 0)
         TEST_ERROR
 
     /* Check the number of objects currently open */
-    if((obj_count = H5Fget_obj_count(fid7, H5F_OBJ_ALL)) < 0)
+    if ((obj_count = H5Fget_obj_count(fid7, H5F_OBJ_ALL)) < 0)
         TEST_ERROR
-    if(obj_count != 2)  /* one object and the file ID */
+    if (obj_count != 2) /* one object and the file ID */
         TEST_ERROR
 
     /* Close ID on file #7 */
-    if(H5Fclose(fid7) < 0)
+    if (H5Fclose(fid7) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
 
-
     /* Unmount file #2 from file #1, cutting the graph */
-    if(H5Funmount(gidM, "/A") < 0)
+    if (H5Funmount(gidM, "/A") < 0)
         TEST_ERROR
 
     /* Attempt to open an object in file #4, from file #1 */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         gidK = H5Gopen2(gidQ, "/A/D/K", H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(gidK >= 0)
+    }
+    H5E_END_TRY;
+    if (gidK >= 0)
         TEST_ERROR
 
     /* Open object in file #4 from file #5 */
-    if((gidK = H5Gopen2(gidM, "/D/K", H5P_DEFAULT)) < 0)
+    if ((gidK = H5Gopen2(gidM, "/D/K", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check the name of "K" is correct */
     *name = '\0';
-    if((name_len = H5Iget_name(gidK, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidK, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/D/K"))
+    if (name_len == 0 || HDstrcmp(name, "/D/K") != 0)
         TEST_ERROR
 
-    if(H5Gclose(gidK) < 0)
+    if (H5Gclose(gidK) < 0)
         TEST_ERROR
 
     /* Attempt to open an object in file #6, from file #5 */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         gidO = H5Gopen2(gidM, "/B/H/O", H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(gidO >= 0)
+    }
+    H5E_END_TRY;
+    if (gidO >= 0)
         TEST_ERROR
 
     /* Open object in file #6 from file #7 */
-    if((gidO = H5Gopen2(gidQ, "/B/H/O", H5P_DEFAULT)) < 0)
+    if ((gidO = H5Gopen2(gidQ, "/B/H/O", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check the name of "O" is correct */
     *name = '\0';
-    if((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/B/H/O"))
+    if (name_len == 0 || HDstrcmp(name, "/B/H/O") != 0)
         TEST_ERROR
 
-    if(H5Gclose(gidO) < 0)
+    if (H5Gclose(gidO) < 0)
         TEST_ERROR
 
     /* Check the name of "M" is defined in its file */
     *name = '\0';
-    if((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidM, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/E/M"))
+    if (name_len == 0 || HDstrcmp(name, "/E/M") != 0)
         TEST_ERROR
 
     /* Check the name of "Q" is still defined */
     *name = '\0';
-    if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/B/I/Q"))
+    if (name_len == 0 || HDstrcmp(name, "/B/I/Q") != 0)
         TEST_ERROR
 
     /* Check that all seven underlying files are still opened */
     H5F_sfile_assert_num(7);
 
     /* Close "M" in file #5, which should close files 2, 4 & 5 */
-    if(H5Gclose(gidM) < 0)
+    if (H5Gclose(gidM) < 0)
         TEST_ERROR
 
     /* Check that only four underlying files are still opened */
     H5F_sfile_assert_num(4);
 
     /* Unmount file #3 from file #1, cutting the graph */
-    if(H5Funmount(gidQ, "/B") < 0)
+    if (H5Funmount(gidQ, "/B") < 0)
         TEST_ERROR
 
     /* Check that only three underlying files are still opened */
@@ -3708,27 +3950,27 @@ test_cut_graph(hid_t fapl)
 
     /* Check the name of "Q" is defined in its file */
     *name = '\0';
-    if((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidQ, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/I/Q"))
+    if (name_len == 0 || HDstrcmp(name, "/I/Q") != 0)
         TEST_ERROR
 
     /* Open object in file #6 from file #7 */
-    if((gidO = H5Gopen2(gidQ, "/H/O", H5P_DEFAULT)) < 0)
+    if ((gidO = H5Gopen2(gidQ, "/H/O", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check the name of "O" is correct */
     *name = '\0';
-    if((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidO, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/H/O"))
+    if (name_len == 0 || HDstrcmp(name, "/H/O") != 0)
         TEST_ERROR
 
-    if(H5Gclose(gidO) < 0)
+    if (H5Gclose(gidO) < 0)
         TEST_ERROR
 
     /* Close last object and let files 3, 6 & 7 close */
-    if(H5Gclose(gidQ) < 0)
+    if (H5Gclose(gidQ) < 0)
         TEST_ERROR
 
     /* Verify that all underlying shared files have been closed now */
@@ -3738,29 +3980,30 @@ test_cut_graph(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidQ);
-	H5Gclose(gidO);
-	H5Gclose(gidM);
-	H5Gclose(gidK);
-	H5Gclose(gidI);
-	H5Gclose(gidH);
-	H5Gclose(gidE);
-	H5Gclose(gidD);
-	H5Gclose(gidB);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidQ);
+        H5Gclose(gidO);
+        H5Gclose(gidM);
+        H5Gclose(gidK);
+        H5Gclose(gidI);
+        H5Gclose(gidH);
+        H5Gclose(gidE);
+        H5Gclose(gidD);
+        H5Gclose(gidB);
+        H5Gclose(gidA);
         H5Fclose(fid7);
         H5Fclose(fid6);
         H5Fclose(fid5);
         H5Fclose(fid4);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_cut_graph() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_symlink
  *
@@ -3781,16 +4024,15 @@ error:
 static int
 test_symlink(hid_t fapl)
 {
-    hid_t fid1 = -1, fid2 = -1, fid3 = -1; /* File IDs */
-    hid_t gidA = -1, gidB = -1;         /* Group IDs in file #1 */
-    hid_t gidD = -1, gidE = -1;         /* Group IDs in file #2 */
-    hid_t gidH = -1, gidI = -1;         /* Group IDs in file #3 */
-    hid_t gidL = -1;         		/* Group IDs through soft link to file #3 */
-    char    name[NAME_BUF_SIZE];        /* Buffer for filename retrieved */
-    ssize_t name_len;                   /* Filename length */
-    char	filename1[NAME_BUF_SIZE],
-		filename2[NAME_BUF_SIZE],
-		filename3[NAME_BUF_SIZE]; 	/* Name of files to mount */
+    hid_t   fid1 = -1, fid2 = -1, fid3 = -1; /* File IDs */
+    hid_t   gidA = -1, gidB = -1;            /* Group IDs in file #1 */
+    hid_t   gidD = -1, gidE = -1;            /* Group IDs in file #2 */
+    hid_t   gidH = -1, gidI = -1;            /* Group IDs in file #3 */
+    hid_t   gidL = -1;                       /* Group IDs through soft link to file #3 */
+    char    name[NAME_BUF_SIZE];             /* Buffer for filename retrieved */
+    ssize_t name_len;                        /* Filename length */
+    char    filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE],
+        filename3[NAME_BUF_SIZE]; /* Name of files to mount */
 
     TESTING("symlinks");
 
@@ -3799,110 +4041,109 @@ test_symlink(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 & it's groups */
-    if((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidA = H5Gcreate2(fid1, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidA) < 0)
+    if (H5Gclose(gidA) < 0)
         TEST_ERROR
 
-    if((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidB = H5Gcreate2(fid1, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidB) < 0)
+    if (H5Gclose(gidB) < 0)
         TEST_ERROR
 
     /* Create soft link to mounted object */
-    if(H5Lcreate_soft("./A/D/H", fid1, "L", H5P_DEFAULT, H5P_DEFAULT) < 0) /* Soft link */
+    if (H5Lcreate_soft("./A/D/H", fid1, "L", H5P_DEFAULT, H5P_DEFAULT) < 0) /* Soft link */
         TEST_ERROR
 
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
-
     /* Create file #2 & it's groups */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidD = H5Gcreate2(fid2, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidD = H5Gcreate2(fid2, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidD) < 0)
+    if (H5Gclose(gidD) < 0)
         TEST_ERROR
 
-    if((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidE = H5Gcreate2(fid2, "E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidE) < 0)
+    if (H5Gclose(gidE) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
-
     /* Create file #3 & it's groups */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
-    if((gidH = H5Gcreate2(fid3, "H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidH = H5Gcreate2(fid3, "H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidH) < 0)
+    if (H5Gclose(gidH) < 0)
         TEST_ERROR
 
-    if((gidI = H5Gcreate2(fid3, "I", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gidI = H5Gcreate2(fid3, "I", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gidI) < 0)
+    if (H5Gclose(gidI) < 0)
         TEST_ERROR
 
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
-
     /* Re-open files and build mount hierarchy */
-    if((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid1 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #2 at /A */
-    if((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/A", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/A", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
 
     /* Attempt to open an object in file #3 (should fail) */
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         gidL = H5Gopen2(fid1, "L", H5P_DEFAULT);
-    } H5E_END_TRY;
-    if(gidL >= 0)
+    }
+    H5E_END_TRY;
+    if (gidL >= 0)
         TEST_ERROR
 
     /* Mount file #3 at /A/D */
-    if((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Fmount(fid1, "/A/D", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1, "/A/D", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Open soft link to object in file #3 */
-    if((gidL = H5Gopen2(fid1, "L", H5P_DEFAULT)) < 0)
+    if ((gidL = H5Gopen2(fid1, "L", H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Check the name of "L" is correct */
     *name = '\0';
-    if((name_len = H5Iget_name(gidL, name, (size_t)NAME_BUF_SIZE )) < 0)
+    if ((name_len = H5Iget_name(gidL, name, (size_t)NAME_BUF_SIZE)) < 0)
         TEST_ERROR
-    if(name_len == 0 || HDstrcmp(name, "/L"))
+    if (name_len == 0 || HDstrcmp(name, "/L") != 0)
         TEST_ERROR
 
     /* Close file #1 */
-    if(H5Fclose(fid1) < 0)
+    if (H5Fclose(fid1) < 0)
         TEST_ERROR
 
     /* Verify that all 3 underlying shared files are still open */
     H5F_sfile_assert_num(3);
 
     /* Close object opened through soft link */
-    if(H5Gclose(gidL) < 0)
+    if (H5Gclose(gidL) < 0)
         TEST_ERROR
 
     /* Verify that all underlying shared files have been closed now */
@@ -3912,22 +4153,23 @@ test_symlink(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-	H5Gclose(gidL);
-	H5Gclose(gidI);
-	H5Gclose(gidH);
-	H5Gclose(gidE);
-	H5Gclose(gidD);
-	H5Gclose(gidB);
-	H5Gclose(gidA);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gidL);
+        H5Gclose(gidI);
+        H5Gclose(gidH);
+        H5Gclose(gidE);
+        H5Gclose(gidD);
+        H5Gclose(gidB);
+        H5Gclose(gidA);
         H5Fclose(fid3);
         H5Fclose(fid2);
-	H5Fclose(fid1);
-    } H5E_END_TRY;
+        H5Fclose(fid1);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_symlink() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_sharedacc
  *
@@ -3944,15 +4186,14 @@ error:
  *
  *-------------------------------------------------------------------------
  */
- static int
+static int
 test_sharedacc(hid_t fapl)
 {
     hid_t fid1[2] = {-1, -1}, fid2[2] = {-1, -1}; /* File IDs */
     hid_t gid = -1;
-    char    filename1[NAME_BUF_SIZE],
-            filename2[NAME_BUF_SIZE],
-            filename3[NAME_BUF_SIZE]; 	/* Name of files to mount */
-    int i, j, k; /* Counters */
+    char  filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE],
+        filename3[NAME_BUF_SIZE]; /* Name of files to mount */
+    int i, j, k;                  /* Counters */
 
     TESTING("shared mount access");
 
@@ -3961,60 +4202,60 @@ test_sharedacc(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1 & its group */
-    if((fid1[0] = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1[0] = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid = H5Gcreate2(fid1[0], "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid1[0], "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         TEST_ERROR
 
     /* Create file #2 & its group */
-    if((fid2[0] = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2[0] = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid = H5Gcreate2(fid2[0], "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid = H5Gcreate2(fid2[0], "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         TEST_ERROR
 
     /* Test mount before reopen, then using reopened handle for access */
-    if(H5Fmount(fid1[0], "/A", fid2[0], H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1[0], "/A", fid2[0], H5P_DEFAULT) < 0)
         TEST_ERROR
-    if((fid1[1] = H5Freopen(fid1[0])) < 0)
+    if ((fid1[1] = H5Freopen(fid1[0])) < 0)
         TEST_ERROR
-    if((fid2[1] = H5Freopen(fid2[0])) < 0)
+    if ((fid2[1] = H5Freopen(fid2[0])) < 0)
         TEST_ERROR
-    if((gid = H5Gopen2(fid1[1], "/A/B", H5P_DEFAULT)) < 0)
+    if ((gid = H5Gopen2(fid1[1], "/A/B", H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if(H5Gclose(gid) < 0)
+    if (H5Gclose(gid) < 0)
         TEST_ERROR
-    if(H5Funmount(fid1[1], "/A") < 0)
+    if (H5Funmount(fid1[1], "/A") < 0)
         TEST_ERROR
 
     /* "Brute force" test of all possible ways of mounting, accessing, and
      * unmounting files with multiple handles (mount after reopen) */
-    for(i=0; i<2; i++)
-        for(j=0; j<2; j++)
-            for(k=0; k<2; k++) {
-                if(H5Fmount(fid1[i], "/A", fid2[j], H5P_DEFAULT) < 0)
+    for (i = 0; i < 2; i++)
+        for (j = 0; j < 2; j++)
+            for (k = 0; k < 2; k++) {
+                if (H5Fmount(fid1[i], "/A", fid2[j], H5P_DEFAULT) < 0)
                     TEST_ERROR
-                if((gid = H5Gopen2(fid1[k], "/A/B", H5P_DEFAULT)) < 0)
+                if ((gid = H5Gopen2(fid1[k], "/A/B", H5P_DEFAULT)) < 0)
                     TEST_ERROR
-                if(H5Gclose(gid) < 0)
+                if (H5Gclose(gid) < 0)
                     TEST_ERROR
-                if(H5Funmount(fid1[k], "/A") < 0)
+                if (H5Funmount(fid1[k], "/A") < 0)
                     TEST_ERROR
             }
 
     /* Close file IDs */
-    for(i=0; i<2; i++) {
-        if(H5Fclose(fid1[i]) < 0)
+    for (i = 0; i < 2; i++) {
+        if (H5Fclose(fid1[i]) < 0)
             TEST_ERROR
-        if(H5Fclose(fid2[i]) < 0)
+        if (H5Fclose(fid2[i]) < 0)
             TEST_ERROR
     }
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -4022,17 +4263,18 @@ test_sharedacc(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Gclose(gid);
-    for(i=0; i<2; i++) {
-        H5Fclose(fid1[i]);
-        H5Fclose(fid2[i]);
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gid);
+        for (i = 0; i < 2; i++) {
+            H5Fclose(fid1[i]);
+            H5Fclose(fid2[i]);
+        }
     }
-    } H5E_END_TRY;
+    H5E_END_TRY;
     return 1;
 } /* end test_sharedacc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_sharedclose
  *
@@ -4050,14 +4292,13 @@ error:
  *
  *-------------------------------------------------------------------------
  */
- static int
+static int
 test_sharedclose(hid_t fapl)
 {
     hid_t fid1a = -1, fid1b = -1, fid2 = -1, fid3 = -2; /* File IDs */
     hid_t gid1 = -1, gid2 = -1, gid3 = -1;
-    char    filename1[NAME_BUF_SIZE],
-            filename2[NAME_BUF_SIZE],
-            filename3[NAME_BUF_SIZE]; 	/* Name of files to mount */
+    char  filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE],
+        filename3[NAME_BUF_SIZE]; /* Name of files to mount */
 
     TESTING("closing shared mounts");
 
@@ -4066,112 +4307,112 @@ test_sharedclose(hid_t fapl)
     h5_fixname(FILENAME[2], fapl, filename3, sizeof filename3);
 
     /* Create file #1a & its group */
-    if((fid1a = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1a = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid1 = H5Gcreate2(fid1a, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid1 = H5Gcreate2(fid1a, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create file #1b & its groups */
-    if((fid1b = H5Freopen(fid1a)) < 0)
+    if ((fid1b = H5Freopen(fid1a)) < 0)
         TEST_ERROR
-    if((gid2 = H5Gcreate2(fid1b, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid2 = H5Gcreate2(fid1b, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid3 = H5Gcreate2(fid1b, "B/C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid3 = H5Gcreate2(fid1b, "B/C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create file #3 */
-    if((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid3 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #2 to file #1a */
-    if(H5Fmount(gid1, ".", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(gid1, ".", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Mount file #3 to file #1b */
-    if(H5Fmount(gid2, ".", fid3, H5P_DEFAULT) < 0)
+    if (H5Fmount(gid2, ".", fid3, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Close file #1b.  It should be held open by the groups in it. */
-    if(H5Fclose(fid1b) < 0)
+    if (H5Fclose(fid1b) < 0)
         TEST_ERROR
 
     /* Close file #3.  It should be held open by the groups in its parent. */
-    if(H5Fclose(fid3) < 0)
+    if (H5Fclose(fid3) < 0)
         TEST_ERROR
 
     /* Close group B in file #1b.  This should not close file #1b and #3. */
-    if(H5Gclose(gid2) < 0)
+    if (H5Gclose(gid2) < 0)
         TEST_ERROR
 
     /* Check that file #3 is still open */
     H5F_sfile_assert_num(3);
 
     /* Close group B/C in file #1b.  This should close file #1b and #3. */
-    if(H5Gclose(gid3) < 0)
+    if (H5Gclose(gid3) < 0)
         TEST_ERROR
 
     /* Check that file #3 has been closed */
     H5F_sfile_assert_num(2);
 
     /* Unmount file 2 and close the rest of the handles */
-    if(H5Funmount(fid1a, "A") < 0)
+    if (H5Funmount(fid1a, "A") < 0)
         TEST_ERROR
-    if(H5Gclose(gid1) < 0)
+    if (H5Gclose(gid1) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
-    if(H5Fclose(fid1a) < 0)
+    if (H5Fclose(fid1a) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
     /* Create file #1 & its group */
-    if((fid1a = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid1a = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
-    if((gid1 = H5Gcreate2(fid1a, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid1 = H5Gcreate2(fid1a, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create file #1b & its group */
-    if((fid1b = H5Freopen(fid1a)) < 0)
+    if ((fid1b = H5Freopen(fid1a)) < 0)
         TEST_ERROR
-    if((gid2 = H5Gcreate2(fid1b, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((gid2 = H5Gcreate2(fid1b, "B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Create file #2 */
-    if((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+    if ((fid2 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
         TEST_ERROR
 
     /* Mount file #2 to file #1 */
-    if(H5Fmount(fid1a, "A", fid2, H5P_DEFAULT) < 0)
+    if (H5Fmount(fid1a, "A", fid2, H5P_DEFAULT) < 0)
         TEST_ERROR
 
     /* Close file #1b.  It should be held open by the group in it. */
-    if(H5Fclose(fid1b) < 0)
+    if (H5Fclose(fid1b) < 0)
         TEST_ERROR
 
     /* Close the group in file #1b.  This should close file # 1b. */
-    if(H5Gclose(gid2) < 0)
+    if (H5Gclose(gid2) < 0)
         TEST_ERROR
 
     /* Unmount file 2 and close the rest of the handles */
-    if(H5Funmount(fid1a, "A") < 0)
+    if (H5Funmount(fid1a, "A") < 0)
         TEST_ERROR
-    if(H5Gclose(gid1) < 0)
+    if (H5Gclose(gid1) < 0)
         TEST_ERROR
-    if(H5Fclose(fid2) < 0)
+    if (H5Fclose(fid2) < 0)
         TEST_ERROR
-    if(H5Fclose(fid1a) < 0)
+    if (H5Fclose(fid1a) < 0)
         TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0)
+    if (H5I_nmembers(H5I_FILE) != 0)
         TEST_ERROR
     H5F_sfile_assert_num(0);
 
@@ -4179,19 +4420,20 @@ test_sharedclose(hid_t fapl)
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Gclose(gid1);
-    H5Gclose(gid2);
-    H5Gclose(gid3);
-    H5Fclose(fid1a);
-    H5Fclose(fid1b);
-    H5Fclose(fid2);
-    H5Fclose(fid3);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gid1);
+        H5Gclose(gid2);
+        H5Gclose(gid3);
+        H5Fclose(fid1a);
+        H5Fclose(fid1b);
+        H5Fclose(fid2);
+        H5Fclose(fid3);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_sharedclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	test_multisharedclose
  *
@@ -4209,15 +4451,13 @@ error:
  *
  *-------------------------------------------------------------------------
  */
- static int
+static int
 test_multisharedclose(hid_t fapl)
 {
     hid_t fid1 = -1, fid2 = -1; /* File IDs */
     hid_t gid1 = -1, gid2 = -1, gid3 = -1;
-    char    filename1[NAME_BUF_SIZE],
-            filename2[NAME_BUF_SIZE],
-            filename3[NAME_BUF_SIZE],
-            filename4[NAME_BUF_SIZE]; 	/* Name of files to mount */
+    char  filename1[NAME_BUF_SIZE], filename2[NAME_BUF_SIZE], filename3[NAME_BUF_SIZE],
+        filename4[NAME_BUF_SIZE]; /* Name of files to mount */
 
     TESTING("closing multiple shared mounts");
 
@@ -4227,95 +4467,128 @@ test_multisharedclose(hid_t fapl)
     h5_fixname(FILENAME[3], fapl, filename4, sizeof filename4);
 
     /* Create master file with three groups to serve as mount points */
-    if ((fid1 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "mnt2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "mnt3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fclose(fid1) < 0) TEST_ERROR
+    if ((fid1 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "mnt2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "mnt3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fclose(fid1) < 0)
+        TEST_ERROR
 
     /* Create child file with group */
-    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fclose(fid1) < 0) TEST_ERROR
+    if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fclose(fid1) < 0)
+        TEST_ERROR
 
     /* Create child file with group */
-    if ((fid1 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fclose(fid1) < 0) TEST_ERROR
+    if ((fid1 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fclose(fid1) < 0)
+        TEST_ERROR
 
     /* Create child file with group */
-    if ((fid1 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fclose(fid1) < 0) TEST_ERROR
-
+    if ((fid1 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fclose(fid1) < 0)
+        TEST_ERROR
 
     /* Open master and child 1 and mount child 1 to master */
-    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if ((fid2 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fmount(fid1, "mnt1", fid2, H5P_DEFAULT) < 0) TEST_ERROR
+    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if ((fid2 = H5Fopen(filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fmount(fid1, "mnt1", fid2, H5P_DEFAULT) < 0)
+        TEST_ERROR
 
     /* Open the group in child 1 */
-    if ((gid1 = H5Gopen2(fid1, "mnt1/grp", H5P_DEFAULT)) < 0) TEST_ERROR
+    if ((gid1 = H5Gopen2(fid1, "mnt1/grp", H5P_DEFAULT)) < 0)
+        TEST_ERROR
 
     /* Close both files.  They will be held open by gid1 */
-    if (H5Idec_ref(fid2) < 0) TEST_ERROR
-    if (H5Idec_ref(fid1) < 0) TEST_ERROR
-
+    if (H5Idec_ref(fid2) < 0)
+        TEST_ERROR
+    if (H5Idec_ref(fid1) < 0)
+        TEST_ERROR
 
     /* Open master and child 2 and mount child 2 to master */
-    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fmount(fid1, "mnt2", fid2, H5P_DEFAULT) < 0) TEST_ERROR
+    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if ((fid2 = H5Fopen(filename2, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fmount(fid1, "mnt2", fid2, H5P_DEFAULT) < 0)
+        TEST_ERROR
 
     /* Open the group in child 2 */
-    if ((gid2 = H5Gopen2(fid1, "mnt2/grp", H5P_DEFAULT)) < 0) TEST_ERROR
+    if ((gid2 = H5Gopen2(fid1, "mnt2/grp", H5P_DEFAULT)) < 0)
+        TEST_ERROR
 
     /* Close both files.  They will be held open by gid2 */
-    if (H5Idec_ref(fid2) < 0) TEST_ERROR
-    if (H5Idec_ref(fid1) < 0) TEST_ERROR
-
+    if (H5Idec_ref(fid2) < 0)
+        TEST_ERROR
+    if (H5Idec_ref(fid1) < 0)
+        TEST_ERROR
 
     /* Open master and child 3 and mount child 3 to master */
-    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if ((fid2 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) TEST_ERROR
-    if (H5Fmount(fid1, "mnt3", fid2, H5P_DEFAULT) < 0) TEST_ERROR
+    if ((fid1 = H5Fopen(filename4, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if ((fid2 = H5Fopen(filename3, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+        TEST_ERROR
+    if (H5Fmount(fid1, "mnt3", fid2, H5P_DEFAULT) < 0)
+        TEST_ERROR
 
     /* Open the group in child 3 */
-    if ((gid3 = H5Gopen2(fid1, "mnt3/grp", H5P_DEFAULT)) < 0) TEST_ERROR
+    if ((gid3 = H5Gopen2(fid1, "mnt3/grp", H5P_DEFAULT)) < 0)
+        TEST_ERROR
 
     /* Close both files.  They will be held open by gid3 */
-    if (H5Idec_ref(fid2) < 0) TEST_ERROR
-    if (H5Idec_ref(fid1) < 0) TEST_ERROR
-
+    if (H5Idec_ref(fid2) < 0)
+        TEST_ERROR
+    if (H5Idec_ref(fid1) < 0)
+        TEST_ERROR
 
     /* Close gid1.  This will close child 1. */
-    if (H5Idec_ref(gid1) < 0) TEST_ERROR
+    if (H5Idec_ref(gid1) < 0)
+        TEST_ERROR
 
     /* Close gid2.  This will close child 2. */
-    if (H5Idec_ref(gid2) < 0) TEST_ERROR
+    if (H5Idec_ref(gid2) < 0)
+        TEST_ERROR
 
     /* Close gid3.  This will close child 3 and the master file. */
-    if (H5Idec_ref(gid3) < 0) TEST_ERROR
+    if (H5Idec_ref(gid3) < 0)
+        TEST_ERROR
 
     /* Check that all file IDs have been closed */
-    if(H5I_nmembers(H5I_FILE) != 0) TEST_ERROR
+    if (H5I_nmembers(H5I_FILE) != 0)
+        TEST_ERROR
     H5F_sfile_assert_num(0);
 
     PASSED();
     return 0;
 
 error:
-    H5E_BEGIN_TRY {
-    H5Gclose(gid1);
-    H5Gclose(gid2);
-    H5Gclose(gid3);
-    H5Fclose(fid2);
-    H5Fclose(fid2);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY
+    {
+        H5Gclose(gid1);
+        H5Gclose(gid2);
+        H5Gclose(gid3);
+        H5Fclose(fid2);
+        H5Fclose(fid2);
+    }
+    H5E_END_TRY;
     return 1;
 } /* end test_multisharedclose() */
 
-
 /*-------------------------------------------------------------------------
  * Function:	main
  *
@@ -4335,12 +4608,13 @@ error:
 int
 main(void)
 {
-    int		nerrors = 0;
-    hid_t	fapl = -1;
+    int   nerrors = 0;
+    hid_t fapl    = -1;
 
     h5_reset();
     fapl = h5_fileaccess();
-    if (setup(fapl) < 0) goto error;
+    if (setup(fapl) < 0)
+        goto error;
 
     nerrors += test_basic(fapl);
     nerrors += test_illegal(fapl);
@@ -4377,7 +4651,8 @@ main(void)
     /* Verify symbol table messages are cached */
     nerrors += (h5_verify_cached_stabs(FILENAME, fapl) < 0 ? 1 : 0);
 
-    if (nerrors) goto error;
+    if (nerrors)
+        goto error;
 
     HDputs("All mount tests passed.");
     h5_cleanup(FILENAME, fapl);
@@ -4388,4 +4663,3 @@ error:
     HDputs("***** MOUNT ERRORS *****");
     return 1;
 }
-