VFD SWMR: Merges from develop (#1670)

* Cleans up SWMR test scripts (both legacy and VFD)

* Brings over format source changes for Java

* Normalization of HL, Fortran, C++, Java w/ develop

* Removes the STATIC flavor of FUNC_ENTER macros (#1622)

* Removes the STATIC flavor of FUNC_ENTER macros

* Remove H5_NO_ALIGNMENT_RESTRICTIONS (#1426)

* Do not conditionally compile code that uses a pointer dereference
and assignment to copy a potentially unaligned variable to aligned
automatic storage, or vice versa.  Instead, always use naked `memcpy(3)`s.
Disassembling the generated code reveals that the `memcpy(3)`s optimize
(`-O3`) to a single `mov` instruction for x86_64, which is not strict
about alignment.

This change reduces the size of code and scripts by 143 lines, eases
our way to cross-compilation, and avoids invoking undefined behavior.

* Committing clang-format changes

* Per discussion, use HD and add comments.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes unused definitions from module headers (#1624)

* Misc stuff from develop (includes some parallel things)

* Brings over SWMR test quiet mode changes from develop

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 251 insertions, 178 deletions

diff --git a/java/test/TestH5T.java b/java/test/TestH5T.java
index ed4e2a9..0121cc2 100644
--- a/java/test/TestH5T.java
+++ b/java/test/TestH5T.java
@@ -30,30 +30,38 @@ import org.junit.Test;
 import org.junit.rules.TestName;
 
 public class TestH5T {
-    @Rule public TestName testname = new TestName();
+    @Rule
+    public TestName testname            = new TestName();
     private static final String H5_FILE = "testT.h5";
-    long H5fid = HDF5Constants.H5I_INVALID_HID;
-    long H5strdid = HDF5Constants.H5I_INVALID_HID;
+    long H5fid                          = HDF5Constants.H5I_INVALID_HID;
+    long H5strdid                       = HDF5Constants.H5I_INVALID_HID;
 
-    private final void _deleteFile(String filename) {
+    private final void _deleteFile(String filename)
+    {
         File file = null;
         try {
             file = new File(filename);
         }
-        catch (Throwable err) {}
+        catch (Throwable err) {
+        }
 
         if (file.exists()) {
-            try {file.delete();} catch (SecurityException e) {}
+            try {
+                file.delete();
+            }
+            catch (SecurityException e) {
+            }
         }
     }
 
     @Before
-    public void createH5file() throws NullPointerException, HDF5Exception {
-        assertTrue("H5 open ids is 0", H5.getOpenIDCount()==0);
+    public void createH5file() throws NullPointerException, HDF5Exception
+    {
+        assertTrue("H5 open ids is 0", H5.getOpenIDCount() == 0);
         System.out.print(testname.getMethodName());
 
-        H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC,
-                HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+        H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC, HDF5Constants.H5P_DEFAULT,
+                             HDF5Constants.H5P_DEFAULT);
         assertTrue("H5.H5Fcreate", H5fid > 0);
         H5strdid = H5.H5Tcopy(HDF5Constants.H5T_C_S1);
         assertTrue("H5.H5Tcopy", H5strdid > 0);
@@ -62,28 +70,39 @@ public class TestH5T {
     }
 
     @After
-    public void deleteH5file() throws HDF5LibraryException {
+    public void deleteH5file() throws HDF5LibraryException
+    {
         if (H5strdid >= 0)
-            try {H5.H5Tclose(H5strdid);} catch (Exception ex) {}
+            try {
+                H5.H5Tclose(H5strdid);
+            }
+            catch (Exception ex) {
+            }
         if (H5fid > 0)
-            try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+            try {
+                H5.H5Fclose(H5fid);
+            }
+            catch (Exception ex) {
+            }
 
         _deleteFile(H5_FILE);
         System.out.println();
     }
 
     @Test(expected = HDF5LibraryException.class)
-    public void testH5Tequal_type_error() throws Throwable {
+    public void testH5Tequal_type_error() throws Throwable
+    {
         H5.H5Tequal(HDF5Constants.H5T_INTEGER, H5strdid);
     }
 
     @Test
-    public void testH5Tget_class() {
+    public void testH5Tget_class()
+    {
         try {
             int result = H5.H5Tget_class(H5strdid);
             assertTrue("H5.H5Tget_class", result > 0);
             String class_name = H5.H5Tget_class_name(result);
-            assertTrue("H5.H5Tget_class", class_name.compareTo("H5T_STRING")==0);
+            assertTrue("H5.H5Tget_class", class_name.compareTo("H5T_STRING") == 0);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -92,7 +111,8 @@ public class TestH5T {
     }
 
     @Test
-    public void testH5Tget_size() {
+    public void testH5Tget_size()
+    {
         long dt_size = -1;
 
         try {
@@ -106,7 +126,8 @@ public class TestH5T {
     }
 
     @Test
-    public void testH5Tset_size() {
+    public void testH5Tset_size()
+    {
         long dt_size = 5;
 
         try {
@@ -127,89 +148,105 @@ public class TestH5T {
     }
 
     @Test
-    public void testH5Tarray_create() {
-       long filetype_id = HDF5Constants.H5I_INVALID_HID;
-       long[] adims = { 3, 5 };
-
-       try {
-           filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
-           assertTrue("testH5Tarray_create", filetype_id >= 0);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tarray_create.H5Tarray_create " + err);
-       }
-       finally {
-           if (filetype_id >= 0)
-               try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
-       }
+    public void testH5Tarray_create()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+        long[] adims     = {3, 5};
+
+        try {
+            filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
+            assertTrue("testH5Tarray_create", filetype_id >= 0);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tarray_create.H5Tarray_create " + err);
+        }
+        finally {
+            if (filetype_id >= 0)
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
+        }
     }
 
     @Test
-    public void testH5Tget_array_ndims() {
-       long filetype_id = HDF5Constants.H5I_INVALID_HID;
-       int ndims = 0;
-       long[] adims = { 3, 5 };
-
-       try {
-           filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tarray_create.H5Tarray_create " + err);
-       }
-       assertTrue("testH5Tget_array_ndims:H5Tarray_create", filetype_id >= 0);
-       try {
-           ndims = H5.H5Tget_array_ndims(filetype_id);
-           assertTrue("testH5Tget_array_ndims", ndims == 2);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tget_array_ndims.H5Tget_array_ndims " + err);
-       }
-       finally {
-           if (filetype_id >= 0)
-               try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
-       }
+    public void testH5Tget_array_ndims()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+        int ndims        = 0;
+        long[] adims     = {3, 5};
+
+        try {
+            filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tarray_create.H5Tarray_create " + err);
+        }
+        assertTrue("testH5Tget_array_ndims:H5Tarray_create", filetype_id >= 0);
+        try {
+            ndims = H5.H5Tget_array_ndims(filetype_id);
+            assertTrue("testH5Tget_array_ndims", ndims == 2);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tget_array_ndims.H5Tget_array_ndims " + err);
+        }
+        finally {
+            if (filetype_id >= 0)
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
+        }
     }
 
     @Test
-    public void testH5Tget_array_dims() {
-       long filetype_id = HDF5Constants.H5I_INVALID_HID;
-       int ndims = 0;
-       long[] adims = { 3, 5 };
-       long[] rdims = new long[2];
-
-       try {
-           filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tarray_create.H5Tarray_create " + err);
-       }
-       assertTrue("testH5Tget_array_dims:H5Tarray_create", filetype_id >= 0);
-       try {
-           ndims = H5.H5Tget_array_dims(filetype_id, rdims);
-           assertTrue("testH5Tget_array_dims", ndims == 2);
-           assertTrue("testH5Tget_array_dims", adims[0] == rdims[0]);
-           assertTrue("testH5Tget_array_dims", adims[1] == rdims[1]);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tget_array_dims.H5Tget_array_dims " + err);
-       }
-       finally {
-           if (filetype_id >= 0)
-               try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
-       }
+    public void testH5Tget_array_dims()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+        int ndims        = 0;
+        long[] adims     = {3, 5};
+        long[] rdims     = new long[2];
+
+        try {
+            filetype_id = H5.H5Tarray_create(HDF5Constants.H5T_STD_I64LE, 2, adims);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tarray_create.H5Tarray_create " + err);
+        }
+        assertTrue("testH5Tget_array_dims:H5Tarray_create", filetype_id >= 0);
+        try {
+            ndims = H5.H5Tget_array_dims(filetype_id, rdims);
+            assertTrue("testH5Tget_array_dims", ndims == 2);
+            assertTrue("testH5Tget_array_dims", adims[0] == rdims[0]);
+            assertTrue("testH5Tget_array_dims", adims[1] == rdims[1]);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tget_array_dims.H5Tget_array_dims " + err);
+        }
+        finally {
+            if (filetype_id >= 0)
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
+        }
     }
 
     @Test
-    public void testH5Tenum_functions() {
-        long       filetype_id = HDF5Constants.H5I_INVALID_HID;
-        String    enum_type ="Enum_type";
-        byte[]    enum_val = new byte[1];
-        String    enum_name = null;
+    public void testH5Tenum_functions()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+        String enum_type = "Enum_type";
+        byte[] enum_val  = new byte[1];
+        String enum_name = null;
 
         // Create a enumerate datatype
         try {
@@ -221,15 +258,15 @@ public class TestH5T {
         }
         assertTrue("testH5Tenum_functions:H5Tcreate", filetype_id >= 0);
         try {
-            enum_val[0]=10;
+            enum_val[0] = 10;
             H5.H5Tenum_insert(filetype_id, "RED", enum_val);
-            enum_val[0]=11;
+            enum_val[0] = 11;
             H5.H5Tenum_insert(filetype_id, "GREEN", enum_val);
-            enum_val[0]=12;
+            enum_val[0] = 12;
             H5.H5Tenum_insert(filetype_id, "BLUE", enum_val);
-            enum_val[0]=13;
+            enum_val[0] = 13;
             H5.H5Tenum_insert(filetype_id, "ORANGE", enum_val);
-            enum_val[0]=14;
+            enum_val[0] = 14;
             H5.H5Tenum_insert(filetype_id, "YELLOW", enum_val);
 
             // Query member number and member index by member name, for enumeration type.
@@ -237,7 +274,8 @@ public class TestH5T {
             assertTrue("Can't get correct index number", H5.H5Tget_member_index(filetype_id, "ORANGE") == 3);
 
             // Commit enumeration datatype and close it */
-            H5.H5Tcommit(H5fid, enum_type, filetype_id, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+            H5.H5Tcommit(H5fid, enum_type, filetype_id, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT,
+                         HDF5Constants.H5P_DEFAULT);
 
             H5.H5Tclose(filetype_id);
 
@@ -250,17 +288,17 @@ public class TestH5T {
             assertTrue("Can't get correct index number", H5.H5Tget_member_index(filetype_id, "ORANGE") == 3);
 
             // Query member value by member name, for enumeration type
-            H5.H5Tenum_valueof (filetype_id, "ORANGE", enum_val);
-            assertTrue("Incorrect value for enum member", enum_val[0]==13);
+            H5.H5Tenum_valueof(filetype_id, "ORANGE", enum_val);
+            assertTrue("Incorrect value for enum member", enum_val[0] == 13);
 
             // Query member value by member index, for enumeration type
-            H5.H5Tget_member_value (filetype_id, 2, enum_val);
-            assertTrue("Incorrect value for enum member", enum_val[0]==12);
+            H5.H5Tget_member_value(filetype_id, 2, enum_val);
+            assertTrue("Incorrect value for enum member", enum_val[0] == 12);
 
             // Query member name by member value, for enumeration type
             enum_val[0] = 14;
-            enum_name = H5.H5Tenum_nameof(filetype_id, enum_val, 16);
-            assertTrue("Incorrect name for enum member", enum_name.compareTo("YELLOW")==0);
+            enum_name   = H5.H5Tenum_nameof(filetype_id, enum_val, 16);
+            assertTrue("Incorrect name for enum member", enum_name.compareTo("YELLOW") == 0);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -268,14 +306,19 @@ public class TestH5T {
         }
         finally {
             if (filetype_id >= 0)
-                try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
         }
     }
 
     @Test
-    public void testH5Tenum_create_functions() {
-        long      filetype_id = HDF5Constants.H5I_INVALID_HID;
-        byte[]    enum_val = new byte[1];
+    public void testH5Tenum_create_functions()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+        byte[] enum_val  = new byte[1];
 
         // Create a enumerate datatype
         try {
@@ -287,15 +330,15 @@ public class TestH5T {
         }
         assertTrue("testH5Tenum_create_functions:H5Tcreate", filetype_id >= 0);
         try {
-            enum_val[0]=10;
+            enum_val[0] = 10;
             H5.H5Tenum_insert(filetype_id, "RED", enum_val);
-            enum_val[0]=11;
+            enum_val[0] = 11;
             H5.H5Tenum_insert(filetype_id, "GREEN", enum_val);
-            enum_val[0]=12;
+            enum_val[0] = 12;
             H5.H5Tenum_insert(filetype_id, "BLUE", enum_val);
-            enum_val[0]=13;
+            enum_val[0] = 13;
             H5.H5Tenum_insert(filetype_id, "ORANGE", enum_val);
-            enum_val[0]=14;
+            enum_val[0] = 14;
             H5.H5Tenum_insert(filetype_id, "YELLOW", enum_val);
 
             // Query member number and member index by member name, for enumeration type.
@@ -308,14 +351,19 @@ public class TestH5T {
         }
         finally {
             if (filetype_id >= 0)
-                try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
         }
     }
 
     @Test
-    public void testH5Topaque_functions() {
-        long       filetype_id = HDF5Constants.H5I_INVALID_HID;
-        String    opaque_name = null;
+    public void testH5Topaque_functions()
+    {
+        long filetype_id   = HDF5Constants.H5I_INVALID_HID;
+        String opaque_name = null;
 
         // Create a opaque datatype
         try {
@@ -330,7 +378,7 @@ public class TestH5T {
         try {
             H5.H5Tset_tag(filetype_id, "opaque type");
             opaque_name = H5.H5Tget_tag(filetype_id);
-            assertTrue("Incorrect tag for opaque type", opaque_name.compareTo("opaque type")==0);
+            assertTrue("Incorrect tag for opaque type", opaque_name.compareTo("opaque type") == 0);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -338,67 +386,83 @@ public class TestH5T {
         }
         finally {
             if (filetype_id >= 0)
-                try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
         }
     }
 
     @Test
-    public void testH5Tvlen_create() {
+    public void testH5Tvlen_create()
+    {
         long filetype_id = HDF5Constants.H5I_INVALID_HID;
 
-       try {
-           filetype_id = H5.H5Tvlen_create(HDF5Constants.H5T_C_S1);
-           assertTrue("testH5Tvlen_create", filetype_id >= 0);
-
-           // Check if datatype is VL type
-           int vlclass = H5.H5Tget_class(filetype_id);
-           assertTrue("testH5Tvlen_create:H5Tget_class", vlclass == HDF5Constants.H5T_VLEN);
-           assertFalse("testH5Tis_variable_str:H5Tget_class", vlclass == HDF5Constants.H5T_STRING);
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tvlen_create.H5Tvlen_create " + err);
-       }
-       finally {
-           if (filetype_id >= 0)
-               try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
-       }
+        try {
+            filetype_id = H5.H5Tvlen_create(HDF5Constants.H5T_C_S1);
+            assertTrue("testH5Tvlen_create", filetype_id >= 0);
+
+            // Check if datatype is VL type
+            int vlclass = H5.H5Tget_class(filetype_id);
+            assertTrue("testH5Tvlen_create:H5Tget_class", vlclass == HDF5Constants.H5T_VLEN);
+            assertFalse("testH5Tis_variable_str:H5Tget_class", vlclass == HDF5Constants.H5T_STRING);
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tvlen_create.H5Tvlen_create " + err);
+        }
+        finally {
+            if (filetype_id >= 0)
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
+        }
     }
 
     @Test
-    public void testH5Tis_variable_str() {
-       long filetype_id = HDF5Constants.H5I_INVALID_HID;
-
-       try {
-           filetype_id = H5.H5Tcopy(HDF5Constants.H5T_C_S1);
-           assertTrue("testH5Tis_variable_str.H5Tcopy: ", filetype_id >= 0);
-
-           // Convert to variable-length string
-           H5.H5Tset_size(filetype_id, HDF5Constants.H5T_VARIABLE);
-
-           // Check if datatype is VL string
-           int vlclass = H5.H5Tget_class(filetype_id);
-           assertTrue("testH5Tis_variable_str:H5Tget_class", vlclass == HDF5Constants.H5T_STRING);
-           assertFalse("testH5Tvlen_create:H5Tget_class", vlclass == HDF5Constants.H5T_VLEN);
-
-           assertTrue("testH5Tis_variable_str:H5Tis_variable_str", H5.H5Tis_variable_str(filetype_id));
-
-           // Verify that the class detects as a string
-           assertTrue("testH5Tis_variable_str:H5Tdetect_class", H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_STRING));
-       }
-       catch (Throwable err) {
-           err.printStackTrace();
-           fail("testH5Tis_variable_str " + err);
-       }
-       finally {
-           if (filetype_id >= 0)
-               try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
-       }
+    public void testH5Tis_variable_str()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
+
+        try {
+            filetype_id = H5.H5Tcopy(HDF5Constants.H5T_C_S1);
+            assertTrue("testH5Tis_variable_str.H5Tcopy: ", filetype_id >= 0);
+
+            // Convert to variable-length string
+            H5.H5Tset_size(filetype_id, HDF5Constants.H5T_VARIABLE);
+
+            // Check if datatype is VL string
+            int vlclass = H5.H5Tget_class(filetype_id);
+            assertTrue("testH5Tis_variable_str:H5Tget_class", vlclass == HDF5Constants.H5T_STRING);
+            assertFalse("testH5Tvlen_create:H5Tget_class", vlclass == HDF5Constants.H5T_VLEN);
+
+            assertTrue("testH5Tis_variable_str:H5Tis_variable_str", H5.H5Tis_variable_str(filetype_id));
+
+            // Verify that the class detects as a string
+            assertTrue("testH5Tis_variable_str:H5Tdetect_class",
+                       H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_STRING));
+        }
+        catch (Throwable err) {
+            err.printStackTrace();
+            fail("testH5Tis_variable_str " + err);
+        }
+        finally {
+            if (filetype_id >= 0)
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
+        }
     }
 
     @Test
-    public void testH5Tcompound_functions() {
-        long       filetype_id = HDF5Constants.H5I_INVALID_HID;
+    public void testH5Tcompound_functions()
+    {
+        long filetype_id = HDF5Constants.H5I_INVALID_HID;
 
         // Create a compound datatype
         try {
@@ -420,28 +484,34 @@ public class TestH5T {
             // We started to support this function for compound type in 1.8.6 release.
             int order = H5.H5Tget_order(filetype_id);
             assertFalse("Can't get order for compound type.", order == HDF5Constants.H5T_ORDER_ERROR);
-            assertTrue("Wrong order for this type.", (order == HDF5Constants.H5T_ORDER_LE) || (order == HDF5Constants.H5T_ORDER_BE));
+            assertTrue("Wrong order for this type.",
+                       (order == HDF5Constants.H5T_ORDER_LE) || (order == HDF5Constants.H5T_ORDER_BE));
 
             // Make certain that the correct classes can be detected
-            assertTrue("Can't get correct class", H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_COMPOUND));
+            assertTrue("Can't get correct class",
+                       H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_COMPOUND));
             assertTrue("Can't get correct class", H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_FLOAT));
             // Make certain that an incorrect class is not detected
             assertFalse("Can get incorrect class", H5.H5Tdetect_class(filetype_id, HDF5Constants.H5T_TIME));
 
             // Query member name by member index
-            String index_name = H5.H5Tget_member_name (filetype_id, 0);
-            assertTrue("Incorrect name for member index", index_name.compareTo("Lon")==0);
+            String index_name = H5.H5Tget_member_name(filetype_id, 0);
+            assertTrue("Incorrect name for member index", index_name.compareTo("Lon") == 0);
 
             // Query member offset by member no
-            long index_offset = H5.H5Tget_member_offset (filetype_id, 1);
+            long index_offset = H5.H5Tget_member_offset(filetype_id, 1);
             assertTrue("Incorrect offset for member no", index_offset == 8);
 
             // Query member type by member index
-            long index_type = H5.H5Tget_member_type (filetype_id, 0);
-            assertTrue("Incorrect type for member index", H5.H5Tequal(HDF5Constants.H5T_NATIVE_DOUBLE, index_type));
+            long index_type = H5.H5Tget_member_type(filetype_id, 0);
+            assertTrue("Incorrect type for member index",
+                       H5.H5Tequal(HDF5Constants.H5T_NATIVE_DOUBLE, index_type));
             if (index_type >= 0)
-                try {H5.H5Tclose(index_type);} catch (Exception ex) {}
-
+                try {
+                    H5.H5Tclose(index_type);
+                }
+                catch (Exception ex) {
+                }
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -449,8 +519,11 @@ public class TestH5T {
         }
         finally {
             if (filetype_id >= 0)
-                try {H5.H5Tclose(filetype_id);} catch (Exception ex) {}
+                try {
+                    H5.H5Tclose(filetype_id);
+                }
+                catch (Exception ex) {
+                }
         }
     }
-
 }