Clang-format of source files

60 files changed, 7220 insertions, 6508 deletions

diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c
index c08b67b..c5e7d85 100644
--- a/java/src/jni/exceptionImp.c
+++ b/java/src/jni/exceptionImp.c
@@ -21,7 +21,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /***********/
 /* Headers */
 /***********/
@@ -33,9 +32,8 @@ extern "C" {
 #include "h5jni.h"
 #include "exceptionImp.h"
 
-extern H5E_auto2_t  efunc;
-extern void        *edata;
-
+extern H5E_auto2_t efunc;
+extern void *      edata;
 
 /*******************/
 /* Local Variables */
@@ -47,13 +45,13 @@ extern void        *edata;
  * minor error numbers.
  */
 typedef struct H5E_major_mesg_t {
-    hid_t error_code;
-    const char  *str;
+    hid_t       error_code;
+    const char *str;
 } H5E_major_mesg_t;
 
 typedef struct H5E_minor_mesg_t {
-    hid_t error_code;
-    const char  *str;
+    hid_t       error_code;
+    const char *str;
 } H5E_minor_mesg_t;
 
 /* major and minor error numbers */
@@ -66,42 +64,41 @@ typedef struct H5E_num_t {
 /* Local Macros     */
 /********************/
 
-#define THROWEXCEPTION(className, args)                                                       \
-{                                                                                             \
-    jmethodID jm;                                                                             \
-    jclass    jc;                                                                             \
-    jobject   ex;                                                                             \
-                                                                                              \
-    if (NULL == (jc = ENVPTR->FindClass(ENVONLY, (className))))                               \
-        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                              \
-                                                                                              \
-    if (NULL == (jm = ENVPTR->GetMethodID(ENVONLY, jc, "<init>", "(Ljava/lang/String;)V"))) { \
-        HDprintf("THROWEXCEPTION FATAL ERROR: GetMethodID failed\n");                         \
-        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                              \
-    }                                                                                         \
-                                                                                              \
-    if (NULL == (ex = ENVPTR->NewObjectA(ENVONLY, jc, jm, (jvalue *)(args)))) {              \
-        HDprintf("THROWEXCEPTION FATAL ERROR: Class %s: Creation failed\n", (className));     \
-        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                              \
-    }                                                                                         \
-                                                                                              \
-    if (ENVPTR->Throw(ENVONLY, (jthrowable)ex) < 0) {                                         \
-        HDprintf("THROWEXCEPTION FATAL ERROR: Class %s: Throw failed\n", (className));        \
-        CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                              \
-    }                                                                                         \
-}
+#define THROWEXCEPTION(className, args)                                                                      \
+    {                                                                                                        \
+        jmethodID jm;                                                                                        \
+        jclass    jc;                                                                                        \
+        jobject   ex;                                                                                        \
+                                                                                                             \
+        if (NULL == (jc = ENVPTR->FindClass(ENVONLY, (className))))                                          \
+            CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                                         \
+                                                                                                             \
+        if (NULL == (jm = ENVPTR->GetMethodID(ENVONLY, jc, "<init>", "(Ljava/lang/String;)V"))) {            \
+            HDprintf("THROWEXCEPTION FATAL ERROR: GetMethodID failed\n");                                    \
+            CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                                         \
+        }                                                                                                    \
+                                                                                                             \
+        if (NULL == (ex = ENVPTR->NewObjectA(ENVONLY, jc, jm, (jvalue *)(args)))) {                          \
+            HDprintf("THROWEXCEPTION FATAL ERROR: Class %s: Creation failed\n", (className));                \
+            CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                                         \
+        }                                                                                                    \
+                                                                                                             \
+        if (ENVPTR->Throw(ENVONLY, (jthrowable)ex) < 0) {                                                    \
+            HDprintf("THROWEXCEPTION FATAL ERROR: Class %s: Throw failed\n", (className));                   \
+            CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);                                                         \
+        }                                                                                                    \
+    }
 
 /********************/
 /* Local Prototypes */
 /********************/
 
 static const char *defineHDF5LibraryException(hid_t maj_num);
-static jboolean H5JNIErrorClass(JNIEnv *env, const char *message, const char *className);
+static jboolean    H5JNIErrorClass(JNIEnv *env, const char *message, const char *className);
 
 /* get the major and minor error numbers on the top of the error stack */
 static herr_t
-walk_error_callback
-    (unsigned n, const H5E_error2_t *err_desc, void *_err_nums)
+walk_error_callback(unsigned n, const H5E_error2_t *err_desc, void *_err_nums)
 {
     H5E_num_t *err_nums = (H5E_num_t *)_err_nums;
 
@@ -122,8 +119,7 @@ walk_error_callback
  *
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5error_1off
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5error_1off(JNIEnv *env, jclass clss)
 {
     UNUSED(env);
     UNUSED(clss);
@@ -144,8 +140,7 @@ Java_hdf_hdf5lib_H5_H5error_1off
  *
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5error_1on
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss)
 {
     UNUSED(env);
     UNUSED(clss);
@@ -161,11 +156,10 @@ Java_hdf_hdf5lib_H5_H5error_1on
  *  Call the HDF-5 library to print the HDF-5 error stack to 'file_name'.
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
-    (JNIEnv *env, jobject obj, jstring file_name)
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, jstring file_name)
 {
-    FILE       *stream = NULL;
-    const char *file = NULL;
+    FILE *      stream = NULL;
+    const char *file   = NULL;
 
     UNUSED(obj);
 
@@ -196,8 +190,7 @@ done:
  *  Extract the HDF-5 major error number from the HDF-5 error stack.
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
-    (JNIEnv *env, jobject obj)
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber(JNIEnv *env, jobject obj)
 {
     H5E_num_t err_nums;
 
@@ -221,8 +214,7 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
  *  Extract the HDF-5 minor error number from the HDF-5 error stack.
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
-    (JNIEnv *env, jobject obj)
+Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber(JNIEnv *env, jobject obj)
 {
     H5E_num_t err_nums;
 
@@ -242,17 +234,16 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
  *  Routine to raise particular Java exceptions from C.
  */
 static jboolean
-H5JNIErrorClass
-    (JNIEnv *env, const char *message, const char *className)
+H5JNIErrorClass(JNIEnv *env, const char *message, const char *className)
 {
-    jstring   str;
-    char     *args[2];
-    jboolean  retVal = JNI_FALSE;
+    jstring  str;
+    char *   args[2];
+    jboolean retVal = JNI_FALSE;
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, message)))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-    args[0] = (char *) str;
+    args[0] = (char *)str;
     args[1] = 0;
 
     THROWEXCEPTION(className, args);
@@ -271,13 +262,11 @@ done:
  *  exception.
  */
 jboolean
-h5outOfMemory
-    (JNIEnv *env, const char *functName)
+h5outOfMemory(JNIEnv *env, const char *functName)
 {
     return H5JNIErrorClass(env, functName, "java/lang/OutOfMemoryError");
 } /* end h5outOfMemory() */
 
-
 /*
  *  A fatal error in a JNI call
  *  Create and throw an 'InternalError'
@@ -287,8 +276,7 @@ h5outOfMemory
  *  exception.
  */
 jboolean
-h5JNIFatalError
-    (JNIEnv *env, const char *functName)
+h5JNIFatalError(JNIEnv *env, const char *functName)
 {
     return H5JNIErrorClass(env, functName, "java/lang/InternalError");
 } /* end h5JNIFatalError() */
@@ -302,8 +290,7 @@ h5JNIFatalError
  *  exception.
  */
 jboolean
-h5nullArgument
-    (JNIEnv *env, const char *functName)
+h5nullArgument(JNIEnv *env, const char *functName)
 {
     return H5JNIErrorClass(env, functName, "java/lang/NullPointerException");
 } /* end h5nullArgument() */
@@ -317,8 +304,7 @@ h5nullArgument
  *  exception.
  */
 jboolean
-h5badArgument
-    (JNIEnv *env, const char *functName)
+h5badArgument(JNIEnv *env, const char *functName)
 {
     return H5JNIErrorClass(env, functName, "java/lang/IllegalArgumentException");
 } /* end h5badArgument() */
@@ -332,8 +318,7 @@ h5badArgument
  *  exception.
  */
 jboolean
-h5unimplemented
-    (JNIEnv *env, const char *functName)
+h5unimplemented(JNIEnv *env, const char *functName)
 {
     return H5JNIErrorClass(env, functName, "java/lang/UnsupportedOperationException");
 } /* end h5unimplemented() */
@@ -346,8 +331,7 @@ h5unimplemented
  *  exception.
  */
 jboolean
-h5raiseException
-    (JNIEnv *env, const char *message, const char *exception)
+h5raiseException(JNIEnv *env, const char *message, const char *exception)
 {
     return H5JNIErrorClass(env, message, exception);
 } /* end h5raiseException() */
@@ -364,20 +348,19 @@ h5raiseException
  *  exception.
  */
 jboolean
-h5libraryError
-    (JNIEnv *env)
+h5libraryError(JNIEnv *env)
 {
     const char *exception = NULL;
     H5E_type_t  error_msg_type;
     H5E_num_t   exceptionNumbers;
-    jstring     str = NULL;
+    jstring     str      = NULL;
     ssize_t     msg_size = 0;
     hid_t       min_num;
     hid_t       maj_num;
     hid_t       stk_id = H5I_INVALID_HID;
-    char       *args[2];
-    char       *msg_str = NULL;
-    jboolean    retVal = JNI_FALSE;
+    char *      args[2];
+    char *      msg_str = NULL;
+    jboolean    retVal  = JNI_FALSE;
 
     exceptionNumbers.maj_num = 0;
     exceptionNumbers.min_num = 0;
@@ -408,7 +391,7 @@ h5libraryError
         goto done;
 
     if (msg_size > 0) {
-        if (NULL == (msg_str = (char *) HDcalloc((size_t)msg_size + 1, sizeof(char))))
+        if (NULL == (msg_str = (char *)HDcalloc((size_t)msg_size + 1, sizeof(char))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5libraryerror: failed to allocate buffer for error message");
 
         if ((msg_size = H5Eget_msg(min_num, &error_msg_type, msg_str, (size_t)msg_size + 1)) < 0)
@@ -424,7 +407,7 @@ h5libraryError
     if (stk_id >= 0)
         H5Eset_current_stack(stk_id);
 
-    args[0] = (char *) str;
+    args[0] = (char *)str;
     args[1] = 0;
 
     THROWEXCEPTION(exception, args);
@@ -443,8 +426,7 @@ done:
  *  which goes with an HDF-5 error code.
  */
 static const char *
-defineHDF5LibraryException
-    (hid_t maj_num)
+defineHDF5LibraryException(hid_t maj_num)
 {
     hid_t err_num = maj_num;
 
@@ -497,4 +479,3 @@ defineHDF5LibraryException
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
-
diff --git a/java/src/jni/exceptionImp.h b/java/src/jni/exceptionImp.h
index 5873202..1a7ad92 100644
--- a/java/src/jni/exceptionImp.h
+++ b/java/src/jni/exceptionImp.h
@@ -27,9 +27,7 @@ extern "C" {
  * Signature: ()I
  *
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5error_1off
-  (JNIEnv *env, jclass clss );
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5error_1off(JNIEnv *env, jclass clss);
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDF5Library
@@ -37,10 +35,7 @@ Java_hdf_hdf5lib_H5_H5error_1off
  * Signature: ()V
  *
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5error_1on
-  (JNIEnv *env, jclass clss );
-
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss);
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
@@ -49,27 +44,25 @@ Java_hdf_hdf5lib_H5_H5error_1on
  *
  *  Call the HDF-5 library to print the HDF-5 error stack to 'file_name'.
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0
-  (JNIEnv *env, jobject obj, jstring file_name);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env,
+                                                                                         jobject obj,
+                                                                                         jstring file_name);
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
  * Method:    _getMajorErrorNumber
  * Signature: ()J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber
-  (JNIEnv *env, jobject obj);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber(JNIEnv *env,
+                                                                                               jobject obj);
 
 /*
  * Class:     hdf_hdf5lib_exceptions_HDFLibraryException
  * Method:    _getMinorErrorNumber
  * Signature: ()J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber
-  (JNIEnv *env, jobject obj);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber(JNIEnv *env,
+                                                                                               jobject obj);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c
index f9354d7..38f0883 100644
--- a/java/src/jni/h5Constants.c
+++ b/java/src/jni/h5Constants.c
@@ -30,420 +30,1015 @@ H5_GCC_DIAG_OFF("missing-prototypes")
 H5_GCC_DIAG_OFF("unused-parameter")
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1QUARTER_1HADDR_1MAX(JNIEnv *env, jclass cls) { return (hsize_t)HADDR_MAX/4; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1QUARTER_1HADDR_1MAX(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)HADDR_MAX / 4;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1ALLOW_1K13_1OPTION_1MASK(JNIEnv *env, jclass cls) { return H5_SZIP_ALLOW_K13_OPTION_MASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1ALLOW_1K13_1OPTION_1MASK(JNIEnv *env, jclass cls)
+{
+    return H5_SZIP_ALLOW_K13_OPTION_MASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1CHIP_1OPTION_1MASK(JNIEnv *env, jclass cls) { return H5_SZIP_CHIP_OPTION_MASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1CHIP_1OPTION_1MASK(JNIEnv *env, jclass cls)
+{
+    return H5_SZIP_CHIP_OPTION_MASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1EC_1OPTION_1MASK(JNIEnv *env, jclass cls) { return H5_SZIP_EC_OPTION_MASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1EC_1OPTION_1MASK(JNIEnv *env, jclass cls)
+{
+    return H5_SZIP_EC_OPTION_MASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1MAX_1PIXELS_1PER_1BLOCK(JNIEnv *env, jclass cls) { return H5_SZIP_MAX_PIXELS_PER_BLOCK; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1MAX_1PIXELS_1PER_1BLOCK(JNIEnv *env, jclass cls)
+{
+    return H5_SZIP_MAX_PIXELS_PER_BLOCK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1NN_1OPTION_1MASK(JNIEnv *env, jclass cls) { return H5_SZIP_NN_OPTION_MASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1SZIP_1NN_1OPTION_1MASK(JNIEnv *env, jclass cls)
+{
+    return H5_SZIP_NN_OPTION_MASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1UNKNOWN(JNIEnv *env, jclass cls) { return H5_INDEX_UNKNOWN; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1UNKNOWN(JNIEnv *env, jclass cls)
+{
+    return H5_INDEX_UNKNOWN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1NAME(JNIEnv *env, jclass cls) { return H5_INDEX_NAME; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1NAME(JNIEnv *env, jclass cls)
+{
+    return H5_INDEX_NAME;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1CRT_1ORDER(JNIEnv *env, jclass cls) { return H5_INDEX_CRT_ORDER; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1CRT_1ORDER(JNIEnv *env, jclass cls)
+{
+    return H5_INDEX_CRT_ORDER;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1N(JNIEnv *env, jclass cls) { return H5_INDEX_N; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1INDEX_1N(JNIEnv *env, jclass cls)
+{
+    return H5_INDEX_N;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1UNKNOWN(JNIEnv *env, jclass cls) { return H5_ITER_UNKNOWN; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1UNKNOWN(JNIEnv *env, jclass cls)
+{
+    return H5_ITER_UNKNOWN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1INC(JNIEnv *env, jclass cls) { return H5_ITER_INC; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1INC(JNIEnv *env, jclass cls)
+{
+    return H5_ITER_INC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1DEC(JNIEnv *env, jclass cls) { return H5_ITER_DEC; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1DEC(JNIEnv *env, jclass cls)
+{
+    return H5_ITER_DEC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1NATIVE(JNIEnv *env, jclass cls) { return H5_ITER_NATIVE; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1NATIVE(JNIEnv *env, jclass cls)
+{
+    return H5_ITER_NATIVE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1N(JNIEnv *env, jclass cls) { return H5_ITER_N; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1ITER_1N(JNIEnv *env, jclass cls)
+{
+    return H5_ITER_N;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5AC_1CURR_1CACHE_1CONFIG_1VERSION(JNIEnv *env, jclass cls) { return H5AC__CURR_CACHE_CONFIG_VERSION; }
+Java_hdf_hdf5lib_HDF5Constants_H5AC_1CURR_1CACHE_1CONFIG_1VERSION(JNIEnv *env, jclass cls)
+{
+    return H5AC__CURR_CACHE_CONFIG_VERSION;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5AC_1MAX_1TRACE_1FILE_1NAME_1LEN(JNIEnv *env, jclass cls) { return H5AC__MAX_TRACE_FILE_NAME_LEN; }
+Java_hdf_hdf5lib_HDF5Constants_H5AC_1MAX_1TRACE_1FILE_1NAME_1LEN(JNIEnv *env, jclass cls)
+{
+    return H5AC__MAX_TRACE_FILE_NAME_LEN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5AC_1METADATA_1WRITE_1STRATEGY_1PROCESS_1ZERO_1ONLY(JNIEnv *env, jclass cls) { return H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY; }
+Java_hdf_hdf5lib_HDF5Constants_H5AC_1METADATA_1WRITE_1STRATEGY_1PROCESS_1ZERO_1ONLY(JNIEnv *env, jclass cls)
+{
+    return H5AC_METADATA_WRITE_STRATEGY__PROCESS_0_ONLY;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5AC_1METADATA_1WRITE_1STRATEGY_1DISTRIBUTED(JNIEnv *env, jclass cls) { return H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED; }
+Java_hdf_hdf5lib_HDF5Constants_H5AC_1METADATA_1WRITE_1STRATEGY_1DISTRIBUTED(JNIEnv *env, jclass cls)
+{
+    return H5AC_METADATA_WRITE_STRATEGY__DISTRIBUTED;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1incr_1off(JNIEnv *env, jclass cls) { return H5C_incr__off; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1incr_1off(JNIEnv *env, jclass cls)
+{
+    return H5C_incr__off;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1incr_1threshold(JNIEnv *env, jclass cls) { return H5C_incr__threshold; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1incr_1threshold(JNIEnv *env, jclass cls)
+{
+    return H5C_incr__threshold;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1flash_1incr_1off(JNIEnv *env, jclass cls) { return H5C_flash_incr__off; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1flash_1incr_1off(JNIEnv *env, jclass cls)
+{
+    return H5C_flash_incr__off;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1flash_1incr_1add_1space(JNIEnv *env, jclass cls) { return H5C_flash_incr__add_space; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1flash_1incr_1add_1space(JNIEnv *env, jclass cls)
+{
+    return H5C_flash_incr__add_space;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1off(JNIEnv *env, jclass cls) { return H5C_decr__off; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1off(JNIEnv *env, jclass cls)
+{
+    return H5C_decr__off;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1threshold(JNIEnv *env, jclass cls) { return H5C_decr__threshold; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1threshold(JNIEnv *env, jclass cls)
+{
+    return H5C_decr__threshold;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1age_1out(JNIEnv *env, jclass cls) { return H5C_decr__age_out; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1age_1out(JNIEnv *env, jclass cls)
+{
+    return H5C_decr__age_out;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1age_1out_1with_1threshold(JNIEnv *env, jclass cls) { return H5C_decr__age_out_with_threshold; }
+Java_hdf_hdf5lib_HDF5Constants_H5C_1decr_1age_1out_1with_1threshold(JNIEnv *env, jclass cls)
+{
+    return H5C_decr__age_out_with_threshold;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNK_1IDX_1BTREE(JNIEnv *env, jclass cls) { return H5D_CHUNK_IDX_BTREE; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNK_1IDX_1BTREE(JNIEnv *env, jclass cls)
+{
+    return H5D_CHUNK_IDX_BTREE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1DEFAULT(JNIEnv *env, jclass cls) { return H5D_ALLOC_TIME_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5D_ALLOC_TIME_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1EARLY(JNIEnv *env, jclass cls) { return H5D_ALLOC_TIME_EARLY; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1EARLY(JNIEnv *env, jclass cls)
+{
+    return H5D_ALLOC_TIME_EARLY;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1ERROR(JNIEnv *env, jclass cls) { return H5D_ALLOC_TIME_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_ALLOC_TIME_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1INCR(JNIEnv *env, jclass cls) { return H5D_ALLOC_TIME_INCR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1INCR(JNIEnv *env, jclass cls)
+{
+    return H5D_ALLOC_TIME_INCR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1LATE(JNIEnv *env, jclass cls) { return H5D_ALLOC_TIME_LATE; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1ALLOC_1TIME_1LATE(JNIEnv *env, jclass cls)
+{
+    return H5D_ALLOC_TIME_LATE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1ERROR(JNIEnv *env, jclass cls) { return H5D_FILL_TIME_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_TIME_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1ALLOC(JNIEnv *env, jclass cls) { return H5D_FILL_TIME_ALLOC; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1ALLOC(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_TIME_ALLOC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1NEVER(JNIEnv *env, jclass cls) { return H5D_FILL_TIME_NEVER; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1NEVER(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_TIME_NEVER;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1IFSET(JNIEnv *env, jclass cls) { return H5D_FILL_TIME_IFSET; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1TIME_1IFSET(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_TIME_IFSET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1DEFAULT(JNIEnv *env, jclass cls) { return H5D_FILL_VALUE_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_VALUE_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1ERROR(JNIEnv *env, jclass cls) { return H5D_FILL_VALUE_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_VALUE_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1UNDEFINED(JNIEnv *env, jclass cls) { return H5D_FILL_VALUE_UNDEFINED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1UNDEFINED(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_VALUE_UNDEFINED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1USER_1DEFINED(JNIEnv *env, jclass cls) { return H5D_FILL_VALUE_USER_DEFINED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1FILL_1VALUE_1USER_1DEFINED(JNIEnv *env, jclass cls)
+{
+    return H5D_FILL_VALUE_USER_DEFINED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1LAYOUT_1ERROR(JNIEnv *env, jclass cls) { return H5D_LAYOUT_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1LAYOUT_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_LAYOUT_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNKED(JNIEnv *env, jclass cls) { return H5D_CHUNKED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNKED(JNIEnv *env, jclass cls)
+{
+    return H5D_CHUNKED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1COMPACT(JNIEnv *env, jclass cls) { return H5D_COMPACT; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1COMPACT(JNIEnv *env, jclass cls)
+{
+    return H5D_COMPACT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1CONTIGUOUS(JNIEnv *env, jclass cls) { return H5D_CONTIGUOUS; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1CONTIGUOUS(JNIEnv *env, jclass cls)
+{
+    return H5D_CONTIGUOUS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1VIRTUAL(JNIEnv *env, jclass cls) { return H5D_VIRTUAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1VIRTUAL(JNIEnv *env, jclass cls)
+{
+    return H5D_VIRTUAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1NLAYOUTS(JNIEnv *env, jclass cls) { return H5D_NLAYOUTS; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1NLAYOUTS(JNIEnv *env, jclass cls)
+{
+    return H5D_NLAYOUTS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1ALLOCATED(JNIEnv *env, jclass cls) { return H5D_SPACE_STATUS_ALLOCATED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1ALLOCATED(JNIEnv *env, jclass cls)
+{
+    return H5D_SPACE_STATUS_ALLOCATED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1ERROR(JNIEnv *env, jclass cls) { return H5D_SPACE_STATUS_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_SPACE_STATUS_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1NOT_1ALLOCATED(JNIEnv *env, jclass cls) { return H5D_SPACE_STATUS_NOT_ALLOCATED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1NOT_1ALLOCATED(JNIEnv *env, jclass cls)
+{
+    return H5D_SPACE_STATUS_NOT_ALLOCATED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1PART_1ALLOCATED(JNIEnv *env, jclass cls) { return H5D_SPACE_STATUS_PART_ALLOCATED; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1SPACE_1STATUS_1PART_1ALLOCATED(JNIEnv *env, jclass cls)
+{
+    return H5D_SPACE_STATUS_PART_ALLOCATED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1ERROR(JNIEnv *env, jclass cls) { return H5D_VDS_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5D_VDS_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1FIRST_1MISSING(JNIEnv *env, jclass cls) { return H5D_VDS_FIRST_MISSING; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1FIRST_1MISSING(JNIEnv *env, jclass cls)
+{
+    return H5D_VDS_FIRST_MISSING;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1LAST_1AVAILABLE(JNIEnv *env, jclass cls) { return H5D_VDS_LAST_AVAILABLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1VDS_1LAST_1AVAILABLE(JNIEnv *env, jclass cls)
+{
+    return H5D_VDS_LAST_AVAILABLE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNK_1DONT_1FILTER_1PARTIAL_1CHUNKS(JNIEnv *env, jclass cls) { return H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS; }
+Java_hdf_hdf5lib_HDF5Constants_H5D_1CHUNK_1DONT_1FILTER_1PARTIAL_1CHUNKS(JNIEnv *env, jclass cls)
+{
+    return H5D_CHUNK_DONT_FILTER_PARTIAL_CHUNKS;
+}
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ALIGNMENT(JNIEnv *env, jclass cls) { return H5E_ALIGNMENT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ALIGNMENT(JNIEnv *env, jclass cls)
+{
+    return H5E_ALIGNMENT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ALREADYEXISTS(JNIEnv *env, jclass cls) { return H5E_ALREADYEXISTS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ALREADYEXISTS(JNIEnv *env, jclass cls)
+{
+    return H5E_ALREADYEXISTS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ALREADYINIT(JNIEnv *env, jclass cls) { return H5E_ALREADYINIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ALREADYINIT(JNIEnv *env, jclass cls)
+{
+    return H5E_ALREADYINIT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ARGS(JNIEnv *env, jclass cls) { return H5E_ARGS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ARGS(JNIEnv *env, jclass cls)
+{
+    return H5E_ARGS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ATOM(JNIEnv *env, jclass cls) { return H5E_ATOM; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ATOM(JNIEnv *env, jclass cls)
+{
+    return H5E_ATOM;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1ATTR(JNIEnv *env, jclass cls) { return H5E_ATTR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1ATTR(JNIEnv *env, jclass cls)
+{
+    return H5E_ATTR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADATOM(JNIEnv *env, jclass cls) { return H5E_BADATOM; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADATOM(JNIEnv *env, jclass cls)
+{
+    return H5E_BADATOM;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADFILE(JNIEnv *env, jclass cls) { return H5E_BADFILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADFILE(JNIEnv *env, jclass cls)
+{
+    return H5E_BADFILE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADGROUP(JNIEnv *env, jclass cls) { return H5E_BADGROUP; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADGROUP(JNIEnv *env, jclass cls)
+{
+    return H5E_BADGROUP;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADMESG(JNIEnv *env, jclass cls) { return H5E_BADMESG; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADMESG(JNIEnv *env, jclass cls)
+{
+    return H5E_BADMESG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADRANGE(JNIEnv *env, jclass cls) { return H5E_BADRANGE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADRANGE(JNIEnv *env, jclass cls)
+{
+    return H5E_BADRANGE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADSELECT(JNIEnv *env, jclass cls) { return H5E_BADSELECT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADSELECT(JNIEnv *env, jclass cls)
+{
+    return H5E_BADSELECT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADSIZE(JNIEnv *env, jclass cls) { return H5E_BADSIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADSIZE(JNIEnv *env, jclass cls)
+{
+    return H5E_BADSIZE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADTYPE(JNIEnv *env, jclass cls) { return H5E_BADTYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADTYPE(JNIEnv *env, jclass cls)
+{
+    return H5E_BADTYPE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BADVALUE(JNIEnv *env, jclass cls) { return H5E_BADVALUE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BADVALUE(JNIEnv *env, jclass cls)
+{
+    return H5E_BADVALUE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1BTREE(JNIEnv *env, jclass cls) { return H5E_BTREE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1BTREE(JNIEnv *env, jclass cls)
+{
+    return H5E_BTREE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CACHE(JNIEnv *env, jclass cls) { return H5E_CACHE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CACHE(JNIEnv *env, jclass cls)
+{
+    return H5E_CACHE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CALLBACK(JNIEnv *env, jclass cls) { return H5E_CALLBACK; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CALLBACK(JNIEnv *env, jclass cls)
+{
+    return H5E_CALLBACK;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANAPPLY(JNIEnv *env, jclass cls) { return H5E_CANAPPLY; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANAPPLY(JNIEnv *env, jclass cls)
+{
+    return H5E_CANAPPLY;
+}
 /*JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTALLOC(JNIEnv *env, jclass cls) { return H5E_CANTALLOC; }*/
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCLIP(JNIEnv *env, jclass cls) { return H5E_CANTCLIP; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCLIP(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCLIP;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCLOSEFILE(JNIEnv *env, jclass cls) { return H5E_CANTCLOSEFILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCLOSEFILE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCLOSEFILE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCONVERT(JNIEnv *env, jclass cls) { return H5E_CANTCONVERT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCONVERT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCONVERT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCOPY(JNIEnv *env, jclass cls) { return H5E_CANTCOPY; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCOPY(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCOPY;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCOUNT(JNIEnv *env, jclass cls) { return H5E_CANTCOUNT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCOUNT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCOUNT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCREATE(JNIEnv *env, jclass cls) { return H5E_CANTCREATE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTCREATE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTCREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDEC(JNIEnv *env, jclass cls) { return H5E_CANTDEC; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDEC(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTDEC;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDECODE(JNIEnv *env, jclass cls) { return H5E_CANTDECODE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDECODE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTDECODE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDELETE(JNIEnv *env, jclass cls) { return H5E_CANTDELETE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDELETE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTDELETE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDELETEFILE(JNIEnv *env, jclass cls) { return H5E_CANTDELETEFILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTDELETEFILE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTDELETEFILE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTENCODE(JNIEnv *env, jclass cls) { return H5E_CANTENCODE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTENCODE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTENCODE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTFLUSH(JNIEnv *env, jclass cls) { return H5E_CANTFLUSH; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTFLUSH(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTFLUSH;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTFREE(JNIEnv *env, jclass cls) { return H5E_CANTFREE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTFREE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTFREE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTGET(JNIEnv *env, jclass cls) { return H5E_CANTGET; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTGET(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTGET;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINC(JNIEnv *env, jclass cls) { return H5E_CANTINC; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINC(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTINC;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINIT(JNIEnv *env, jclass cls) { return H5E_CANTINIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINIT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTINIT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINSERT(JNIEnv *env, jclass cls) { return H5E_CANTINSERT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTINSERT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTINSERT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLIST(JNIEnv *env, jclass cls) { return H5E_CANTLIST; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLIST(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTLIST;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLOAD(JNIEnv *env, jclass cls) { return H5E_CANTLOAD; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLOAD(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTLOAD;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLOCK(JNIEnv *env, jclass cls) { return H5E_CANTLOCK; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTLOCK(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTLOCK;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTNEXT(JNIEnv *env, jclass cls) { return H5E_CANTNEXT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTNEXT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTNEXT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTOPENFILE(JNIEnv *env, jclass cls) { return H5E_CANTOPENFILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTOPENFILE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTOPENFILE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTOPENOBJ(JNIEnv *env, jclass cls) { return H5E_CANTOPENOBJ; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTOPENOBJ(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTOPENOBJ;
+}
 /*JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTRECV(JNIEnv *env, jclass cls) { return H5E_CANTRECV; }*/
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTREGISTER(JNIEnv *env, jclass cls) { return H5E_CANTREGISTER; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTREGISTER(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTREGISTER;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTRELEASE(JNIEnv *env, jclass cls) { return H5E_CANTRELEASE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTRELEASE(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTRELEASE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSELECT(JNIEnv *env, jclass cls) { return H5E_CANTSELECT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSELECT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTSELECT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSET(JNIEnv *env, jclass cls) { return H5E_CANTSET; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSET(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTSET;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSPLIT(JNIEnv *env, jclass cls) { return H5E_CANTSPLIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTSPLIT(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTSPLIT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTUNLOCK(JNIEnv *env, jclass cls) { return H5E_CANTUNLOCK; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CANTUNLOCK(JNIEnv *env, jclass cls)
+{
+    return H5E_CANTUNLOCK;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1CLOSEERROR(JNIEnv *env, jclass cls) { return H5E_CLOSEERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1CLOSEERROR(JNIEnv *env, jclass cls)
+{
+    return H5E_CLOSEERROR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1COMPLEN(JNIEnv *env, jclass cls) { return H5E_COMPLEN; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1COMPLEN(JNIEnv *env, jclass cls)
+{
+    return H5E_COMPLEN;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1DATASET(JNIEnv *env, jclass cls) { return H5E_DATASET; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1DATASET(JNIEnv *env, jclass cls)
+{
+    return H5E_DATASET;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1DATASPACE(JNIEnv *env, jclass cls) { return H5E_DATASPACE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1DATASPACE(JNIEnv *env, jclass cls)
+{
+    return H5E_DATASPACE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1DATATYPE(JNIEnv *env, jclass cls) { return H5E_DATATYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1DATATYPE(JNIEnv *env, jclass cls)
+{
+    return H5E_DATATYPE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1DEFAULT(JNIEnv *env, jclass cls) { return H5E_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5E_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1DUPCLASS(JNIEnv *env, jclass cls) { return H5E_DUPCLASS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1DUPCLASS(JNIEnv *env, jclass cls)
+{
+    return H5E_DUPCLASS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1EFL(JNIEnv *env, jclass cls) { return H5E_EFL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1EFL(JNIEnv *env, jclass cls)
+{
+    return H5E_EFL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1EXISTS(JNIEnv *env, jclass cls) { return H5E_EXISTS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1EXISTS(JNIEnv *env, jclass cls)
+{
+    return H5E_EXISTS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1FCNTL(JNIEnv *env, jclass cls) { return H5E_FCNTL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1FCNTL(JNIEnv *env, jclass cls)
+{
+    return H5E_FCNTL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1FILE(JNIEnv *env, jclass cls) { return H5E_FILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1FILE(JNIEnv *env, jclass cls)
+{
+    return H5E_FILE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1FILEEXISTS(JNIEnv *env, jclass cls) { return H5E_FILEEXISTS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1FILEEXISTS(JNIEnv *env, jclass cls)
+{
+    return H5E_FILEEXISTS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1FILEOPEN(JNIEnv *env, jclass cls) { return H5E_FILEOPEN; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1FILEOPEN(JNIEnv *env, jclass cls)
+{
+    return H5E_FILEOPEN;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1FUNC(JNIEnv *env, jclass cls) { return H5E_FUNC; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1FUNC(JNIEnv *env, jclass cls)
+{
+    return H5E_FUNC;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1HEAP(JNIEnv *env, jclass cls) { return H5E_HEAP; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1HEAP(JNIEnv *env, jclass cls)
+{
+    return H5E_HEAP;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1INTERNAL(JNIEnv *env, jclass cls) { return H5E_INTERNAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1INTERNAL(JNIEnv *env, jclass cls)
+{
+    return H5E_INTERNAL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1IO(JNIEnv *env, jclass cls) { return H5E_IO; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1IO(JNIEnv *env, jclass cls)
+{
+    return H5E_IO;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1LINK(JNIEnv *env, jclass cls) { return H5E_LINK; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1LINK(JNIEnv *env, jclass cls)
+{
+    return H5E_LINK;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1LINKCOUNT(JNIEnv *env, jclass cls) { return H5E_LINKCOUNT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1LINKCOUNT(JNIEnv *env, jclass cls)
+{
+    return H5E_LINKCOUNT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1MAJOR(JNIEnv *env, jclass cls) { return H5E_MAJOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1MAJOR(JNIEnv *env, jclass cls)
+{
+    return H5E_MAJOR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1MINOR(JNIEnv *env, jclass cls) { return H5E_MINOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1MINOR(JNIEnv *env, jclass cls)
+{
+    return H5E_MINOR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1MOUNT(JNIEnv *env, jclass cls) { return H5E_MOUNT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1MOUNT(JNIEnv *env, jclass cls)
+{
+    return H5E_MOUNT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1MPI(JNIEnv *env, jclass cls) { return H5E_MPI; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1MPI(JNIEnv *env, jclass cls)
+{
+    return H5E_MPI;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1MPIERRSTR(JNIEnv *env, jclass cls) { return H5E_MPIERRSTR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1MPIERRSTR(JNIEnv *env, jclass cls)
+{
+    return H5E_MPIERRSTR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOFILTER(JNIEnv *env, jclass cls) { return H5E_NOFILTER; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOFILTER(JNIEnv *env, jclass cls)
+{
+    return H5E_NOFILTER;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOIDS(JNIEnv *env, jclass cls) { return H5E_NOIDS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOIDS(JNIEnv *env, jclass cls)
+{
+    return H5E_NOIDS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NONE_1MAJOR(JNIEnv *env, jclass cls) { return H5E_NONE_MAJOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NONE_1MAJOR(JNIEnv *env, jclass cls)
+{
+    return H5E_NONE_MAJOR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NONE_1MINOR(JNIEnv *env, jclass cls) { return H5E_NONE_MINOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NONE_1MINOR(JNIEnv *env, jclass cls)
+{
+    return H5E_NONE_MINOR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOSPACE(JNIEnv *env, jclass cls) { return H5E_NOSPACE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOSPACE(JNIEnv *env, jclass cls)
+{
+    return H5E_NOSPACE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTCACHED(JNIEnv *env, jclass cls) { return H5E_NOTCACHED; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTCACHED(JNIEnv *env, jclass cls)
+{
+    return H5E_NOTCACHED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTFOUND(JNIEnv *env, jclass cls) { return H5E_NOTFOUND; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTFOUND(JNIEnv *env, jclass cls)
+{
+    return H5E_NOTFOUND;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTHDF5(JNIEnv *env, jclass cls) { return H5E_NOTHDF5; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1NOTHDF5(JNIEnv *env, jclass cls)
+{
+    return H5E_NOTHDF5;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1OHDR(JNIEnv *env, jclass cls) { return H5E_OHDR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1OHDR(JNIEnv *env, jclass cls)
+{
+    return H5E_OHDR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1OVERFLOW(JNIEnv *env, jclass cls) { return H5E_OVERFLOW; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1OVERFLOW(JNIEnv *env, jclass cls)
+{
+    return H5E_OVERFLOW;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1PLINE(JNIEnv *env, jclass cls) { return H5E_PLINE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1PLINE(JNIEnv *env, jclass cls)
+{
+    return H5E_PLINE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1PLIST(JNIEnv *env, jclass cls) { return H5E_PLIST; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1PLIST(JNIEnv *env, jclass cls)
+{
+    return H5E_PLIST;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1PROTECT(JNIEnv *env, jclass cls) { return H5E_PROTECT; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1PROTECT(JNIEnv *env, jclass cls)
+{
+    return H5E_PROTECT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1READERROR(JNIEnv *env, jclass cls) { return H5E_READERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1READERROR(JNIEnv *env, jclass cls)
+{
+    return H5E_READERROR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1REFERENCE(JNIEnv *env, jclass cls) { return H5E_REFERENCE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1REFERENCE(JNIEnv *env, jclass cls)
+{
+    return H5E_REFERENCE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1RESOURCE(JNIEnv *env, jclass cls) { return H5E_RESOURCE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1RESOURCE(JNIEnv *env, jclass cls)
+{
+    return H5E_RESOURCE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1RS(JNIEnv *env, jclass cls) { return H5E_RS; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1RS(JNIEnv *env, jclass cls)
+{
+    return H5E_RS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1SEEKERROR(JNIEnv *env, jclass cls) { return H5E_SEEKERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1SEEKERROR(JNIEnv *env, jclass cls)
+{
+    return H5E_SEEKERROR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1SETLOCAL(JNIEnv *env, jclass cls) { return H5E_SETLOCAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1SETLOCAL(JNIEnv *env, jclass cls)
+{
+    return H5E_SETLOCAL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1STORAGE(JNIEnv *env, jclass cls) { return H5E_STORAGE; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1STORAGE(JNIEnv *env, jclass cls)
+{
+    return H5E_STORAGE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1SYM(JNIEnv *env, jclass cls) { return H5E_SYM; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1SYM(JNIEnv *env, jclass cls)
+{
+    return H5E_SYM;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1TRUNCATED(JNIEnv *env, jclass cls) { return H5E_TRUNCATED; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1TRUNCATED(JNIEnv *env, jclass cls)
+{
+    return H5E_TRUNCATED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1TST(JNIEnv *env, jclass cls) { return H5E_TST; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1TST(JNIEnv *env, jclass cls)
+{
+    return H5E_TST;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1UNINITIALIZED(JNIEnv *env, jclass cls) { return H5E_UNINITIALIZED; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1UNINITIALIZED(JNIEnv *env, jclass cls)
+{
+    return H5E_UNINITIALIZED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1UNSUPPORTED(JNIEnv *env, jclass cls) { return H5E_UNSUPPORTED; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1UNSUPPORTED(JNIEnv *env, jclass cls)
+{
+    return H5E_UNSUPPORTED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1VERSION(JNIEnv *env, jclass cls) { return H5E_VERSION; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1VERSION(JNIEnv *env, jclass cls)
+{
+    return H5E_VERSION;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1VFL(JNIEnv *env, jclass cls) { return H5E_VFL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1VFL(JNIEnv *env, jclass cls)
+{
+    return H5E_VFL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1VOL(JNIEnv *env, jclass cls) { return H5E_VOL; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1VOL(JNIEnv *env, jclass cls)
+{
+    return H5E_VOL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1WALK_1DOWNWARD(JNIEnv *env, jclass cls) { return H5E_WALK_DOWNWARD; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1WALK_1DOWNWARD(JNIEnv *env, jclass cls)
+{
+    return H5E_WALK_DOWNWARD;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1WALK_1UPWARD(JNIEnv *env, jclass cls) { return H5E_WALK_UPWARD; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1WALK_1UPWARD(JNIEnv *env, jclass cls)
+{
+    return H5E_WALK_UPWARD;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5E_1WRITEERROR(JNIEnv *env, jclass cls) { return H5E_WRITEERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5E_1WRITEERROR(JNIEnv *env, jclass cls)
+{
+    return H5E_WRITEERROR;
+}
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1IN_1PROGRESS(JNIEnv *env, jclass cls) { return H5ES_STATUS_IN_PROGRESS; }
+Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1IN_1PROGRESS(JNIEnv *env, jclass cls)
+{
+    return H5ES_STATUS_IN_PROGRESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1SUCCEED(JNIEnv *env, jclass cls) { return H5ES_STATUS_SUCCEED; }
+Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1SUCCEED(JNIEnv *env, jclass cls)
+{
+    return H5ES_STATUS_SUCCEED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1FAIL(JNIEnv *env, jclass cls) { return H5ES_STATUS_FAIL; }
+Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1FAIL(JNIEnv *env, jclass cls)
+{
+    return H5ES_STATUS_FAIL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1CANCELED(JNIEnv *env, jclass cls) { return H5ES_STATUS_CANCELED; }
+Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1CANCELED(JNIEnv *env, jclass cls)
+{
+    return H5ES_STATUS_CANCELED;
+}
 
 /* Java does not have unsigned native types */
 H5_GCC_DIAG_OFF("sign-conversion")
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1CREAT(JNIEnv *env, jclass cls) { return H5F_ACC_CREAT; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1CREAT(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_CREAT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1EXCL(JNIEnv *env, jclass cls) { return H5F_ACC_EXCL; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1EXCL(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_EXCL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1RDONLY(JNIEnv *env, jclass cls) { return H5F_ACC_RDONLY; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1RDONLY(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_RDONLY;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1RDWR(JNIEnv *env, jclass cls) { return H5F_ACC_RDWR; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1RDWR(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_RDWR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1TRUNC(JNIEnv *env, jclass cls) { return H5F_ACC_TRUNC; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1TRUNC(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_TRUNC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1DEFAULT(JNIEnv *env, jclass cls) { return H5F_ACC_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1READ(JNIEnv *env, jclass cls) { return H5F_ACC_SWMR_READ; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1READ(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_SWMR_READ;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1WRITE(JNIEnv *env, jclass cls) { return H5F_ACC_SWMR_WRITE; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1ACC_1SWMR_1WRITE(JNIEnv *env, jclass cls)
+{
+    return H5F_ACC_SWMR_WRITE;
+}
 H5_GCC_DIAG_ON("sign-conversion")
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1DEFAULT(JNIEnv *env, jclass cls) { return H5F_CLOSE_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5F_CLOSE_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1SEMI(JNIEnv *env, jclass cls) { return H5F_CLOSE_SEMI; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1SEMI(JNIEnv *env, jclass cls)
+{
+    return H5F_CLOSE_SEMI;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1STRONG(JNIEnv *env, jclass cls) { return H5F_CLOSE_STRONG; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1STRONG(JNIEnv *env, jclass cls)
+{
+    return H5F_CLOSE_STRONG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1WEAK(JNIEnv *env, jclass cls) { return H5F_CLOSE_WEAK; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1CLOSE_1WEAK(JNIEnv *env, jclass cls)
+{
+    return H5F_CLOSE_WEAK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1ERROR(JNIEnv *env, jclass cls){return H5F_LIBVER_ERROR;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1EARLIEST(JNIEnv *env, jclass cls){return H5F_LIBVER_EARLIEST;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1EARLIEST(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_EARLIEST;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V18(JNIEnv *env, jclass cls){return H5F_LIBVER_V18;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V18(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_V18;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V110(JNIEnv *env, jclass cls){return H5F_LIBVER_V110;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V110(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_V110;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V112(JNIEnv *env, jclass cls){return H5F_LIBVER_V112;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V112(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_V112;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V114(JNIEnv *env, jclass cls){return H5F_LIBVER_V114;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1V114(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_V114;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1NBOUNDS(JNIEnv *env, jclass cls){return H5F_LIBVER_NBOUNDS;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1NBOUNDS(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_NBOUNDS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1LATEST(JNIEnv *env, jclass cls){return H5F_LIBVER_LATEST;}
+Java_hdf_hdf5lib_HDF5Constants_H5F_1LIBVER_1LATEST(JNIEnv *env, jclass cls)
+{
+    return H5F_LIBVER_LATEST;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1ALL(JNIEnv *env, jclass cls) { return H5F_OBJ_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_ALL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1ATTR(JNIEnv *env, jclass cls) { return H5F_OBJ_ATTR; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1ATTR(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_ATTR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1DATASET(JNIEnv *env, jclass cls) { return H5F_OBJ_DATASET; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1DATASET(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_DATASET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1DATATYPE(JNIEnv *env, jclass cls) { return H5F_OBJ_DATATYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1DATATYPE(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_DATATYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1FILE(JNIEnv *env, jclass cls) { return H5F_OBJ_FILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1FILE(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_FILE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1GROUP(JNIEnv *env, jclass cls) { return H5F_OBJ_GROUP; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1GROUP(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_GROUP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1LOCAL(JNIEnv *env, jclass cls) { return H5F_OBJ_LOCAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1OBJ_1LOCAL(JNIEnv *env, jclass cls)
+{
+    return H5F_OBJ_LOCAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1SCOPE_1GLOBAL(JNIEnv *env, jclass cls) { return H5F_SCOPE_GLOBAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1SCOPE_1GLOBAL(JNIEnv *env, jclass cls)
+{
+    return H5F_SCOPE_GLOBAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1SCOPE_1LOCAL(JNIEnv *env, jclass cls) { return H5F_SCOPE_LOCAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1SCOPE_1LOCAL(JNIEnv *env, jclass cls)
+{
+    return H5F_SCOPE_LOCAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1UNLIMITED(JNIEnv *env, jclass cls) { return (jint)H5F_UNLIMITED; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1UNLIMITED(JNIEnv *env, jclass cls)
+{
+    return (jint)H5F_UNLIMITED;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1FSM_1AGGR(JNIEnv *env, jclass cls) { return H5F_FSPACE_STRATEGY_FSM_AGGR; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1FSM_1AGGR(JNIEnv *env, jclass cls)
+{
+    return H5F_FSPACE_STRATEGY_FSM_AGGR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1AGGR(JNIEnv *env, jclass cls) { return H5F_FSPACE_STRATEGY_AGGR; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1AGGR(JNIEnv *env, jclass cls)
+{
+    return H5F_FSPACE_STRATEGY_AGGR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1PAGE(JNIEnv *env, jclass cls) { return H5F_FSPACE_STRATEGY_PAGE; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1PAGE(JNIEnv *env, jclass cls)
+{
+    return H5F_FSPACE_STRATEGY_PAGE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1NONE(JNIEnv *env, jclass cls) { return H5F_FSPACE_STRATEGY_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5F_FSPACE_STRATEGY_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1NTYPES(JNIEnv *env, jclass cls) { return H5F_FSPACE_STRATEGY_NTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5F_1FSPACE_1STRATEGY_1NTYPES(JNIEnv *env, jclass cls)
+{
+    return H5F_FSPACE_STRATEGY_NTYPES;
+}
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1CORE(JNIEnv *env, jclass cls) { return H5FD_CORE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1CORE(JNIEnv *env, jclass cls)
+{
+    return H5FD_CORE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1DIRECT(JNIEnv *env, jclass cls) {
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1DIRECT(JNIEnv *env, jclass cls)
+{
 #ifdef H5_HAVE_DIRECT
     return H5FD_DIRECT;
 #else
@@ -451,9 +1046,13 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1DIRECT(JNIEnv *env, jclass cls) {
 #endif
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1FAMILY(JNIEnv *env, jclass cls) { return H5FD_FAMILY; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1FAMILY(JNIEnv *env, jclass cls)
+{
+    return H5FD_FAMILY;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1HDFS(JNIEnv *env, jclass cls) {
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1HDFS(JNIEnv *env, jclass cls)
+{
 #ifdef H5_HAVE_LIBHDFS
     return H5FD_HDFS;
 #else
@@ -461,15 +1060,28 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1HDFS(JNIEnv *env, jclass cls) {
 #endif
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG(JNIEnv *env, jclass cls) { return H5FD_LOG; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MPIO(JNIEnv *env, jclass cls) { return H5FD_MPIO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MPIO(JNIEnv *env, jclass cls)
+{
+    return H5FD_MPIO;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MULTI(JNIEnv *env, jclass cls) { return H5FD_MULTI; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MULTI(JNIEnv *env, jclass cls)
+{
+    return H5FD_MULTI;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1SEC2(JNIEnv *env, jclass cls) { return H5FD_SEC2; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1SEC2(JNIEnv *env, jclass cls)
+{
+    return H5FD_SEC2;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1ROS3(JNIEnv *env, jclass cls) {
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1ROS3(JNIEnv *env, jclass cls)
+{
 #ifdef H5_HAVE_ROS3_VFD
     return H5FD_ROS3;
 #else
@@ -477,9 +1089,13 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1ROS3(JNIEnv *env, jclass cls) {
 #endif
 }
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1STDIO(JNIEnv *env, jclass cls) { return H5FD_STDIO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1STDIO(JNIEnv *env, jclass cls)
+{
+    return H5FD_STDIO;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1WINDOWS(JNIEnv *env, jclass cls) {
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1WINDOWS(JNIEnv *env, jclass cls)
+{
 #ifdef H5_HAVE_WINDOWS
     return H5FD_DIRECT;
 #else
@@ -487,85 +1103,201 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1WINDOWS(JNIEnv *env, jclass cls) {
 #endif
 }
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1READ(JNIEnv *env, jclass cls) { return H5FD_LOG_LOC_READ; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1READ(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_LOC_READ;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1WRITE(JNIEnv *env, jclass cls) { return H5FD_LOG_LOC_WRITE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1WRITE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_LOC_WRITE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1SEEK(JNIEnv *env, jclass cls) { return H5FD_LOG_LOC_SEEK; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1SEEK(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_LOC_SEEK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1IO(JNIEnv *env, jclass cls) { return H5FD_LOG_LOC_IO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1LOC_1IO(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_LOC_IO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1READ(JNIEnv *env, jclass cls) { return H5FD_LOG_FILE_READ; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1READ(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_FILE_READ;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1WRITE(JNIEnv *env, jclass cls) { return H5FD_LOG_FILE_WRITE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1WRITE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_FILE_WRITE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1IO(JNIEnv *env, jclass cls) { return H5FD_LOG_FILE_IO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FILE_1IO(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_FILE_IO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FLAVOR(JNIEnv *env, jclass cls) { return H5FD_LOG_FLAVOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1FLAVOR(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_FLAVOR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1READ(JNIEnv *env, jclass cls) { return H5FD_LOG_NUM_READ; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1READ(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_NUM_READ;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1WRITE(JNIEnv *env, jclass cls) { return H5FD_LOG_NUM_WRITE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1WRITE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_NUM_WRITE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1SEEK(JNIEnv *env, jclass cls) { return H5FD_LOG_NUM_SEEK; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1SEEK(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_NUM_SEEK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1TRUNCATE(JNIEnv *env, jclass cls) { return H5FD_LOG_NUM_TRUNCATE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1TRUNCATE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_NUM_TRUNCATE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1IO(JNIEnv *env, jclass cls) { return H5FD_LOG_NUM_IO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1NUM_1IO(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_NUM_IO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1OPEN(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_OPEN; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1OPEN(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_OPEN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1STAT(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_STAT; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1STAT(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_STAT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1READ(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_READ; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1READ(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_READ;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1WRITE(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_WRITE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1WRITE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_WRITE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1SEEK(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_SEEK; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1SEEK(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_SEEK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1CLOSE(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_CLOSE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1CLOSE(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_CLOSE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1IO(JNIEnv *env, jclass cls) { return H5FD_LOG_TIME_IO; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1TIME_1IO(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_TIME_IO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1ALLOC(JNIEnv *env, jclass cls) { return H5FD_LOG_ALLOC; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1ALLOC(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_ALLOC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1ALL(JNIEnv *env, jclass cls) { return H5FD_LOG_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1LOG_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5FD_LOG_ALL;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1NOLIST(JNIEnv *env, jclass cls) { return H5FD_MEM_NOLIST; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1NOLIST(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_NOLIST;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT(JNIEnv *env, jclass cls) { return H5FD_MEM_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1SUPER(JNIEnv *env, jclass cls) { return H5FD_MEM_SUPER; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1SUPER(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_SUPER;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1BTREE(JNIEnv *env, jclass cls) { return H5FD_MEM_BTREE; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1BTREE(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_BTREE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DRAW(JNIEnv *env, jclass cls) { return H5FD_MEM_DRAW; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DRAW(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_DRAW;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1GHEAP(JNIEnv *env, jclass cls) { return H5FD_MEM_GHEAP; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1GHEAP(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_GHEAP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1LHEAP(JNIEnv *env, jclass cls) { return H5FD_MEM_LHEAP; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1LHEAP(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_LHEAP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1OHDR(JNIEnv *env, jclass cls) { return H5FD_MEM_OHDR; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1OHDR(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_OHDR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1NTYPES(JNIEnv *env, jclass cls) { return H5FD_MEM_NTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1NTYPES(JNIEnv *env, jclass cls)
+{
+    return H5FD_MEM_NTYPES;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1DEFAULT_1HADDR_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(HADDR_MAX/H5FD_MEM_NTYPES); }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1DEFAULT_1HADDR_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(HADDR_MAX / H5FD_MEM_NTYPES);
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)0; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)0;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1SUPER_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)0; }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1SUPER_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)0;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1BTREE_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(1 * (HADDR_MAX / (H5FD_MEM_NTYPES-1))); }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1BTREE_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(1 * (HADDR_MAX / (H5FD_MEM_NTYPES - 1)));
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1DRAW_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(2 * (HADDR_MAX / (H5FD_MEM_NTYPES-1))); }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1DRAW_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(2 * (HADDR_MAX / (H5FD_MEM_NTYPES - 1)));
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1GHEAP_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(3 * (HADDR_MAX / (H5FD_MEM_NTYPES-1))); }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1GHEAP_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(3 * (HADDR_MAX / (H5FD_MEM_NTYPES - 1)));
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1LHEAP_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(4 * (HADDR_MAX / (H5FD_MEM_NTYPES-1))); }
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1LHEAP_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(4 * (HADDR_MAX / (H5FD_MEM_NTYPES - 1)));
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1OHDR_1SIZE(JNIEnv *env, jclass cls) { return (hsize_t)(5 * (HADDR_MAX / (H5FD_MEM_NTYPES-1))); }
-
+Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1OHDR_1SIZE(JNIEnv *env, jclass cls)
+{
+    return (hsize_t)(5 * (HADDR_MAX / (H5FD_MEM_NTYPES - 1)));
+}
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
@@ -574,147 +1306,351 @@ Java_hdf_hdf5lib_HDF5Constants_H5FD_1MEM_1DEFAULT_1OHDR_1SIZE(JNIEnv *env, jclas
 #ifndef H5_NO_DEPRECATED_SYMBOLS
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1DATASET(JNIEnv *env, jclass cls) { return H5G_DATASET; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1DATASET(JNIEnv *env, jclass cls)
+{
+    return H5G_DATASET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1GROUP(JNIEnv *env, jclass cls) { return H5G_GROUP; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1GROUP(JNIEnv *env, jclass cls)
+{
+    return H5G_GROUP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK(JNIEnv *env, jclass cls) { return H5G_LINK; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK(JNIEnv *env, jclass cls)
+{
+    return H5G_LINK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1UDLINK(JNIEnv *env, jclass cls) { return H5G_UDLINK; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1UDLINK(JNIEnv *env, jclass cls)
+{
+    return H5G_UDLINK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_15(JNIEnv *env, jclass cls) { return H5G_RESERVED_5; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_15(JNIEnv *env, jclass cls)
+{
+    return H5G_RESERVED_5;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_16(JNIEnv *env, jclass cls) { return H5G_RESERVED_6; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_16(JNIEnv *env, jclass cls)
+{
+    return H5G_RESERVED_6;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_17(JNIEnv *env, jclass cls) { return H5G_RESERVED_7; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1RESERVED_17(JNIEnv *env, jclass cls)
+{
+    return H5G_RESERVED_7;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1TYPE(JNIEnv *env, jclass cls) { return H5G_TYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1TYPE(JNIEnv *env, jclass cls)
+{
+    return H5G_TYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1UNKNOWN(JNIEnv *env, jclass cls) { return H5G_UNKNOWN; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1UNKNOWN(JNIEnv *env, jclass cls)
+{
+    return H5G_UNKNOWN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1ERROR(JNIEnv *env, jclass cls) { return H5G_LINK_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5G_LINK_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1HARD(JNIEnv *env, jclass cls) { return H5G_LINK_HARD; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1HARD(JNIEnv *env, jclass cls)
+{
+    return H5G_LINK_HARD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1SOFT(JNIEnv *env, jclass cls) { return H5G_LINK_SOFT; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1LINK_1SOFT(JNIEnv *env, jclass cls)
+{
+    return H5G_LINK_SOFT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1NLIBTYPES(JNIEnv *env, jclass cls) { return H5G_NLIBTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1NLIBTYPES(JNIEnv *env, jclass cls)
+{
+    return H5G_NLIBTYPES;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1NTYPES(JNIEnv *env, jclass cls) { return H5G_NTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1NTYPES(JNIEnv *env, jclass cls)
+{
+    return H5G_NTYPES;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1NUSERTYPES(JNIEnv *env, jclass cls) { return H5G_NUSERTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1NUSERTYPES(JNIEnv *env, jclass cls)
+{
+    return H5G_NUSERTYPES;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1SAME_1LOC(JNIEnv *env, jclass cls) { return H5G_SAME_LOC; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1SAME_1LOC(JNIEnv *env, jclass cls)
+{
+    return H5G_SAME_LOC;
+}
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1UNKNOWN(JNIEnv *env, jclass cls){ return H5G_STORAGE_TYPE_UNKNOWN; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1UNKNOWN(JNIEnv *env, jclass cls)
+{
+    return H5G_STORAGE_TYPE_UNKNOWN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1SYMBOL_1TABLE(JNIEnv *env, jclass cls){ return H5G_STORAGE_TYPE_SYMBOL_TABLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1SYMBOL_1TABLE(JNIEnv *env, jclass cls)
+{
+    return H5G_STORAGE_TYPE_SYMBOL_TABLE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1COMPACT(JNIEnv *env, jclass cls){ return H5G_STORAGE_TYPE_COMPACT; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1COMPACT(JNIEnv *env, jclass cls)
+{
+    return H5G_STORAGE_TYPE_COMPACT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1DENSE(JNIEnv *env, jclass cls){ return H5G_STORAGE_TYPE_DENSE; }
+Java_hdf_hdf5lib_HDF5Constants_H5G_1STORAGE_1TYPE_1DENSE(JNIEnv *env, jclass cls)
+{
+    return H5G_STORAGE_TYPE_DENSE;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1UNINIT(JNIEnv *env, jclass cls) { return H5I_UNINIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1UNINIT(JNIEnv *env, jclass cls)
+{
+    return H5I_UNINIT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1BADID(JNIEnv *env, jclass cls) { return H5I_BADID; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1BADID(JNIEnv *env, jclass cls)
+{
+    return H5I_BADID;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1FILE(JNIEnv *env, jclass cls) { return H5I_FILE; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1FILE(JNIEnv *env, jclass cls)
+{
+    return H5I_FILE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1GROUP(JNIEnv *env, jclass cls) { return H5I_GROUP; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1GROUP(JNIEnv *env, jclass cls)
+{
+    return H5I_GROUP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1DATATYPE(JNIEnv *env, jclass cls) { return H5I_DATATYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1DATATYPE(JNIEnv *env, jclass cls)
+{
+    return H5I_DATATYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1DATASPACE(JNIEnv *env, jclass cls) { return H5I_DATASPACE; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1DATASPACE(JNIEnv *env, jclass cls)
+{
+    return H5I_DATASPACE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1DATASET(JNIEnv *env, jclass cls) { return H5I_DATASET; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1DATASET(JNIEnv *env, jclass cls)
+{
+    return H5I_DATASET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1ATTR(JNIEnv *env, jclass cls) { return H5I_ATTR; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1ATTR(JNIEnv *env, jclass cls)
+{
+    return H5I_ATTR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1VFL(JNIEnv *env, jclass cls) { return H5I_VFL; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1VFL(JNIEnv *env, jclass cls)
+{
+    return H5I_VFL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1VOL(JNIEnv *env, jclass cls) { return H5I_VOL; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1VOL(JNIEnv *env, jclass cls)
+{
+    return H5I_VOL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1INVALID_1HID(JNIEnv *env, jclass cls) { return H5I_INVALID_HID; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1INVALID_1HID(JNIEnv *env, jclass cls)
+{
+    return H5I_INVALID_HID;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1GENPROP_1CLS(JNIEnv *env, jclass cls) { return H5I_GENPROP_CLS; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1GENPROP_1CLS(JNIEnv *env, jclass cls)
+{
+    return H5I_GENPROP_CLS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1GENPROP_1LST(JNIEnv *env, jclass cls) { return H5I_GENPROP_LST; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1GENPROP_1LST(JNIEnv *env, jclass cls)
+{
+    return H5I_GENPROP_LST;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1CLASS(JNIEnv *env, jclass cls) { return H5I_ERROR_CLASS; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1CLASS(JNIEnv *env, jclass cls)
+{
+    return H5I_ERROR_CLASS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1MSG(JNIEnv *env, jclass cls) { return H5I_ERROR_MSG; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1MSG(JNIEnv *env, jclass cls)
+{
+    return H5I_ERROR_MSG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1STACK(JNIEnv *env, jclass cls) { return H5I_ERROR_STACK; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1ERROR_1STACK(JNIEnv *env, jclass cls)
+{
+    return H5I_ERROR_STACK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5I_1NTYPES(JNIEnv *env, jclass cls) { return H5I_NTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5I_1NTYPES(JNIEnv *env, jclass cls)
+{
+    return H5I_NTYPES;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1ERROR(JNIEnv *env, jclass cls) { return H5L_TYPE_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5L_TYPE_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1HARD(JNIEnv *env, jclass cls) { return H5L_TYPE_HARD; }
+Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1HARD(JNIEnv *env, jclass cls)
+{
+    return H5L_TYPE_HARD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1SOFT(JNIEnv *env, jclass cls) { return H5L_TYPE_SOFT; }
+Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1SOFT(JNIEnv *env, jclass cls)
+{
+    return H5L_TYPE_SOFT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1EXTERNAL(JNIEnv *env, jclass cls) { return H5L_TYPE_EXTERNAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1EXTERNAL(JNIEnv *env, jclass cls)
+{
+    return H5L_TYPE_EXTERNAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1MAX(JNIEnv *env, jclass cls) { return H5L_TYPE_MAX; }
+Java_hdf_hdf5lib_HDF5Constants_H5L_1TYPE_1MAX(JNIEnv *env, jclass cls)
+{
+    return H5L_TYPE_MAX;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1SHALLOW_1HIERARCHY_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_SHALLOW_HIERARCHY_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1SHALLOW_1HIERARCHY_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_SHALLOW_HIERARCHY_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1SOFT_1LINK_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_EXPAND_SOFT_LINK_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1SOFT_1LINK_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_EXPAND_SOFT_LINK_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1EXT_1LINK_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_EXPAND_EXT_LINK_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1EXT_1LINK_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_EXPAND_EXT_LINK_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1REFERENCE_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_EXPAND_REFERENCE_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1EXPAND_1REFERENCE_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_EXPAND_REFERENCE_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1WITHOUT_1ATTR_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_WITHOUT_ATTR_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1WITHOUT_1ATTR_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_WITHOUT_ATTR_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1PRESERVE_1NULL_1FLAG(JNIEnv *env, jclass cls){return H5O_COPY_PRESERVE_NULL_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1COPY_1PRESERVE_1NULL_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_COPY_PRESERVE_NULL_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1BASIC(JNIEnv *env, jclass cls) { return H5O_INFO_BASIC; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1BASIC(JNIEnv *env, jclass cls)
+{
+    return H5O_INFO_BASIC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1TIME(JNIEnv *env, jclass cls) { return H5O_INFO_TIME; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1TIME(JNIEnv *env, jclass cls)
+{
+    return H5O_INFO_TIME;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1NUM_1ATTRS(JNIEnv *env, jclass cls) { return H5O_INFO_NUM_ATTRS; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1NUM_1ATTRS(JNIEnv *env, jclass cls)
+{
+    return H5O_INFO_NUM_ATTRS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1ALL(JNIEnv *env, jclass cls) { return H5O_INFO_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1INFO_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5O_INFO_ALL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1HDR(JNIEnv *env, jclass cls) { return H5O_NATIVE_INFO_HDR; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1HDR(JNIEnv *env, jclass cls)
+{
+    return H5O_NATIVE_INFO_HDR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1META_1SIZE(JNIEnv *env, jclass cls) { return H5O_NATIVE_INFO_META_SIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1META_1SIZE(JNIEnv *env, jclass cls)
+{
+    return H5O_NATIVE_INFO_META_SIZE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1ALL(JNIEnv *env, jclass cls) { return H5O_NATIVE_INFO_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1NATIVE_1INFO_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5O_NATIVE_INFO_ALL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1NONE_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_NONE_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1NONE_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_NONE_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1SDSPACE_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_SDSPACE_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1SDSPACE_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_SDSPACE_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1DTYPE_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_DTYPE_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1DTYPE_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_DTYPE_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1FILL_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_FILL_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1FILL_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_FILL_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1PLINE_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_PLINE_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1PLINE_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_PLINE_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1ATTR_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_ATTR_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1ATTR_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_ATTR_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1ALL_1FLAG(JNIEnv *env, jclass cls){return H5O_SHMESG_ALL_FLAG; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1SHMESG_1ALL_1FLAG(JNIEnv *env, jclass cls)
+{
+    return H5O_SHMESG_ALL_FLAG;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1UNKNOWN(JNIEnv *env, jclass cls) { return H5O_TYPE_UNKNOWN; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1UNKNOWN(JNIEnv *env, jclass cls)
+{
+    return H5O_TYPE_UNKNOWN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1GROUP(JNIEnv *env, jclass cls) { return H5O_TYPE_GROUP; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1GROUP(JNIEnv *env, jclass cls)
+{
+    return H5O_TYPE_GROUP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1DATASET(JNIEnv *env, jclass cls) { return H5O_TYPE_DATASET; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1DATASET(JNIEnv *env, jclass cls)
+{
+    return H5O_TYPE_DATASET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1NAMED_1DATATYPE(JNIEnv *env, jclass cls) { return H5O_TYPE_NAMED_DATATYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1NAMED_1DATATYPE(JNIEnv *env, jclass cls)
+{
+    return H5O_TYPE_NAMED_DATATYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1NTYPES(JNIEnv *env, jclass cls) { return H5O_TYPE_NTYPES; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1TYPE_1NTYPES(JNIEnv *env, jclass cls)
+{
+    return H5O_TYPE_NTYPES;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5O_1MAX_1TOKEN_1SIZE(JNIEnv *env, jclass cls) { return H5O_MAX_TOKEN_SIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5O_1MAX_1TOKEN_1SIZE(JNIEnv *env, jclass cls)
+{
+    return H5O_MAX_TOKEN_SIZE;
+}
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_HDF5Constants_H5O_1TOKEN_1UNDEF(JNIEnv *env, jclass cls)
 {
@@ -725,690 +1661,1707 @@ Java_hdf_hdf5lib_HDF5Constants_H5O_1TOKEN_1UNDEF(JNIEnv *env, jclass cls)
 }
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1ROOT(JNIEnv *env, jclass cls){return H5P_ROOT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1ROOT(JNIEnv *env, jclass cls)
+{
+    return H5P_ROOT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1CREATE(JNIEnv *env, jclass cls){return H5P_OBJECT_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_OBJECT_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1CREATE(JNIEnv *env, jclass cls){return H5P_FILE_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1ACCESS(JNIEnv *env, jclass cls){return H5P_FILE_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1CREATE(JNIEnv *env, jclass cls){return H5P_DATASET_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1ACCESS(JNIEnv *env, jclass cls){return H5P_DATASET_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1XFER(JNIEnv *env, jclass cls){return H5P_DATASET_XFER;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1XFER(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_XFER;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1MOUNT(JNIEnv *env, jclass cls){return H5P_FILE_MOUNT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1MOUNT(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_MOUNT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1CREATE(JNIEnv *env, jclass cls){return H5P_GROUP_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_GROUP_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1ACCESS(JNIEnv *env, jclass cls){return H5P_GROUP_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_GROUP_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1CREATE(JNIEnv *env, jclass cls){return H5P_DATATYPE_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_DATATYPE_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1ACCESS(JNIEnv *env, jclass cls){return H5P_DATATYPE_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_DATATYPE_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1STRING_1CREATE(JNIEnv *env, jclass cls){return H5P_STRING_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1STRING_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_STRING_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1CREATE(JNIEnv *env, jclass cls){return H5P_ATTRIBUTE_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_ATTRIBUTE_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1ACCESS(JNIEnv *env, jclass cls){return H5P_ATTRIBUTE_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_ATTRIBUTE_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1COPY(JNIEnv *env, jclass cls){return H5P_OBJECT_COPY;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1COPY(JNIEnv *env, jclass cls)
+{
+    return H5P_OBJECT_COPY;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1CREATE(JNIEnv *env, jclass cls){return H5P_LINK_CREATE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1CREATE(JNIEnv *env, jclass cls)
+{
+    return H5P_LINK_CREATE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1ACCESS(JNIEnv *env, jclass cls){return H5P_LINK_ACCESS;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1ACCESS(JNIEnv *env, jclass cls)
+{
+    return H5P_LINK_ACCESS;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1VOL_1INITIALIZE(JNIEnv *env, jclass cls){return H5P_VOL_INITIALIZE;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1VOL_1INITIALIZE(JNIEnv *env, jclass cls)
+{
+    return H5P_VOL_INITIALIZE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_FILE_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_FILE_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_DATASET_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_DATASET_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1XFER_1DEFAULT(JNIEnv *env, jclass cls){return H5P_DATASET_XFER_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATASET_1XFER_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DATASET_XFER_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1MOUNT_1DEFAULT(JNIEnv *env, jclass cls){return H5P_FILE_MOUNT_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1FILE_1MOUNT_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_FILE_MOUNT_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_GROUP_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_GROUP_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_GROUP_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1GROUP_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_GROUP_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_DATATYPE_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DATATYPE_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_DATATYPE_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DATATYPE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DATATYPE_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_ATTRIBUTE_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_ATTRIBUTE_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_ATTRIBUTE_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1ATTRIBUTE_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_ATTRIBUTE_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1COPY_1DEFAULT(JNIEnv *env, jclass cls){return H5P_OBJECT_COPY_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1OBJECT_1COPY_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_OBJECT_COPY_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1CREATE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_LINK_CREATE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1CREATE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_LINK_CREATE_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls){return H5P_LINK_ACCESS_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1LINK_1ACCESS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_LINK_ACCESS_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1VOL_1INITIALIZE_1DEFAULT(JNIEnv *env, jclass cls){return H5P_VOL_INITIALIZE_DEFAULT;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1VOL_1INITIALIZE_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_VOL_INITIALIZE_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1CRT_1ORDER_1TRACKED(JNIEnv *env, jclass cls){return H5P_CRT_ORDER_TRACKED;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1CRT_1ORDER_1TRACKED(JNIEnv *env, jclass cls)
+{
+    return H5P_CRT_ORDER_TRACKED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1CRT_1ORDER_1INDEXED(JNIEnv *env, jclass cls){return H5P_CRT_ORDER_INDEXED;}
+Java_hdf_hdf5lib_HDF5Constants_H5P_1CRT_1ORDER_1INDEXED(JNIEnv *env, jclass cls)
+{
+    return H5P_CRT_ORDER_INDEXED;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1DEFAULT(JNIEnv *env, jclass cls) { return H5P_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5P_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5P_DEFAULT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5P_1NO_1CLASS(JNIEnv *env, jclass cls) { return H5P_ROOT; }
+Java_hdf_hdf5lib_HDF5Constants_H5P_1NO_1CLASS(JNIEnv *env, jclass cls)
+{
+    return H5P_ROOT;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1ERROR(JNIEnv *env, jclass cls) { return H5PL_TYPE_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5PL_TYPE_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1FILTER(JNIEnv *env, jclass cls) { return H5PL_TYPE_FILTER; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1FILTER(JNIEnv *env, jclass cls)
+{
+    return H5PL_TYPE_FILTER;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1VOL(JNIEnv *env, jclass cls) { return H5PL_TYPE_VOL; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1VOL(JNIEnv *env, jclass cls)
+{
+    return H5PL_TYPE_VOL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1NONE(JNIEnv *env, jclass cls) { return H5PL_TYPE_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1TYPE_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5PL_TYPE_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1FILTER_1PLUGIN(JNIEnv *env, jclass cls) { return H5PL_FILTER_PLUGIN; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1FILTER_1PLUGIN(JNIEnv *env, jclass cls)
+{
+    return H5PL_FILTER_PLUGIN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1VOL_1PLUGIN(JNIEnv *env, jclass cls) { return H5PL_VOL_PLUGIN; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1VOL_1PLUGIN(JNIEnv *env, jclass cls)
+{
+    return H5PL_VOL_PLUGIN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5PL_1ALL_1PLUGIN(JNIEnv *env, jclass cls) { return H5PL_ALL_PLUGIN; }
+Java_hdf_hdf5lib_HDF5Constants_H5PL_1ALL_1PLUGIN(JNIEnv *env, jclass cls)
+{
+    return H5PL_ALL_PLUGIN;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1BADTYPE(JNIEnv *env, jclass cls) { return H5R_BADTYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1BADTYPE(JNIEnv *env, jclass cls)
+{
+    return H5R_BADTYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1MAXTYPE(JNIEnv *env, jclass cls) { return H5R_MAXTYPE; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1MAXTYPE(JNIEnv *env, jclass cls)
+{
+    return H5R_MAXTYPE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls) { return H5R_REF_BUF_SIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls)
+{
+    return H5R_REF_BUF_SIZE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJ_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls) { return H5R_OBJ_REF_BUF_SIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJ_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls)
+{
+    return H5R_OBJ_REF_BUF_SIZE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1DSET_1REG_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls) { return H5R_DSET_REG_REF_BUF_SIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1DSET_1REG_1REF_1BUF_1SIZE(JNIEnv *env, jclass cls)
+{
+    return H5R_DSET_REG_REF_BUF_SIZE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1ATTR(JNIEnv *env, jclass cls) { return H5R_ATTR; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1ATTR(JNIEnv *env, jclass cls)
+{
+    return H5R_ATTR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT(JNIEnv *env, jclass cls) { return H5R_OBJECT; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT(JNIEnv *env, jclass cls)
+{
+    return H5R_OBJECT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT1(JNIEnv *env, jclass cls) { return H5R_OBJECT1; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT1(JNIEnv *env, jclass cls)
+{
+    return H5R_OBJECT1;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT2(JNIEnv *env, jclass cls) { return H5R_OBJECT2; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1OBJECT2(JNIEnv *env, jclass cls)
+{
+    return H5R_OBJECT2;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION(JNIEnv *env, jclass cls) { return H5R_DATASET_REGION; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION(JNIEnv *env, jclass cls)
+{
+    return H5R_DATASET_REGION;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION1(JNIEnv *env, jclass cls) { return H5R_DATASET_REGION1; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION1(JNIEnv *env, jclass cls)
+{
+    return H5R_DATASET_REGION1;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION2(JNIEnv *env, jclass cls) { return H5R_DATASET_REGION2; }
+Java_hdf_hdf5lib_HDF5Constants_H5R_1DATASET_1REGION2(JNIEnv *env, jclass cls)
+{
+    return H5R_DATASET_REGION2;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1ALL(JNIEnv *env, jclass cls) { return H5S_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5S_ALL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1MAX_1RANK(JNIEnv *env, jclass cls) { return H5S_MAX_RANK; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1MAX_1RANK(JNIEnv *env, jclass cls)
+{
+    return H5S_MAX_RANK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1NO_1CLASS(JNIEnv *env, jclass cls) { return H5S_NO_CLASS; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1NO_1CLASS(JNIEnv *env, jclass cls)
+{
+    return H5S_NO_CLASS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1NULL(JNIEnv *env, jclass cls) { return H5S_NULL; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1NULL(JNIEnv *env, jclass cls)
+{
+    return H5S_NULL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SCALAR(JNIEnv *env, jclass cls) { return H5S_SCALAR; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SCALAR(JNIEnv *env, jclass cls)
+{
+    return H5S_SCALAR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1ALL(JNIEnv *env, jclass cls) { return H5S_SEL_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_ALL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1ERROR(JNIEnv *env, jclass cls) { return H5S_SEL_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1HYPERSLABS(JNIEnv *env, jclass cls) { return H5S_SEL_HYPERSLABS; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1HYPERSLABS(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_HYPERSLABS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1N(JNIEnv *env, jclass cls) { return H5S_SEL_N; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1N(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_N;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1NONE(JNIEnv *env, jclass cls) { return H5S_SEL_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1POINTS(JNIEnv *env, jclass cls) { return H5S_SEL_POINTS; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SEL_1POINTS(JNIEnv *env, jclass cls)
+{
+    return H5S_SEL_POINTS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1AND(JNIEnv *env, jclass cls) { return H5S_SELECT_AND; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1AND(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_AND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1APPEND(JNIEnv *env, jclass cls) { return H5S_SELECT_APPEND; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1APPEND(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_APPEND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1INVALID(JNIEnv *env, jclass cls) { return H5S_SELECT_INVALID; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1INVALID(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_INVALID;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOOP(JNIEnv *env, jclass cls) { return H5S_SELECT_NOOP; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOOP(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_NOOP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOTA(JNIEnv *env, jclass cls) { return H5S_SELECT_NOTA; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOTA(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_NOTA;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOTB(JNIEnv *env, jclass cls) { return H5S_SELECT_NOTB; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1NOTB(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_NOTB;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1OR(JNIEnv *env, jclass cls) { return H5S_SELECT_OR; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1OR(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_OR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1PREPEND(JNIEnv *env, jclass cls) { return H5S_SELECT_PREPEND; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1PREPEND(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_PREPEND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1SET(JNIEnv *env, jclass cls) { return H5S_SELECT_SET; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1SET(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_SET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1XOR(JNIEnv *env, jclass cls) { return H5S_SELECT_XOR; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SELECT_1XOR(JNIEnv *env, jclass cls)
+{
+    return H5S_SELECT_XOR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1SIMPLE(JNIEnv *env, jclass cls) { return H5S_SIMPLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1SIMPLE(JNIEnv *env, jclass cls)
+{
+    return H5S_SIMPLE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5S_1UNLIMITED(JNIEnv *env, jclass cls) { return (jint)H5S_UNLIMITED; }
+Java_hdf_hdf5lib_HDF5Constants_H5S_1UNLIMITED(JNIEnv *env, jclass cls)
+{
+    return (jint)H5S_UNLIMITED;
+}
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B16(JNIEnv *env, jclass cls) { return H5T_ALPHA_B16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B16(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_B16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B32(JNIEnv *env, jclass cls) { return H5T_ALPHA_B32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B32(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_B32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B64(JNIEnv *env, jclass cls) { return H5T_ALPHA_B64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B64(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_B64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B8(JNIEnv *env, jclass cls) { return H5T_ALPHA_B8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1B8(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_B8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1F32(JNIEnv *env, jclass cls) { return H5T_ALPHA_F32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1F32(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_F32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1F64(JNIEnv *env, jclass cls) { return H5T_ALPHA_F64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1F64(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_F64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I16(JNIEnv *env, jclass cls) { return H5T_ALPHA_I16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I16(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_I16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I32(JNIEnv *env, jclass cls) { return H5T_ALPHA_I32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I32(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_I32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I64(JNIEnv *env, jclass cls) { return H5T_ALPHA_I64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I64(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_I64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I8(JNIEnv *env, jclass cls) { return H5T_ALPHA_I8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1I8(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_I8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U16(JNIEnv *env, jclass cls) { return H5T_ALPHA_U16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U16(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_U16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U32(JNIEnv *env, jclass cls) { return H5T_ALPHA_U32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U32(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_U32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U64(JNIEnv *env, jclass cls) { return H5T_ALPHA_U64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U64(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_U64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U8(JNIEnv *env, jclass cls) { return H5T_ALPHA_U8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ALPHA_1U8(JNIEnv *env, jclass cls)
+{
+    return H5T_ALPHA_U8;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ARRAY(JNIEnv *env, jclass cls) { return H5T_ARRAY; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ARRAY(JNIEnv *env, jclass cls)
+{
+    return H5T_ARRAY;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1BITFIELD(JNIEnv *env, jclass cls) { return H5T_BITFIELD; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1BITFIELD(JNIEnv *env, jclass cls)
+{
+    return H5T_BITFIELD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1BKG_1NO(JNIEnv *env, jclass cls) { return H5T_BKG_NO; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1BKG_1NO(JNIEnv *env, jclass cls)
+{
+    return H5T_BKG_NO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1BKG_1YES(JNIEnv *env, jclass cls) { return H5T_BKG_YES; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1BKG_1YES(JNIEnv *env, jclass cls)
+{
+    return H5T_BKG_YES;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1C_1S1(JNIEnv *env, jclass cls) { return H5T_C_S1; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1C_1S1(JNIEnv *env, jclass cls)
+{
+    return H5T_C_S1;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPOUND(JNIEnv *env, jclass cls) { return H5T_COMPOUND; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1COMPOUND(JNIEnv *env, jclass cls)
+{
+    return H5T_COMPOUND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1CONV(JNIEnv *env, jclass cls) { return H5T_CONV_CONV; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1CONV(JNIEnv *env, jclass cls)
+{
+    return H5T_CONV_CONV;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1FREE(JNIEnv *env, jclass cls) { return H5T_CONV_FREE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1FREE(JNIEnv *env, jclass cls)
+{
+    return H5T_CONV_FREE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1INIT(JNIEnv *env, jclass cls) { return H5T_CONV_INIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CONV_1INIT(JNIEnv *env, jclass cls)
+{
+    return H5T_CONV_INIT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1ERROR(JNIEnv *env, jclass cls) { return H5T_CSET_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1ASCII(JNIEnv *env, jclass cls) { return H5T_CSET_ASCII; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1ASCII(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_ASCII;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1UTF8(JNIEnv *env, jclass cls) { return H5T_CSET_UTF8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1UTF8(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_UTF8;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_110(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_10; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_110(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_10;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_111(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_11; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_111(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_11;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_112(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_12; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_112(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_12;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_113(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_13; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_113(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_13;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_114(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_14; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_114(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_14;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_115(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_15; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_115(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_15;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_12(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_2; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_12(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_2;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_13(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_3; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_13(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_3;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_14(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_4; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_14(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_4;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_15(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_5; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_15(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_5;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_16(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_6; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_16(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_6;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_17(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_7; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_17(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_7;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_18(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_18(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_8;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_19(JNIEnv *env, jclass cls) { return H5T_CSET_RESERVED_9; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1CSET_1RESERVED_19(JNIEnv *env, jclass cls)
+{
+    return H5T_CSET_RESERVED_9;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1ASCEND(JNIEnv *env, jclass cls) { return H5T_DIR_ASCEND; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1ASCEND(JNIEnv *env, jclass cls)
+{
+    return H5T_DIR_ASCEND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1DEFAULT(JNIEnv *env, jclass cls) { return H5T_DIR_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5T_DIR_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1DESCEND(JNIEnv *env, jclass cls) { return H5T_DIR_DESCEND; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1DIR_1DESCEND(JNIEnv *env, jclass cls)
+{
+    return H5T_DIR_DESCEND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ENUM(JNIEnv *env, jclass cls) { return H5T_ENUM; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ENUM(JNIEnv *env, jclass cls)
+{
+    return H5T_ENUM;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1FLOAT(JNIEnv *env, jclass cls) { return H5T_FLOAT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1FLOAT(JNIEnv *env, jclass cls)
+{
+    return H5T_FLOAT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1FORTRAN_1S1(JNIEnv *env, jclass cls) { return H5T_FORTRAN_S1; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1FORTRAN_1S1(JNIEnv *env, jclass cls)
+{
+    return H5T_FORTRAN_S1;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F32BE(JNIEnv *env, jclass cls) { return H5T_IEEE_F32BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F32BE(JNIEnv *env, jclass cls)
+{
+    return H5T_IEEE_F32BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F32LE(JNIEnv *env, jclass cls) { return H5T_IEEE_F32LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F32LE(JNIEnv *env, jclass cls)
+{
+    return H5T_IEEE_F32LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F64BE(JNIEnv *env, jclass cls) { return H5T_IEEE_F64BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F64BE(JNIEnv *env, jclass cls)
+{
+    return H5T_IEEE_F64BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F64LE(JNIEnv *env, jclass cls) { return H5T_IEEE_F64LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1IEEE_1F64LE(JNIEnv *env, jclass cls)
+{
+    return H5T_IEEE_F64LE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEGER(JNIEnv *env, jclass cls) { return H5T_INTEGER; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEGER(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEGER;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B16(JNIEnv *env, jclass cls) { return H5T_INTEL_B16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B16(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_B16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B32(JNIEnv *env, jclass cls) { return H5T_INTEL_B32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B32(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_B32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B64(JNIEnv *env, jclass cls) { return H5T_INTEL_B64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B64(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_B64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B8(JNIEnv *env, jclass cls) { return H5T_INTEL_B8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1B8(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_B8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1F32(JNIEnv *env, jclass cls) { return H5T_INTEL_F32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1F32(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_F32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1F64(JNIEnv *env, jclass cls) { return H5T_INTEL_F64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1F64(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_F64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I16(JNIEnv *env, jclass cls) { return H5T_INTEL_I16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I16(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_I16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I32(JNIEnv *env, jclass cls) { return H5T_INTEL_I32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I32(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_I32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I64(JNIEnv *env, jclass cls) { return H5T_INTEL_I64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I64(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_I64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I8(JNIEnv *env, jclass cls) { return H5T_INTEL_I8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1I8(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_I8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U16(JNIEnv *env, jclass cls) { return H5T_INTEL_U16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U16(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_U16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U32(JNIEnv *env, jclass cls) { return H5T_INTEL_U32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U32(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_U32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U64(JNIEnv *env, jclass cls) { return H5T_INTEL_U64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U64(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_U64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U8(JNIEnv *env, jclass cls) { return H5T_INTEL_U8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1INTEL_1U8(JNIEnv *env, jclass cls)
+{
+    return H5T_INTEL_U8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B16(JNIEnv *env, jclass cls) { return H5T_MIPS_B16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B16(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_B16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B32(JNIEnv *env, jclass cls) { return H5T_MIPS_B32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B32(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_B32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B64(JNIEnv *env, jclass cls) { return H5T_MIPS_B64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B64(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_B64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B8(JNIEnv *env, jclass cls) { return H5T_MIPS_B8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1B8(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_B8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1F32(JNIEnv *env, jclass cls) { return H5T_MIPS_F32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1F32(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_F32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1F64(JNIEnv *env, jclass cls) { return H5T_MIPS_F64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1F64(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_F64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I16(JNIEnv *env, jclass cls) { return H5T_MIPS_I16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I16(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_I16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I32(JNIEnv *env, jclass cls) { return H5T_MIPS_I32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I32(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_I32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I64(JNIEnv *env, jclass cls) { return H5T_MIPS_I64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I64(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_I64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I8(JNIEnv *env, jclass cls) { return H5T_MIPS_I8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1I8(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_I8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U16(JNIEnv *env, jclass cls) { return H5T_MIPS_U16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U16(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_U16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U32(JNIEnv *env, jclass cls) { return H5T_MIPS_U32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U32(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_U32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U64(JNIEnv *env, jclass cls) { return H5T_MIPS_U64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U64(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_U64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U8(JNIEnv *env, jclass cls) { return H5T_MIPS_U8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1MIPS_1U8(JNIEnv *env, jclass cls)
+{
+    return H5T_MIPS_U8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B16(JNIEnv *env, jclass cls) { return H5T_NATIVE_B16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_B16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B32(JNIEnv *env, jclass cls) { return H5T_NATIVE_B32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_B32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B64(JNIEnv *env, jclass cls) { return H5T_NATIVE_B64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_B64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B8(JNIEnv *env, jclass cls) { return H5T_NATIVE_B8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1B8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_B8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1CHAR(JNIEnv *env, jclass cls) { return H5T_NATIVE_CHAR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1CHAR(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_CHAR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1DOUBLE(JNIEnv *env, jclass cls) { return H5T_NATIVE_DOUBLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1DOUBLE(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_DOUBLE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1FLOAT(JNIEnv *env, jclass cls) { return H5T_NATIVE_FLOAT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1FLOAT(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_FLOAT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HADDR(JNIEnv *env, jclass cls) { return H5T_NATIVE_HADDR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HADDR(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_HADDR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HBOOL(JNIEnv *env, jclass cls) { return H5T_NATIVE_HBOOL; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HBOOL(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_HBOOL;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HERR(JNIEnv *env, jclass cls) { return H5T_NATIVE_HERR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HERR(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_HERR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HSIZE(JNIEnv *env, jclass cls) { return H5T_NATIVE_HSIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HSIZE(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_HSIZE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HSSIZE(JNIEnv *env, jclass cls) { return H5T_NATIVE_HSSIZE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1HSSIZE(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_HSSIZE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST16(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_FAST16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_FAST16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST32(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_FAST32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_FAST32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST64(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_FAST64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_FAST64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST8(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_FAST8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1FAST8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_FAST8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST16(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_LEAST16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_LEAST16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST32(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_LEAST32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_LEAST32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST64(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_LEAST64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_LEAST64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST8(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT_LEAST8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT_1LEAST8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT_LEAST8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT16(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT32(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT64(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT8(JNIEnv *env, jclass cls) { return H5T_NATIVE_INT8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1INT8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_INT8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LDOUBLE(JNIEnv *env, jclass cls) { return H5T_NATIVE_LDOUBLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LDOUBLE(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_LDOUBLE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LLONG(JNIEnv *env, jclass cls) { return H5T_NATIVE_LLONG; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LLONG(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_LLONG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LONG(JNIEnv *env, jclass cls) { return H5T_NATIVE_LONG; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1LONG(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_LONG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1OPAQUE(JNIEnv *env, jclass cls) { return H5T_NATIVE_OPAQUE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1OPAQUE(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_OPAQUE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1SCHAR(JNIEnv *env, jclass cls) { return H5T_NATIVE_SCHAR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1SCHAR(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_SCHAR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1SHORT(JNIEnv *env, jclass cls) { return H5T_NATIVE_SHORT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1SHORT(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_SHORT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UCHAR(JNIEnv *env, jclass cls) { return H5T_NATIVE_UCHAR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UCHAR(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UCHAR;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST16(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_FAST16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_FAST16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST32(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_FAST32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_FAST32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST64(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_FAST64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_FAST64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST8(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_FAST8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1FAST8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_FAST8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST16(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_LEAST16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_LEAST16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST32(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_LEAST32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_LEAST32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST64(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_LEAST64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_LEAST64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST8(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT_LEAST8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT_1LEAST8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT_LEAST8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT16(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT16; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT16(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT16;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT32(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT32; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT32(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT32;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT64(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT64; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT64(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT64;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT8(JNIEnv *env, jclass cls) { return H5T_NATIVE_UINT8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1UINT8(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_UINT8;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1ULLONG(JNIEnv *env, jclass cls) { return H5T_NATIVE_ULLONG; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1ULLONG(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_ULLONG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1ULONG(JNIEnv *env, jclass cls) { return H5T_NATIVE_ULONG; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1ULONG(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_ULONG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1USHORT(JNIEnv *env, jclass cls) { return H5T_NATIVE_USHORT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NATIVE_1USHORT(JNIEnv *env, jclass cls)
+{
+    return H5T_NATIVE_USHORT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NCLASSES(JNIEnv *env, jclass cls) { return H5T_NCLASSES; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NCLASSES(JNIEnv *env, jclass cls)
+{
+    return H5T_NCLASSES;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NO_1CLASS(JNIEnv *env, jclass cls) { return H5T_NO_CLASS; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NO_1CLASS(JNIEnv *env, jclass cls)
+{
+    return H5T_NO_CLASS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1ERROR(JNIEnv *env, jclass cls) { return H5T_NORM_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_NORM_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1IMPLIED(JNIEnv *env, jclass cls) { return H5T_NORM_IMPLIED; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1IMPLIED(JNIEnv *env, jclass cls)
+{
+    return H5T_NORM_IMPLIED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1MSBSET(JNIEnv *env, jclass cls) { return H5T_NORM_MSBSET; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1MSBSET(JNIEnv *env, jclass cls)
+{
+    return H5T_NORM_MSBSET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1NONE(JNIEnv *env, jclass cls) { return H5T_NORM_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NORM_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5T_NORM_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NPAD(JNIEnv *env, jclass cls) { return H5T_NPAD; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NPAD(JNIEnv *env, jclass cls)
+{
+    return H5T_NPAD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1NSGN(JNIEnv *env, jclass cls) { return H5T_NSGN; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1NSGN(JNIEnv *env, jclass cls)
+{
+    return H5T_NSGN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1OPAQUE(JNIEnv *env, jclass cls) { return H5T_OPAQUE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1OPAQUE(JNIEnv *env, jclass cls)
+{
+    return H5T_OPAQUE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1OPAQUE_1TAG_1MAX(JNIEnv *env, jclass cls) { return H5T_OPAQUE_TAG_MAX; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1OPAQUE_1TAG_1MAX(JNIEnv *env, jclass cls)
+{
+    return H5T_OPAQUE_TAG_MAX;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1BE(JNIEnv *env, jclass cls) { return H5T_ORDER_BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1BE(JNIEnv *env, jclass cls)
+{
+    return H5T_ORDER_BE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1ERROR(JNIEnv *env, jclass cls) { return H5T_ORDER_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_ORDER_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1LE(JNIEnv *env, jclass cls) { return H5T_ORDER_LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1LE(JNIEnv *env, jclass cls)
+{
+    return H5T_ORDER_LE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1NONE(JNIEnv *env, jclass cls) { return H5T_ORDER_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5T_ORDER_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1VAX(JNIEnv *env, jclass cls) { return H5T_ORDER_VAX; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1ORDER_1VAX(JNIEnv *env, jclass cls)
+{
+    return H5T_ORDER_VAX;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1BACKGROUND(JNIEnv *env, jclass cls) { return H5T_PAD_BACKGROUND; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1BACKGROUND(JNIEnv *env, jclass cls)
+{
+    return H5T_PAD_BACKGROUND;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ERROR(JNIEnv *env, jclass cls) { return H5T_PAD_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_PAD_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ONE(JNIEnv *env, jclass cls) { return H5T_PAD_ONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ONE(JNIEnv *env, jclass cls)
+{
+    return H5T_PAD_ONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ZERO(JNIEnv *env, jclass cls) { return H5T_PAD_ZERO; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PAD_1ZERO(JNIEnv *env, jclass cls)
+{
+    return H5T_PAD_ZERO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1DONTCARE(JNIEnv *env, jclass cls) { return H5T_PERS_DONTCARE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1DONTCARE(JNIEnv *env, jclass cls)
+{
+    return H5T_PERS_DONTCARE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1HARD(JNIEnv *env, jclass cls) { return H5T_PERS_HARD; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1HARD(JNIEnv *env, jclass cls)
+{
+    return H5T_PERS_HARD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1SOFT(JNIEnv *env, jclass cls) { return H5T_PERS_SOFT; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1PERS_1SOFT(JNIEnv *env, jclass cls)
+{
+    return H5T_PERS_SOFT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1REFERENCE(JNIEnv *env, jclass cls) { return H5T_REFERENCE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1REFERENCE(JNIEnv *env, jclass cls)
+{
+    return H5T_REFERENCE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_12(JNIEnv *env, jclass cls) { return H5T_SGN_2; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_12(JNIEnv *env, jclass cls)
+{
+    return H5T_SGN_2;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_1ERROR(JNIEnv *env, jclass cls) { return H5T_SGN_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_SGN_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_1NONE(JNIEnv *env, jclass cls) { return H5T_SGN_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1SGN_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5T_SGN_NONE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B16BE(JNIEnv *env, jclass cls) { return H5T_STD_B16BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B16BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B16BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B16LE(JNIEnv *env, jclass cls) { return H5T_STD_B16LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B16LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B16LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B32BE(JNIEnv *env, jclass cls) { return H5T_STD_B32BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B32BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B32BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B32LE(JNIEnv *env, jclass cls) { return H5T_STD_B32LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B32LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B32LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B64BE(JNIEnv *env, jclass cls) { return H5T_STD_B64BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B64BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B64BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B64LE(JNIEnv *env, jclass cls) { return H5T_STD_B64LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B64LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B64LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B8BE(JNIEnv *env, jclass cls) { return H5T_STD_B8BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B8BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B8BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B8LE(JNIEnv *env, jclass cls) { return H5T_STD_B8LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1B8LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_B8LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I16BE(JNIEnv *env, jclass cls) { return H5T_STD_I16BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I16BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I16BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I16LE(JNIEnv *env, jclass cls) { return H5T_STD_I16LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I16LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I16LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I32BE(JNIEnv *env, jclass cls) { return H5T_STD_I32BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I32BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I32BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I32LE(JNIEnv *env, jclass cls) { return H5T_STD_I32LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I32LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I32LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I64BE(JNIEnv *env, jclass cls) { return H5T_STD_I64BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I64BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I64BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I64LE(JNIEnv *env, jclass cls) { return H5T_STD_I64LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I64LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I64LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I8BE(JNIEnv *env, jclass cls) { return H5T_STD_I8BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I8BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I8BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I8LE(JNIEnv *env, jclass cls) { return H5T_STD_I8LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1I8LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_I8LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF_1DSETREG(JNIEnv *env, jclass cls) { return H5T_STD_REF_DSETREG; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF_1DSETREG(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_REF_DSETREG;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF_1OBJ(JNIEnv *env, jclass cls) { return H5T_STD_REF_OBJ; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF_1OBJ(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_REF_OBJ;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF(JNIEnv *env, jclass cls) { return H5T_STD_REF; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1REF(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_REF;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U16BE(JNIEnv *env, jclass cls) { return H5T_STD_U16BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U16BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U16BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U16LE(JNIEnv *env, jclass cls) { return H5T_STD_U16LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U16LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U16LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U32BE(JNIEnv *env, jclass cls) { return H5T_STD_U32BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U32BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U32BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U32LE(JNIEnv *env, jclass cls) { return H5T_STD_U32LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U32LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U32LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U64BE(JNIEnv *env, jclass cls) { return H5T_STD_U64BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U64BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U64BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U64LE(JNIEnv *env, jclass cls) { return H5T_STD_U64LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U64LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U64LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U8BE(JNIEnv *env, jclass cls) { return H5T_STD_U8BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U8BE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U8BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U8LE(JNIEnv *env, jclass cls) { return H5T_STD_U8LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STD_1U8LE(JNIEnv *env, jclass cls)
+{
+    return H5T_STD_U8LE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1ERROR(JNIEnv *env, jclass cls) { return H5T_STR_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1NULLPAD(JNIEnv *env, jclass cls) { return H5T_STR_NULLPAD; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1NULLPAD(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_NULLPAD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1NULLTERM(JNIEnv *env, jclass cls) { return H5T_STR_NULLTERM; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1NULLTERM(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_NULLTERM;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_110(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_10; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_110(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_10;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_111(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_11; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_111(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_11;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_112(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_12; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_112(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_12;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_113(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_13; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_113(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_13;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_114(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_14; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_114(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_14;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_115(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_15; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_115(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_15;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_13(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_3; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_13(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_3;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_14(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_4; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_14(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_4;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_15(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_5; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_15(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_5;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_16(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_6; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_16(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_6;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_17(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_7; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_17(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_7;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_18(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_8; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_18(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_8;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_19(JNIEnv *env, jclass cls) { return H5T_STR_RESERVED_9; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1RESERVED_19(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_RESERVED_9;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1SPACEPAD(JNIEnv *env, jclass cls) { return H5T_STR_SPACEPAD; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STR_1SPACEPAD(JNIEnv *env, jclass cls)
+{
+    return H5T_STR_SPACEPAD;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1STRING(JNIEnv *env, jclass cls) { return H5T_STRING; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1STRING(JNIEnv *env, jclass cls)
+{
+    return H5T_STRING;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1TIME(JNIEnv *env, jclass cls) { return H5T_TIME; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1TIME(JNIEnv *env, jclass cls)
+{
+    return H5T_TIME;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D32BE(JNIEnv *env, jclass cls) { return H5T_UNIX_D32BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D32BE(JNIEnv *env, jclass cls)
+{
+    return H5T_UNIX_D32BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D32LE(JNIEnv *env, jclass cls) { return H5T_UNIX_D32LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D32LE(JNIEnv *env, jclass cls)
+{
+    return H5T_UNIX_D32LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D64BE(JNIEnv *env, jclass cls) { return H5T_UNIX_D64BE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D64BE(JNIEnv *env, jclass cls)
+{
+    return H5T_UNIX_D64BE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D64LE(JNIEnv *env, jclass cls) { return H5T_UNIX_D64LE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1UNIX_1D64LE(JNIEnv *env, jclass cls)
+{
+    return H5T_UNIX_D64LE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1VARIABLE(JNIEnv *env, jclass cls) { return (int)H5T_VARIABLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1VARIABLE(JNIEnv *env, jclass cls)
+{
+    return (int)H5T_VARIABLE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1VLEN(JNIEnv *env, jclass cls) { return H5T_VLEN; }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1VLEN(JNIEnv *env, jclass cls)
+{
+    return H5T_VLEN;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5T_1VL_1T(JNIEnv *env, jclass cls) { return sizeof(hvl_t); }
+Java_hdf_hdf5lib_HDF5Constants_H5T_1VL_1T(JNIEnv *env, jclass cls)
+{
+    return sizeof(hvl_t);
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1CAP_1FLAG_1NONE(JNIEnv *env, jclass cls) { return H5VL_CAP_FLAG_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1CAP_1FLAG_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5VL_CAP_FLAG_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1CAP_1FLAG_1THREADSAFE(JNIEnv *env, jclass cls) { return H5VL_CAP_FLAG_THREADSAFE; }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1CAP_1FLAG_1THREADSAFE(JNIEnv *env, jclass cls)
+{
+    return H5VL_CAP_FLAG_THREADSAFE;
+}
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE(JNIEnv *env, jclass cls) { return H5VL_NATIVE; }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE(JNIEnv *env, jclass cls)
+{
+    return H5VL_NATIVE;
+}
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1NAME(JNIEnv *env, jclass cls) { return (jstring)ENVPTR->NewStringUTF(ENVONLY, H5VL_NATIVE_NAME); }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1NAME(JNIEnv *env, jclass cls)
+{
+    return (jstring)ENVPTR->NewStringUTF(ENVONLY, H5VL_NATIVE_NAME);
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1VALUE(JNIEnv *env, jclass cls) { return H5VL_NATIVE_VALUE; }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1VALUE(JNIEnv *env, jclass cls)
+{
+    return H5VL_NATIVE_VALUE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1VERSION(JNIEnv *env, jclass cls) { return H5VL_NATIVE_VERSION; }
+Java_hdf_hdf5lib_HDF5Constants_H5VL_1NATIVE_1VERSION(JNIEnv *env, jclass cls)
+{
+    return H5VL_NATIVE_VERSION;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1INVALID(JNIEnv *env, jclass cls) { return H5_VOL_INVALID; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1INVALID(JNIEnv *env, jclass cls)
+{
+    return H5_VOL_INVALID;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1NATIVE(JNIEnv *env, jclass cls) { return H5_VOL_NATIVE; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1NATIVE(JNIEnv *env, jclass cls)
+{
+    return H5_VOL_NATIVE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1RESERVED(JNIEnv *env, jclass cls) { return H5_VOL_RESERVED; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1RESERVED(JNIEnv *env, jclass cls)
+{
+    return H5_VOL_RESERVED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1MAX(JNIEnv *env, jclass cls) { return H5_VOL_MAX; }
+Java_hdf_hdf5lib_HDF5Constants_H5_1VOL_1MAX(JNIEnv *env, jclass cls)
+{
+    return H5_VOL_MAX;
+}
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1CONT(JNIEnv *env, jclass cls) { return H5Z_CB_CONT; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1CONT(JNIEnv *env, jclass cls)
+{
+    return H5Z_CB_CONT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1ERROR(JNIEnv *env, jclass cls) { return H5Z_CB_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5Z_CB_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1FAIL(JNIEnv *env, jclass cls) { return H5Z_CB_FAIL; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1FAIL(JNIEnv *env, jclass cls)
+{
+    return H5Z_CB_FAIL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1NO(JNIEnv *env, jclass cls) { return H5Z_CB_NO; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1CB_1NO(JNIEnv *env, jclass cls)
+{
+    return H5Z_CB_NO;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1DISABLE_1EDC(JNIEnv *env, jclass cls) { return H5Z_DISABLE_EDC; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1DISABLE_1EDC(JNIEnv *env, jclass cls)
+{
+    return H5Z_DISABLE_EDC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1ENABLE_1EDC(JNIEnv *env, jclass cls) { return H5Z_ENABLE_EDC; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1ENABLE_1EDC(JNIEnv *env, jclass cls)
+{
+    return H5Z_ENABLE_EDC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1ERROR_1EDC(JNIEnv *env, jclass cls) { return H5Z_ERROR_EDC; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1ERROR_1EDC(JNIEnv *env, jclass cls)
+{
+    return H5Z_ERROR_EDC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1CONFIG_1DECODE_1ENABLED(JNIEnv *env, jclass cls) { return H5Z_FILTER_CONFIG_DECODE_ENABLED; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1CONFIG_1DECODE_1ENABLED(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_CONFIG_DECODE_ENABLED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1CONFIG_1ENCODE_1ENABLED(JNIEnv *env, jclass cls) { return H5Z_FILTER_CONFIG_ENCODE_ENABLED; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1CONFIG_1ENCODE_1ENABLED(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_CONFIG_ENCODE_ENABLED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1DEFLATE(JNIEnv *env, jclass cls) { return H5Z_FILTER_DEFLATE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1DEFLATE(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_DEFLATE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1ERROR(JNIEnv *env, jclass cls) { return H5Z_FILTER_ERROR; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1ERROR(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_ERROR;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1FLETCHER32(JNIEnv *env, jclass cls) { return H5Z_FILTER_FLETCHER32; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1FLETCHER32(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_FLETCHER32;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1MAX(JNIEnv *env, jclass cls) { return H5Z_FILTER_MAX; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1MAX(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_MAX;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1NBIT(JNIEnv *env, jclass cls) {return H5Z_FILTER_NBIT; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1NBIT(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_NBIT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1NONE(JNIEnv *env, jclass cls) { return H5Z_FILTER_NONE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1NONE(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_NONE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1RESERVED(JNIEnv *env, jclass cls) { return H5Z_FILTER_RESERVED; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1RESERVED(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_RESERVED;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SCALEOFFSET(JNIEnv *env, jclass cls){ return H5Z_FILTER_SCALEOFFSET; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SCALEOFFSET(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_SCALEOFFSET;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SHUFFLE(JNIEnv *env, jclass cls) { return H5Z_FILTER_SHUFFLE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SHUFFLE(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_SHUFFLE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SZIP(JNIEnv *env, jclass cls) { return H5Z_FILTER_SZIP; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1SZIP(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_SZIP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1DEFMASK(JNIEnv *env, jclass cls) { return H5Z_FLAG_DEFMASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1DEFMASK(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_DEFMASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1INVMASK(JNIEnv *env, jclass cls) { return H5Z_FLAG_INVMASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1INVMASK(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_INVMASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1MANDATORY(JNIEnv *env, jclass cls) { return H5Z_FLAG_MANDATORY; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1MANDATORY(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_MANDATORY;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1OPTIONAL(JNIEnv *env, jclass cls) { return H5Z_FLAG_OPTIONAL; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1OPTIONAL(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_OPTIONAL;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1REVERSE(JNIEnv *env, jclass cls) { return H5Z_FLAG_REVERSE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1REVERSE(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_REVERSE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1SKIP_1EDC(JNIEnv *env, jclass cls) { return H5Z_FLAG_SKIP_EDC; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FLAG_1SKIP_1EDC(JNIEnv *env, jclass cls)
+{
+    return H5Z_FLAG_SKIP_EDC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1MAX_1NFILTERS(JNIEnv *env, jclass cls) { return H5Z_MAX_NFILTERS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1MAX_1NFILTERS(JNIEnv *env, jclass cls)
+{
+    return H5Z_MAX_NFILTERS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1NO_1EDC(JNIEnv *env, jclass cls) { return H5Z_NO_EDC; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1NO_1EDC(JNIEnv *env, jclass cls)
+{
+    return H5Z_NO_EDC;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1INT_1MINBITS_1DEFAULT(JNIEnv *env, jclass cls) { return H5Z_SO_INT_MINBITS_DEFAULT; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1INT_1MINBITS_1DEFAULT(JNIEnv *env, jclass cls)
+{
+    return H5Z_SO_INT_MINBITS_DEFAULT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1FLOAT_1DSCALE(JNIEnv *env, jclass cls){return H5Z_SO_FLOAT_DSCALE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1FLOAT_1DSCALE(JNIEnv *env, jclass cls)
+{
+    return H5Z_SO_FLOAT_DSCALE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1FLOAT_1ESCALE(JNIEnv *env, jclass cls){return H5Z_SO_FLOAT_ESCALE; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1FLOAT_1ESCALE(JNIEnv *env, jclass cls)
+{
+    return H5Z_SO_FLOAT_ESCALE;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1INT(JNIEnv *env, jclass cls){return H5Z_SO_INT; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SO_1INT(JNIEnv *env, jclass cls)
+{
+    return H5Z_SO_INT;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SHUFFLE_1USER_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_SHUFFLE_USER_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SHUFFLE_1USER_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SHUFFLE_USER_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SHUFFLE_1TOTAL_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_SHUFFLE_TOTAL_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SHUFFLE_1TOTAL_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SHUFFLE_TOTAL_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1USER_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_SZIP_USER_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1USER_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_USER_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1TOTAL_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_SZIP_TOTAL_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1TOTAL_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_TOTAL_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1MASK(JNIEnv *env, jclass cls) { return H5Z_SZIP_PARM_MASK; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1MASK(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_PARM_MASK;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1PPB(JNIEnv *env, jclass cls) { return H5Z_SZIP_PARM_PPB; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1PPB(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_PARM_PPB;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1BPP(JNIEnv *env, jclass cls) { return H5Z_SZIP_PARM_BPP; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1BPP(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_PARM_BPP;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1PPS(JNIEnv *env, jclass cls) { return H5Z_SZIP_PARM_PPS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SZIP_1PARM_1PPS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SZIP_PARM_PPS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1NBIT_1USER_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_NBIT_USER_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1NBIT_1USER_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_NBIT_USER_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1SCALEOFFSET_1USER_1NPARMS(JNIEnv *env, jclass cls) { return H5Z_SCALEOFFSET_USER_NPARMS; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1SCALEOFFSET_1USER_1NPARMS(JNIEnv *env, jclass cls)
+{
+    return H5Z_SCALEOFFSET_USER_NPARMS;
+}
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1ALL(JNIEnv *env, jclass cls) { return H5Z_FILTER_ALL; }
+Java_hdf_hdf5lib_HDF5Constants_H5Z_1FILTER_1ALL(JNIEnv *env, jclass cls)
+{
+    return H5Z_FILTER_ALL;
+}
 
 H5_GCC_DIAG_ON("missing-prototypes")
 H5_GCC_DIAG_ON("unused-parameter")
@@ -1416,4 +3369,3 @@ H5_GCC_DIAG_ON("unused-parameter")
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
-
diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c
index f0dd691..5773fff 100644
--- a/java/src/jni/h5Imp.c
+++ b/java/src/jni/h5Imp.c
@@ -46,8 +46,7 @@ extern "C" {
  * Signature: ()I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5open
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5open(JNIEnv *env, jclass clss)
 {
     herr_t retVal = FAIL;
 
@@ -66,8 +65,7 @@ done:
  * Signature: ()I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5close
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5close(JNIEnv *env, jclass clss)
 {
     herr_t retVal = FAIL;
 
@@ -86,8 +84,7 @@ done:
  * Signature: ()I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5dont_1atexit
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5dont_1atexit(JNIEnv *env, jclass clss)
 {
     herr_t retVal = FAIL;
 
@@ -106,21 +103,22 @@ done:
  * Signature: ([I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5get_1libversion
-    (JNIEnv *env, jclass clss, jintArray libversion)
+Java_hdf_hdf5lib_H5_H5get_1libversion(JNIEnv *env, jclass clss, jintArray libversion)
 {
-    jboolean  libversionArrayIsCopy;
-    int      *libversionArray = NULL;
-    herr_t    status = FAIL;
+    jboolean libversionArrayIsCopy;
+    int *    libversionArray = NULL;
+    herr_t   status          = FAIL;
 
     UNUSED(clss);
 
     if (libversion == NULL)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5get_libversion: libversion is NULL");
 
-    PIN_INT_ARRAY(ENVONLY, libversion, libversionArray, &libversionArrayIsCopy, "H5get_libversion: libversion input not pinned");
+    PIN_INT_ARRAY(ENVONLY, libversion, libversionArray, &libversionArrayIsCopy,
+                  "H5get_libversion: libversion input not pinned");
 
-    if ((status = H5get_libversion((unsigned *) &(libversionArray[0]), (unsigned *) &(libversionArray[1]), (unsigned *) &(libversionArray[2]))) < 0)
+    if ((status = H5get_libversion((unsigned *)&(libversionArray[0]), (unsigned *)&(libversionArray[1]),
+                                   (unsigned *)&(libversionArray[2]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -136,8 +134,7 @@ done:
  * Signature: (III)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5check_1version
-    (JNIEnv *env, jclass clss, jint majnum, jint minnum, jint relnum)
+Java_hdf_hdf5lib_H5_H5check_1version(JNIEnv *env, jclass clss, jint majnum, jint minnum, jint relnum)
 {
     UNUSED(env);
     UNUSED(clss);
@@ -152,8 +149,7 @@ Java_hdf_hdf5lib_H5_H5check_1version
  *
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5garbage_1collect
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5garbage_1collect(JNIEnv *env, jclass clss)
 {
     herr_t retVal = FAIL;
 
@@ -172,16 +168,16 @@ done:
  * Signature: (IIIIII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5set_1free_1list_1limits
-    (JNIEnv *env, jclass clss, jint reg_global_lim, jint reg_list_lim,
-        jint arr_global_lim, jint arr_list_lim, jint blk_global_lim, jint blk_list_lim )
+Java_hdf_hdf5lib_H5_H5set_1free_1list_1limits(JNIEnv *env, jclass clss, jint reg_global_lim,
+                                              jint reg_list_lim, jint arr_global_lim, jint arr_list_lim,
+                                              jint blk_global_lim, jint blk_list_lim)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5set_free_list_limits((int)reg_global_lim, (int)reg_list_lim,
-            (int)arr_global_lim, (int)arr_list_lim, (int)blk_global_lim, (int)blk_list_lim)) < 0)
+    if ((retVal = H5set_free_list_limits((int)reg_global_lim, (int)reg_list_lim, (int)arr_global_lim,
+                                         (int)arr_list_lim, (int)blk_global_lim, (int)blk_list_lim)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -194,8 +190,7 @@ done:
  * Signature: ()Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe(JNIEnv *env, jclass clss)
 {
     hbool_t is_ts = false;
 
@@ -208,7 +203,6 @@ done:
     return (jboolean)is_ts;
 } /* end Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5Imp.h b/java/src/jni/h5Imp.h
index 756b8bb..696d7d2 100644
--- a/java/src/jni/h5Imp.h
+++ b/java/src/jni/h5Imp.h
@@ -26,45 +26,35 @@ extern "C" {
  * Method:    H5open
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5open
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5open(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5close
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5close
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5close(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5dont_atexit
  * Signature: ()I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5dont_1atexit
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5dont_1atexit(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5get_libversion
  * Signature: ([I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5get_1libversion
-  (JNIEnv *, jclass, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5get_1libversion(JNIEnv *, jclass, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5check_version
  * Signature: (III)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5check_1version
-  (JNIEnv *, jclass, jint, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5check_1version(JNIEnv *, jclass, jint, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
@@ -72,27 +62,22 @@ Java_hdf_hdf5lib_H5_H5check_1version
  * Signature: ()I
  *
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5garbage_1collect
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5garbage_1collect(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5set_free_list_limits
  * Signature: (IIIIII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5set_1free_1list_1limits
-  (JNIEnv *, jclass, jint, jint, jint, jint, jint, jint );
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5set_1free_1list_1limits(JNIEnv *, jclass, jint, jint, jint, jint,
+                                                                     jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5is_library_threadsafe
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe
-  (JNIEnv *, jclass);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe(JNIEnv *, jclass);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5aImp.c b/java/src/jni/h5aImp.c
index 8b3f9e5..fdfa14c 100644
--- a/java/src/jni/h5aImp.c
+++ b/java/src/jni/h5aImp.c
@@ -54,19 +54,17 @@ static herr_t H5A_iterate_cb(hid_t g_id, const char *name, const H5A_info_t *inf
 /* Local Macros     */
 /********************/
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Acreate
  * Signature: (JLjava/lang/String;JJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
-          jlong space_id, jlong create_plist)
+Java_hdf_hdf5lib_H5__1H5Acreate(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
+                                jlong space_id, jlong create_plist)
 {
     const char *attrName = NULL;
-    hid_t       attr_id = H5I_INVALID_HID;
+    hid_t       attr_id  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -75,7 +73,8 @@ Java_hdf_hdf5lib_H5__1H5Acreate
 
     PIN_JAVA_STRING(ENVONLY, name, attrName, NULL, "H5Acreate: attribute name not pinned");
 
-    if ((attr_id = H5Acreate2((hid_t)loc_id, attrName, (hid_t)type_id, (hid_t)space_id, (hid_t)create_plist, (hid_t)H5P_DEFAULT)) < 0)
+    if ((attr_id = H5Acreate2((hid_t)loc_id, attrName, (hid_t)type_id, (hid_t)space_id, (hid_t)create_plist,
+                              (hid_t)H5P_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -91,13 +90,12 @@ done:
  * Signature: (JLjava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name)
+Java_hdf_hdf5lib_H5__1H5Aopen_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name)
 {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     const char *attrName = NULL;
 #endif
-    hid_t       attr_id = H5I_INVALID_HID;
+    hid_t attr_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -111,7 +109,7 @@ Java_hdf_hdf5lib_H5__1H5Aopen_1name
 
     PIN_JAVA_STRING(ENVONLY, name, attrName, NULL, "H5Aopen_name: attribute name not pinned");
 
-    if((attr_id = H5Aopen_name((hid_t)loc_id, attrName)) < 0)
+    if ((attr_id = H5Aopen_name((hid_t)loc_id, attrName)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 #endif
 
@@ -130,8 +128,7 @@ done:
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jint idx)
+Java_hdf_hdf5lib_H5__1H5Aopen_1idx(JNIEnv *env, jclass clss, jlong loc_id, jint idx)
 {
     hid_t attr_id = H5I_INVALID_HID;
 
@@ -142,7 +139,7 @@ Java_hdf_hdf5lib_H5__1H5Aopen_1idx
     UNUSED(idx);
     H5_UNIMPLEMENTED(ENVONLY, "H5Aopen_idx: not implemented");
 #else
-    if ((attr_id = H5Aopen_idx((hid_t) loc_id, (unsigned int) idx)) < 0)
+    if ((attr_id = H5Aopen_idx((hid_t)loc_id, (unsigned int)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 #endif
 
@@ -156,13 +153,13 @@ done:
  * Signature: (JJ[BZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jbyteArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jbyteArray buf,
+                            jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jbyte    *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jbyte *  readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -183,7 +180,8 @@ Java_hdf_hdf5lib_H5_H5Aread
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread: read buffer not critically pinned");
+        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                "H5Aread: read buffer not critically pinned");
     }
     else {
         PIN_BYTE_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread: read buffer not pinned");
@@ -211,13 +209,13 @@ done:
  * Signature: (JJ[BZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jbyteArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jbyteArray buf,
+                             jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jbyte    *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jbyte *  writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -238,7 +236,8 @@ Java_hdf_hdf5lib_H5_H5Awrite
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite: write buffer not critically pinned");
+        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                "H5Awrite: write buffer not critically pinned");
     }
     else {
         PIN_BYTE_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite: write buffer not pinned");
@@ -266,13 +265,13 @@ done:
  * Signature: (JJ[SZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1short
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jshortArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread_1short(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                   jshortArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jshort   *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jshort * readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -293,7 +292,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1short
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_short: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_short: read buffer not critically pinned");
+        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                 "H5Aread_short: read buffer not critically pinned");
     }
     else {
         PIN_SHORT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_short: read buffer not pinned");
@@ -321,13 +321,13 @@ done:
  * Signature: (JJ[SZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1short
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jshortArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite_1short(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                    jshortArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jshort   *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jshort * writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -348,7 +348,8 @@ Java_hdf_hdf5lib_H5_H5Awrite_1short
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite_short: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_short: write buffer not critically pinned");
+        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                 "H5Awrite_short: write buffer not critically pinned");
     }
     else {
         PIN_SHORT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_short: write buffer not pinned");
@@ -376,13 +377,13 @@ done:
  * Signature: (JJ[IZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1int
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jintArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jintArray buf,
+                                 jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    htri_t    data_class;
-    jint     *readBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    htri_t   data_class;
+    jint *   readBuf = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -403,7 +404,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1int
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_int: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_int: read buffer not critically pinned");
+        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                               "H5Aread_int: read buffer not critically pinned");
     }
     else {
         PIN_INT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_int: read buffer not pinned");
@@ -431,13 +433,13 @@ done:
  * Signature: (JJ[IZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1int
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jintArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite_1int(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jintArray buf,
+                                  jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jint     *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jint *   writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -458,7 +460,8 @@ Java_hdf_hdf5lib_H5_H5Awrite_1int
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite_int: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_int: write buffer not critically pinned");
+        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                               "H5Awrite_int: write buffer not critically pinned");
     }
     else {
         PIN_INT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_int: write buffer not pinned");
@@ -486,13 +489,13 @@ done:
  * Signature: (JJ[JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1long
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jlongArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread_1long(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jlongArray buf,
+                                  jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jlong    *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jlong *  readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -513,7 +516,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1long
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_long: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_long: read buffer not critically pinned");
+        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                "H5Aread_long: read buffer not critically pinned");
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_long: read buffer not pinned");
@@ -541,13 +545,13 @@ done:
  * Signature: (JJ[JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1long
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jlongArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite_1long(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jlongArray buf,
+                                   jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jlong    *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jlong *  writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -568,7 +572,8 @@ Java_hdf_hdf5lib_H5_H5Awrite_1long
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite_long: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_long: write buffer not critically pinned");
+        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                "H5Awrite_long: write buffer not critically pinned");
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_long: write buffer not pinned");
@@ -596,13 +601,13 @@ done:
  * Signature: (JJ[FZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1float
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jfloatArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread_1float(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                   jfloatArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jfloat   *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jfloat * readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -623,7 +628,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1float
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_float: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_float: read buffer not critically pinned");
+        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                 "H5Aread_float: read buffer not critically pinned");
     }
     else {
         PIN_FLOAT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_float: read buffer not pinned");
@@ -651,13 +657,13 @@ done:
  * Signature: (JJ[FZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1float
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jfloatArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite_1float(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                    jfloatArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jfloat   *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jfloat * writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -678,7 +684,8 @@ Java_hdf_hdf5lib_H5_H5Awrite_1float
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite_float: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_float: write buffer not critically pinned");
+        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                 "H5Awrite_float: write buffer not critically pinned");
     }
     else {
         PIN_FLOAT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_float: write buffer not pinned");
@@ -706,13 +713,13 @@ done:
  * Signature: (JJ[DZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1double
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jdoubleArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Aread_1double(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                    jdoubleArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jdouble  *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jdouble *readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -733,7 +740,8 @@ Java_hdf_hdf5lib_H5_H5Aread_1double
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_double: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_double: read buffer not critically pinned");
+        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                  "H5Aread_double: read buffer not critically pinned");
     }
     else {
         PIN_DOUBLE_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Aread_double: read buffer not pinned");
@@ -761,13 +769,13 @@ done:
  * Signature: (JJ[DZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1double
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jdoubleArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Awrite_1double(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                     jdoubleArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jdouble  *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jdouble *writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -788,7 +796,8 @@ Java_hdf_hdf5lib_H5_H5Awrite_1double
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Awrite_double: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_double: write buffer not critically pinned");
+        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                  "H5Awrite_double: write buffer not critically pinned");
     }
     else {
         PIN_DOUBLE_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Awrite_double: write buffer not pinned");
@@ -816,16 +825,16 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1string
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray j_buf)
+Java_hdf_hdf5lib_H5_H5Aread_1string(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                    jobjectArray j_buf)
 {
-    jstring  jstr;
-    size_t   str_len;
-    size_t   pos;
-    jsize    i, n;
-    char    *c_buf = NULL;
-    char    *cstr = NULL;
-    herr_t   status = FAIL;
+    jstring jstr;
+    size_t  str_len;
+    size_t  pos;
+    jsize   i, n;
+    char *  c_buf  = NULL;
+    char *  cstr   = NULL;
+    herr_t  status = FAIL;
 
     UNUSED(clss);
 
@@ -840,22 +849,23 @@ Java_hdf_hdf5lib_H5_H5Aread_1string
     if (!(str_len = H5Tget_size((hid_t)mem_type_id)))
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (cstr = (char *) HDmalloc(str_len + 1)))
+    if (NULL == (cstr = (char *)HDmalloc(str_len + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aread_string: memory allocation failed");
 
-    if (NULL == (c_buf = (char *) HDmalloc((size_t)n * str_len)))
+    if (NULL == (c_buf = (char *)HDmalloc((size_t)n * str_len)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aread_string: memory allocation failed");
 
     if ((status = H5Aread((hid_t)attr_id, (hid_t)mem_type_id, c_buf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0, pos = 0; i < n; i++) {
-        HDmemcpy(cstr, c_buf+pos, str_len);
+        HDmemcpy(cstr, c_buf + pos, str_len);
         cstr[str_len] = '\0';
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, cstr))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aread_string: out of memory - unable to construct string from UTF characters");
+            H5_OUT_OF_MEMORY_ERROR(
+                ENVONLY, "H5Aread_string: out of memory - unable to construct string from UTF characters");
         }
 
         ENVPTR->SetObjectArrayElement(ENVONLY, j_buf, i, jstr);
@@ -881,14 +891,14 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1string
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray j_buf)
+Java_hdf_hdf5lib_H5_H5Awrite_1string(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                     jobjectArray j_buf)
 {
     const char *utf8 = NULL;
     jstring     obj;
     size_t      i, str_len;
     jsize       n;
-    char       *c_buf = NULL;
+    char *      c_buf  = NULL;
     herr_t      status = FAIL;
 
     UNUSED(clss);
@@ -904,11 +914,11 @@ Java_hdf_hdf5lib_H5_H5Awrite_1string
     if (!(str_len = H5Tget_size((hid_t)mem_type_id)))
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (c_buf = (char *) HDmalloc((size_t)n * str_len)))
+    if (NULL == (c_buf = (char *)HDmalloc((size_t)n * str_len)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Awrite_string: memory allocation failed");
 
-    for (i = 0; i < (size_t) n; i++) {
-        if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)j_buf, (jsize) i))) {
+    for (i = 0; i < (size_t)n; i++) {
+        if (NULL == (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)j_buf, (jsize)i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
@@ -951,16 +961,15 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AreadVL
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
 {
     H5T_class_t type_class;
-    htri_t      isStr = 0;
-    htri_t      isVlenStr = 0;
-    htri_t      isComplex = 0;
+    htri_t      isStr      = 0;
+    htri_t      isVlenStr  = 0;
+    htri_t      isComplex  = 0;
     htri_t      isComplex2 = 0;
     hid_t       nested_tid = H5I_INVALID_HID;
-    herr_t      status = FAIL;
+    herr_t      status     = FAIL;
 
     UNUSED(clss);
 
@@ -980,7 +989,7 @@ Java_hdf_hdf5lib_H5_H5AreadVL
         if ((num_members = H5Tget_nmembers(mem_type_id)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
-        for (i = 0; i < (unsigned) num_members; i++) {
+        for (i = 0; i < (unsigned)num_members; i++) {
             if ((nested_tid = H5Tget_member_type((hid_t)mem_type_id, i)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
@@ -1023,21 +1032,21 @@ done:
  * buffer in turn.
  */
 static herr_t
-H5AreadVL_str
-    (JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
+H5AreadVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
 {
-    jstring   jstr;
-    jsize     i, n;
-    char    **strs = NULL;
-    herr_t    status = FAIL;
+    jstring jstr;
+    jsize   i, n;
+    char ** strs   = NULL;
+    herr_t  status = FAIL;
 
     if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5AreadVL_str: buf length < 0");
     }
 
-    if (NULL == (strs = (char **) HDcalloc((size_t)n, sizeof(char *))))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AreadVL_str: failed to allocate variable length string read buffer");
+    if (NULL == (strs = (char **)HDcalloc((size_t)n, sizeof(char *))))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5AreadVL_str: failed to allocate variable length string read buffer");
 
     if ((status = H5Aread(aid, tid, strs)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1081,18 +1090,17 @@ done:
  * in the output buffer in turn.
  */
 static herr_t
-H5AreadVL_asstr
-    (JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
+H5AreadVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
 {
-    hsize_t      dims[H5S_MAX_RANK];
-    jstring      jstr;
-    h5str_t      h5str;
-    size_t       typeSize;
-    size_t       i;
-    hid_t        sid = H5I_INVALID_HID;
-    jsize        n;
-    void        *readBuf = NULL;
-    herr_t       status = FAIL;
+    hsize_t dims[H5S_MAX_RANK];
+    jstring jstr;
+    h5str_t h5str;
+    size_t  typeSize;
+    size_t  i;
+    hid_t   sid = H5I_INVALID_HID;
+    jsize   n;
+    void *  readBuf = NULL;
+    herr_t  status  = FAIL;
 
     HDmemset(&h5str, 0, sizeof(h5str_t));
 
@@ -1122,16 +1130,16 @@ H5AreadVL_asstr
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AreadVL_asstr: failed to allocate buffer");
 
     /* Convert each element to a char string */
-    for (i = 0; i < (size_t) n; i++) {
+    for (i = 0; i < (size_t)n; i++) {
         h5str.s[0] = '\0';
 
-        if (!h5str_sprintf(ENVONLY, &h5str, aid, tid, &(((char *) readBuf)[i * typeSize]), typeSize, 0))
+        if (!h5str_sprintf(ENVONLY, &h5str, aid, tid, &(((char *)readBuf)[i * typeSize]), typeSize, 0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, h5str.s)))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize) i, jstr);
+        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize)i, jstr);
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         ENVPTR->DeleteLocalRef(ENVONLY, jstr);
@@ -1156,16 +1164,15 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AwriteVL
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
 {
     H5T_class_t type_class;
-    htri_t      isStr = 0;
-    htri_t      isVlenStr = 0;
-    htri_t      isComplex = 0;
+    htri_t      isStr      = 0;
+    htri_t      isVlenStr  = 0;
+    htri_t      isComplex  = 0;
     htri_t      isComplex2 = 0;
     hid_t       nested_tid = H5I_INVALID_HID;
-    herr_t      status = FAIL;
+    herr_t      status     = FAIL;
 
     UNUSED(clss);
 
@@ -1185,7 +1192,7 @@ Java_hdf_hdf5lib_H5_H5AwriteVL
         if ((num_members = H5Tget_nmembers(mem_type_id)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
-        for(i = 0; i < (unsigned) num_members; i++) {
+        for (i = 0; i < (unsigned)num_members; i++) {
             if ((nested_tid = H5Tget_member_type((hid_t)mem_type_id, i)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
@@ -1227,28 +1234,28 @@ done:
  * The buffer of C-strings is then written to the HDF5 attribute specified.
  */
 static herr_t
-H5AwriteVL_str
-    (JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
+H5AwriteVL_str(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
 {
-    const char  *utf8 = NULL;
-    jstring      obj;
-    jsize        size;
-    jint         i;
-    char       **writeBuf = NULL;
-    herr_t       status = FAIL;
-
-    if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray) buf)) < 0) {
+    const char *utf8 = NULL;
+    jstring     obj;
+    jsize       size;
+    jint        i;
+    char **     writeBuf = NULL;
+    herr_t      status   = FAIL;
+
+    if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5AwriteVL_str: buf length < 0");
     }
 
-    if (NULL == (writeBuf = (char **) HDcalloc((size_t)size + 1, sizeof(char *))))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AwriteVL_str: failed to allocate variable length string write buffer");
+    if (NULL == (writeBuf = (char **)HDcalloc((size_t)size + 1, sizeof(char *))))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5AwriteVL_str: failed to allocate variable length string write buffer");
 
     for (i = 0; i < size; ++i) {
         jsize length;
 
-        if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray) buf, i))) {
+        if (NULL == (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
@@ -1263,7 +1270,7 @@ H5AwriteVL_str
 
         PIN_JAVA_STRING(ENVONLY, obj, utf8, NULL, "H5AwriteVL_str: string not pinned");
 
-        if (NULL == (writeBuf[i] = (char *) HDmalloc((size_t)length + 1)))
+        if (NULL == (writeBuf[i] = (char *)HDmalloc((size_t)length + 1)))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AwriteVL_str: failed to allocate string buffer");
 
         HDstrncpy(writeBuf[i], utf8, (size_t)length);
@@ -1299,8 +1306,7 @@ done:
  * elements is then written to the HDF5 attribute.
  */
 static herr_t
-H5AwriteVL_asstr
-    (JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
+H5AwriteVL_asstr(JNIEnv *env, hid_t aid, hid_t tid, jobjectArray buf)
 {
     const char *utf8 = NULL;
     hsize_t     dims[H5S_MAX_RANK];
@@ -1309,8 +1315,8 @@ H5AwriteVL_asstr
     size_t      i;
     hid_t       sid = H5I_INVALID_HID;
     jsize       n;
-    void       *writeBuf = NULL;
-    herr_t      status = FAIL;
+    void *      writeBuf = NULL;
+    herr_t      status   = FAIL;
 
     if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
@@ -1333,14 +1339,14 @@ H5AwriteVL_asstr
      * free space in time. Instead, we use "H5free_memory(strs[i])" to free individual strings
      * once done.
      */
-    for (i = 0; i < (size_t) n; i++) {
-        if (NULL == (jstr = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray) buf, (jsize) i))) {
+    for (i = 0; i < (size_t)n; i++) {
+        if (NULL == (jstr = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, (jsize)i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
              * If the string object was NULL, skip it.
              */
-            HDmemset(&(((char *) writeBuf)[i * typeSize]), 0, typeSize);
+            HDmemset(&(((char *)writeBuf)[i * typeSize]), 0, typeSize);
             continue;
         }
 
@@ -1356,7 +1362,7 @@ H5AwriteVL_asstr
          * one before destroying it with h5str_convert.
          */
 
-        if (!h5str_convert(ENVONLY, (char **) &utf8, aid, tid, &(((char *) writeBuf)[i * typeSize]), 0))
+        if (!h5str_convert(ENVONLY, (char **)&utf8, aid, tid, &(((char *)writeBuf)[i * typeSize]), 0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         UNPIN_JAVA_STRING(ENVONLY, jstr, utf8);
@@ -1387,14 +1393,14 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
-    (JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                      jobjectArray buf)
 {
-    H5R_ref_t       *ref_data = NULL;
-    h5str_t          h5str;
-    jstring          jstr;
-    jsize            i, n;
-    herr_t           status = FAIL;
+    H5R_ref_t *ref_data = NULL;
+    h5str_t    h5str;
+    jstring    jstr;
+    jsize      i, n;
+    herr_t     status = FAIL;
 
     UNUSED(clss);
 
@@ -1405,7 +1411,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Aread_reg_ref: buf length < 0");
     }
 
-    if (NULL == (ref_data = (H5R_ref_t *) HDcalloc(1, (size_t)n * sizeof(H5R_ref_t))))
+    if (NULL == (ref_data = (H5R_ref_t *)HDcalloc(1, (size_t)n * sizeof(H5R_ref_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aread_reg_ref: failed to allocate read buffer");
 
     if ((status = H5Aread((hid_t)attr_id, (hid_t)mem_type_id, ref_data)) < 0)
@@ -1419,7 +1425,7 @@ Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
     for (i = 0; i < n; i++) {
         h5str.s[0] = '\0';
 
-        if (!h5str_sprintf(ENVONLY, &h5str, (hid_t)attr_id, (hid_t)mem_type_id, (void*)&ref_data[i], 0, 0))
+        if (!h5str_sprintf(ENVONLY, &h5str, (hid_t)attr_id, (hid_t)mem_type_id, (void *)&ref_data[i], 0, 0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, h5str.s)))
@@ -1446,8 +1452,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1space
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5__1H5Aget_1space(JNIEnv *env, jclass clss, jlong attr_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1466,8 +1471,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1type
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5__1H5Aget_1type(JNIEnv *env, jclass clss, jlong attr_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1486,19 +1490,18 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1name
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5_H5Aget_1name(JNIEnv *env, jclass clss, jlong attr_id)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size;
-    char    *attrName = NULL;
+    jstring str = NULL;
+    ssize_t buf_size;
+    char *  attrName = NULL;
 
     UNUSED(clss);
 
     if ((buf_size = H5Aget_name((hid_t)attr_id, 0, NULL)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (attrName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (attrName = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aget_name: failed to allocate attribute name buffer");
 
     if (H5Aget_name((hid_t)attr_id, (size_t)buf_size + 1, attrName) < 0)
@@ -1521,8 +1524,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1num_1attrs
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Aget_1num_1attrs(JNIEnv *env, jclass clss, jlong loc_id)
 {
     int retVal = FAIL;
 
@@ -1546,11 +1548,10 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name)
+Java_hdf_hdf5lib_H5_H5Adelete(JNIEnv *env, jclass clss, jlong loc_id, jstring name)
 {
     const char *attrName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -1575,8 +1576,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Aclose
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5__1H5Aclose(JNIEnv *env, jclass clss, jlong attr_id)
 {
     herr_t retVal = FAIL;
 
@@ -1595,12 +1595,11 @@ done:
  * Signature: (JLjava/lang/String;JJJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
-        jlong space_id, jlong create_plist, jlong access_plist)
+Java_hdf_hdf5lib_H5__1H5Acreate2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
+                                 jlong space_id, jlong create_plist, jlong access_plist)
 {
     const char *attrName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1609,8 +1608,8 @@ Java_hdf_hdf5lib_H5__1H5Acreate2
 
     PIN_JAVA_STRING(ENVONLY, name, attrName, NULL, "H5Acreate2: attribute name not pinned");
 
-    if ((status = H5Acreate2((hid_t)loc_id, attrName, (hid_t)type_id,
-            (hid_t)space_id, (hid_t)create_plist, (hid_t)access_plist)) < 0)
+    if ((status = H5Acreate2((hid_t)loc_id, attrName, (hid_t)type_id, (hid_t)space_id, (hid_t)create_plist,
+                             (hid_t)access_plist)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1626,12 +1625,11 @@ done:
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen
-    (JNIEnv *env, jclass clss, jlong obj_id, jstring name, jlong access_plist)
+Java_hdf_hdf5lib_H5__1H5Aopen(JNIEnv *env, jclass clss, jlong obj_id, jstring name, jlong access_plist)
 
 {
     const char *attrName = NULL;
-    hid_t       retVal = H5I_INVALID_HID;
+    hid_t       retVal   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1656,11 +1654,11 @@ done:
  * Signature: (JLjava/lang/String;IIJJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint idx_type, jint order, jlong n, jlong aapl_id, jlong lapl_id)
+Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint idx_type,
+                                       jint order, jlong n, jlong aapl_id, jlong lapl_id)
 {
     const char *objName = NULL;
-    hid_t       retVal = H5I_INVALID_HID;
+    hid_t       retVal  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1669,8 +1667,8 @@ Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Aopen_by_idx: object name not pinned");
 
-    if ((retVal = H5Aopen_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type,
-            (H5_iter_order_t)order, (hsize_t)n, (hid_t)aapl_id, (hid_t)lapl_id)) < 0)
+    if ((retVal = H5Aopen_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                                 (hsize_t)n, (hid_t)aapl_id, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1681,17 +1679,18 @@ done:
 } /* end Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx */
 
 /*
-* Class:     hdf_hdf5lib_H5
-* Method:    _H5Acreate_by_name
-* Signature: (JLjava/lang/String;Ljava/lang/String;JJJJJ)J
-*/
+ * Class:     hdf_hdf5lib_H5
+ * Method:    _H5Acreate_by_name
+ * Signature: (JLjava/lang/String;Ljava/lang/String;JJJJJ)J
+ */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring attr_name, jlong type_id, jlong space_id, jlong acpl_id, jlong aapl_id, jlong lapl_id)
+Java_hdf_hdf5lib_H5__1H5Acreate_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                          jstring attr_name, jlong type_id, jlong space_id, jlong acpl_id,
+                                          jlong aapl_id, jlong lapl_id)
 {
-    const char *objName = NULL;
+    const char *objName  = NULL;
     const char *attrName = NULL;
-    hid_t       retVal = H5I_INVALID_HID;
+    hid_t       retVal   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1703,8 +1702,8 @@ Java_hdf_hdf5lib_H5__1H5Acreate_1by_1name
     PIN_JAVA_STRING(ENVONLY, obj_name, objName, NULL, "H5Acreate_by_name: object name not pinned");
     PIN_JAVA_STRING(ENVONLY, attr_name, attrName, NULL, "H5Acreate_by_name: attribute name not pinned");
 
-    if ((retVal = H5Acreate_by_name((hid_t)loc_id, objName, attrName, (hid_t)type_id,
-            (hid_t)space_id, (hid_t)acpl_id, (hid_t)aapl_id, (hid_t)lapl_id)) < 0)
+    if ((retVal = H5Acreate_by_name((hid_t)loc_id, objName, attrName, (hid_t)type_id, (hid_t)space_id,
+                                    (hid_t)acpl_id, (hid_t)aapl_id, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1722,12 +1721,12 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Aexists_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring attr_name, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Aexists_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                        jstring attr_name, jlong lapl_id)
 {
-    const char *objName = NULL;
+    const char *objName  = NULL;
     const char *attrName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -1759,12 +1758,12 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Arename
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring old_attr_name, jstring new_attr_name)
+Java_hdf_hdf5lib_H5_H5Arename(JNIEnv *env, jclass clss, jlong loc_id, jstring old_attr_name,
+                              jstring new_attr_name)
 {
     const char *oldAttrName = NULL;
     const char *newAttrName = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal      = FAIL;
 
     UNUSED(clss);
 
@@ -1794,13 +1793,13 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Arename_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring old_attr_name, jstring new_attr_name, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Arename_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                        jstring old_attr_name, jstring new_attr_name, jlong lapl_id)
 {
-    const char *objName = NULL;
+    const char *objName     = NULL;
     const char *oldAttrName = NULL;
     const char *newAttrName = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal      = FAIL;
 
     UNUSED(clss);
 
@@ -1812,8 +1811,10 @@ Java_hdf_hdf5lib_H5_H5Arename_1by_1name
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Arename_by_name: new attribute name is NULL");
 
     PIN_JAVA_STRING(ENVONLY, obj_name, objName, NULL, "H5Arename_by_name: object name not pinned");
-    PIN_JAVA_STRING(ENVONLY, old_attr_name, oldAttrName, NULL, "H5Arename_by_name: old attribute name not pinned");
-    PIN_JAVA_STRING(ENVONLY, new_attr_name, newAttrName, NULL, "H5Arename_by_name: new attribute name not pinned");
+    PIN_JAVA_STRING(ENVONLY, old_attr_name, oldAttrName, NULL,
+                    "H5Arename_by_name: old attribute name not pinned");
+    PIN_JAVA_STRING(ENVONLY, new_attr_name, newAttrName, NULL,
+                    "H5Arename_by_name: new attribute name not pinned");
 
     if ((retVal = H5Arename_by_name((hid_t)loc_id, objName, oldAttrName, newAttrName, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1835,13 +1836,13 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jint idx_type, jint order, jlong n, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                          jint idx_type, jint order, jlong n, jlong lapl_id)
 {
-    const char *objName = NULL;
-    jstring     str = NULL;
+    const char *objName     = NULL;
+    jstring     str         = NULL;
     ssize_t     status_size = -1;
-    char       *attrName = NULL;
+    char *      attrName    = NULL;
 
     UNUSED(clss);
 
@@ -1851,15 +1852,16 @@ Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx
     PIN_JAVA_STRING(ENVONLY, obj_name, objName, NULL, "H5Aget_name_by_idx: object name not pinned");
 
     /* Get the length of the attribute name */
-    if ((status_size = H5Aget_name_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type,
-            (H5_iter_order_t) order, (hsize_t) n, (char *)NULL, (size_t)0, (hid_t)lapl_id)) < 0)
+    if ((status_size =
+             H5Aget_name_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                                (hsize_t)n, (char *)NULL, (size_t)0, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (attrName = (char *) HDmalloc(sizeof(char) * (size_t) status_size + 1)))
+    if (NULL == (attrName = (char *)HDmalloc(sizeof(char) * (size_t)status_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Aget_name_by_idx: failed to allocate buffer for attribute name");
 
-    if ((H5Aget_name_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type,
-            (H5_iter_order_t) order, (hsize_t) n, (char *)attrName, (size_t)status_size + 1, (hid_t)lapl_id)) < 0)
+    if ((H5Aget_name_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order, (hsize_t)n,
+                            (char *)attrName, (size_t)status_size + 1, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     attrName[status_size] = '\0';
 
@@ -1881,8 +1883,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1storage_1size
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5_H5Aget_1storage_1size(JNIEnv *env, jclass clss, jlong attr_id)
 {
     hsize_t retVal = 0;
 
@@ -1901,8 +1902,7 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5A_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5_H5Aget_1info(JNIEnv *env, jclass clss, jlong attr_id)
 {
     H5A_info_t ainfo;
     jobject    ret_obj = NULL;
@@ -1930,8 +1930,8 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5A_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jint idx_type, jint order, jlong n, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                          jint idx_type, jint order, jlong n, jlong lapl_id)
 {
     const char *objName = NULL;
     H5A_info_t  ainfo;
@@ -1946,8 +1946,8 @@ Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, obj_name, objName, NULL, "H5Aget_info_by_idx: object name not pinned");
 
-    if ((status = H5Aget_info_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type,
-            (H5_iter_order_t)order, (hsize_t)n, &ainfo, (hid_t)lapl_id)) < 0)
+    if ((status = H5Aget_info_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                                     (hsize_t)n, &ainfo, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     args[0].z = ainfo.corder_valid;
@@ -1970,10 +1970,10 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)Lhdf/hdf5lib/structs/H5A_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring attr_name, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                           jstring attr_name, jlong lapl_id)
 {
-    const char *objName = NULL;
+    const char *objName  = NULL;
     const char *attrName = NULL;
     H5A_info_t  ainfo;
     herr_t      status;
@@ -2015,12 +2015,12 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring attr_name, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Adelete_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                        jstring attr_name, jlong lapl_id)
 {
-    const char *objName = NULL;
+    const char *objName  = NULL;
     const char *attrName = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -2050,11 +2050,10 @@ done:
  * Signature: (JLjava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Aexists
-    (JNIEnv *env, jclass clss, jlong obj_id, jstring attr_name)
+Java_hdf_hdf5lib_H5_H5Aexists(JNIEnv *env, jclass clss, jlong obj_id, jstring attr_name)
 {
     const char *attrName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -2081,11 +2080,11 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jint idx_type, jint order, jlong n, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Adelete_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                       jint idx_type, jint order, jlong n, jlong lapl_id)
 {
     const char *objName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status  = FAIL;
 
     UNUSED(clss);
 
@@ -2094,7 +2093,8 @@ Java_hdf_hdf5lib_H5_H5Adelete_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, obj_name, objName, NULL, "H5Adelete_by_idx: object name not pinned");
 
-    if ((status = H5Adelete_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order, (hsize_t)n, (hid_t)lapl_id)) < 0)
+    if ((status = H5Adelete_by_idx((hid_t)loc_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                                   (hsize_t)n, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -2108,13 +2108,13 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;JJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name, jstring attr_name, jlong aapl_id, jlong lapl_id)
+Java_hdf_hdf5lib_H5__1H5Aopen_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring obj_name,
+                                        jstring attr_name, jlong aapl_id, jlong lapl_id)
 
 {
     const char *attrName = NULL;
-    const char *objName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    const char *objName  = NULL;
+    hid_t       status   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -2144,8 +2144,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1create_1plist
-    (JNIEnv *env, jclass clss, jlong attr_id)
+Java_hdf_hdf5lib_H5__1H5Aget_1create_1plist(JNIEnv *env, jclass clss, jlong attr_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -2159,18 +2158,18 @@ done:
 } /* end Java_hdf_hdf5lib_H5__1H5Aget_1create_1plist */
 
 static herr_t
-H5A_iterate_cb
-    (hid_t g_id, const char *name, const H5A_info_t *info, void *cb_data) {
+H5A_iterate_cb(hid_t g_id, const char *name, const H5A_info_t *info, void *cb_data)
+{
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jmethodID   mid;
-    jobject     cb_info_t = NULL;
+    jobject     cb_info_t      = NULL;
     jobject     visit_callback = wrapper->visit_callback;
     jstring     str;
-    JNIEnv     *cbenv = NULL;
+    JNIEnv *    cbenv = NULL;
     jclass      cbcls;
     jvalue      args[4];
-    void       *op_data = (void *)wrapper->op_data;
-    jint        status = -1;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -2180,7 +2179,10 @@ H5A_iterate_cb
     if (NULL == (cbcls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback", "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5A_info_t;Lhdf/hdf5lib/callbacks/H5A_iterate_t;)I")))
+    if (NULL ==
+        (mid = CBENVPTR->GetMethodID(
+             CBENVONLY, cbcls, "callback",
+             "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5A_info_t;Lhdf/hdf5lib/callbacks/H5A_iterate_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL == (str = CBENVPTR->NewStringUTF(CBENVONLY, name)))
@@ -2209,13 +2211,12 @@ done:
  * Signature: (JIIJLjava/lang/Object;Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aiterate
-    (JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
-          jlong idx, jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Aiterate(JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order, jlong idx,
+                               jobject callback_op, jobject op_data)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
+    cb_wrapper wrapper   = {callback_op, op_data};
     hsize_t    start_idx = (hsize_t)idx;
-    herr_t     status = FAIL;
+    herr_t     status    = FAIL;
 
     UNUSED(clss);
 
@@ -2227,7 +2228,8 @@ Java_hdf_hdf5lib_H5_H5Aiterate
     if (NULL == callback_op)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Aiterate: callback_op is NULL");
 
-    if ((status = H5Aiterate2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, (hsize_t*)&start_idx, (H5A_operator2_t)H5A_iterate_cb, (void*)&wrapper)) < 0)
+    if ((status = H5Aiterate2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                              (hsize_t *)&start_idx, (H5A_operator2_t)H5A_iterate_cb, (void *)&wrapper)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -2240,14 +2242,14 @@ done:
  * Signature: (JLjava/lang/String;IIJLjava/lang/Object;Ljava/lang/Object;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aiterate_1by_1name
-    (JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type, jint order,
-          jlong idx, jobject callback_op, jobject op_data, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Aiterate_1by_1name(JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type,
+                                         jint order, jlong idx, jobject callback_op, jobject op_data,
+                                         jlong access_id)
 {
-    const char *objName = NULL;
-    cb_wrapper  wrapper = { callback_op, op_data };
+    const char *objName   = NULL;
+    cb_wrapper  wrapper   = {callback_op, op_data};
     hsize_t     start_idx = (hsize_t)idx;
-    herr_t      status = FAIL;
+    herr_t      status    = FAIL;
 
     UNUSED(clss);
 
@@ -2263,7 +2265,9 @@ Java_hdf_hdf5lib_H5_H5Aiterate_1by_1name
 
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Aiterate_by_name: object name not pinned");
 
-    if ((status = H5Aiterate_by_name((hid_t)grp_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order, (hsize_t*)&start_idx, (H5A_operator2_t)H5A_iterate_cb, (void*)&wrapper, (hid_t)access_id)) < 0)
+    if ((status = H5Aiterate_by_name((hid_t)grp_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
+                                     (hsize_t *)&start_idx, (H5A_operator2_t)H5A_iterate_cb, (void *)&wrapper,
+                                     (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5aImp.h b/java/src/jni/h5aImp.h
index 15cc83e..d3a4246 100644
--- a/java/src/jni/h5aImp.h
+++ b/java/src/jni/h5aImp.h
@@ -21,430 +21,356 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Acreate
  * Signature: (JLjava/lang/String;JJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate
-  (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Acreate(JNIEnv *, jclass, jlong, jstring, jlong, jlong,
+                                                        jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aopen_name
  * Signature: (JLjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1name
-  (JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aopen_1name(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aopen_idx
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1idx
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aopen_1idx(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread
  * Signature: (JJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread
-  (JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread(JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite
  * Signature: (JJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite
-  (JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite(JNIEnv *, jclass, jlong, jlong, jbyteArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_short
  * Signature: (JJ[SZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1short
-  (JNIEnv*, jclass, jlong, jlong, jshortArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1short(JNIEnv *, jclass, jlong, jlong, jshortArray,
+                                                          jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_short
  * Signature: (JJ[SZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1short
-  (JNIEnv*, jclass, jlong, jlong, jshortArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1short(JNIEnv *, jclass, jlong, jlong, jshortArray,
+                                                           jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_int
  * Signature: (JJ[IZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1int
-  (JNIEnv*, jclass, jlong, jlong, jintArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1int(JNIEnv *, jclass, jlong, jlong, jintArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_int
  * Signature: (JJ[IZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1int
-  (JNIEnv*, jclass, jlong, jlong, jintArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1int(JNIEnv *, jclass, jlong, jlong, jintArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_long
  * Signature: (JJ[JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1long
-  (JNIEnv*, jclass, jlong, jlong, jlongArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1long(JNIEnv *, jclass, jlong, jlong, jlongArray,
+                                                         jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_long
  * Signature: (JJ[JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1long
-  (JNIEnv*, jclass, jlong, jlong, jlongArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1long(JNIEnv *, jclass, jlong, jlong, jlongArray,
+                                                          jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_float
  * Signature: (JJ[FZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1float
-  (JNIEnv*, jclass, jlong, jlong, jfloatArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1float(JNIEnv *, jclass, jlong, jlong, jfloatArray,
+                                                          jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_float
  * Signature: (JJ[FZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1float
-  (JNIEnv*, jclass, jlong, jlong, jfloatArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1float(JNIEnv *, jclass, jlong, jlong, jfloatArray,
+                                                           jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_double
  * Signature: (JJ[DZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1double
-  (JNIEnv*, jclass, jlong, jlong, jdoubleArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1double(JNIEnv *, jclass, jlong, jlong, jdoubleArray,
+                                                           jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_double
  * Signature: (JJ[DZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1double
-  (JNIEnv*, jclass, jlong, jlong, jdoubleArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1double(JNIEnv *, jclass, jlong, jlong, jdoubleArray,
+                                                            jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5AreadVL
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AreadVL
-  (JNIEnv *, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5AreadVL(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5AwriteVL
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AwriteVL
-  (JNIEnv *, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5AwriteVL(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_string
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1string
-  (JNIEnv*, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1string(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_string
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1string
-(JNIEnv*, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1string(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_VLStrings
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1VLStrings
-(JNIEnv*, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1VLStrings(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Awrite_VLStrings
  * Signature: (JJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Awrite_1VLStrings
-  (JNIEnv*, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Awrite_1VLStrings(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aread_reg_ref
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref
-(JNIEnv*, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aread_1reg_1ref(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_space
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1space
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aget_1space(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_type
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1type
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aget_1type(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_name
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1name
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Aget_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_num_attrs
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1num_1attrs
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aget_1num_1attrs(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Adelete
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete
-  (JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Adelete(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Aclose
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Aclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Acreate2
  * Signature: (JLjava/lang/String;JJJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate2
-(JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Acreate2(JNIEnv *, jclass, jlong, jstring, jlong, jlong,
+                                                         jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Aopen
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen
-  (JNIEnv *, jclass, jlong, jstring, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aopen(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Aopen_by_idx
  * Signature: (JLjava/lang/String;IIJJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx
-  (JNIEnv *, jclass, jlong, jstring, jint, jint, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aopen_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                               jlong, jlong, jlong);
 
 /*
-* Class:     hdf_hdf5lib_H5
-* Method:    _H5Acreate_by_name
-* Signature: (JLjava/lang/String;Ljava/lang/String;JJJJJ)J
-*/
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Acreate_1by_1name
-(JNIEnv *, jclass, jlong, jstring, jstring, jlong, jlong, jlong, jlong, jlong);
+ * Class:     hdf_hdf5lib_H5
+ * Method:    _H5Acreate_by_name
+ * Signature: (JLjava/lang/String;Ljava/lang/String;JJJJJ)J
+ */
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Acreate_1by_1name(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                                  jlong, jlong, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aexists_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Aexists_1by_1name
-  (JNIEnv *, jclass, jlong, jstring, jstring, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Aexists_1by_1name(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Arename
  * Signature: (JLjava/lang/String;Ljava/lang/String)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Arename
-  (JNIEnv *, jclass, jlong, jstring, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Arename(JNIEnv *, jclass, jlong, jstring, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Arename_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Arename_1by_1name
-  (JNIEnv *, jclass, jlong, jstring, jstring, jstring, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Arename_1by_1name(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                               jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_name_by_idx
  * Signature: (JLjava/lang/String;IIJJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx
-  (JNIEnv *, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Aget_1name_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_storage_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1storage_1size
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Aget_1storage_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_info
  * Signature: (J)Lhdf/hdf5lib/structs/H5A_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Aget_1info(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_info_by_idx
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5A_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx
-  (JNIEnv *, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_info_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)Lhdf/hdf5lib/structs/H5A_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name
-  (JNIEnv *, jclass, jlong, jstring, jstring, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Aget_1info_1by_1name(JNIEnv *, jclass, jlong, jstring,
+                                                                     jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Adelete_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete_1by_1name
-  (JNIEnv *, jclass, jlong, jstring, jstring, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Adelete_1by_1name(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                               jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aexists
  * Signature: (JLjava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Aexists
-  (JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Aexists(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Adelete_by_idx
  * Signature: (JLjava/lang/String;IIJJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Adelete_1by_1idx
-  (JNIEnv *, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Adelete_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                              jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Aopen_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;JJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aopen_1by_1name
-  (JNIEnv *, jclass, jlong, jstring, jstring, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aopen_1by_1name(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                                jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aget_create_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Aget_1create_1plist
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Aget_1create_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aiterate
  * Signature: (JIIJLjava/lang/Object;Ljava/lang/Object;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aiterate
-  (JNIEnv*, jclass, jlong, jint, jint, jlong, jobject, jobject);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aiterate(JNIEnv *, jclass, jlong, jint, jint, jlong, jobject,
+                                                      jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Aiterate_by_name
  * Signature: (JLjava/lang/String;IIJLjava/lang/Object;Ljava/lang/Object;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Aiterate_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jobject, jobject, jlong);
-
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Aiterate_1by_1name(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                                jlong, jobject, jobject, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c
index bcefe12..b34fe25 100644
--- a/java/src/jni/h5dImp.c
+++ b/java/src/jni/h5dImp.c
@@ -44,28 +44,30 @@ typedef struct _cb_wrapper {
 /* Local Prototypes */
 /********************/
 
-static herr_t H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf);
-static herr_t H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf);
-static herr_t H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf);
-static herr_t H5DwriteVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf);
+static herr_t H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid,
+                              hid_t xfer_plist_id, jobjectArray buf);
+static herr_t H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid,
+                            hid_t xfer_plist_id, jobjectArray buf);
+static herr_t H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid,
+                               hid_t xfer_plist_id, jobjectArray buf);
+static herr_t H5DwriteVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid,
+                             hid_t xfer_plist_id, jobjectArray buf);
 
 /********************/
 /* Local Macros     */
 /********************/
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dcreate
  * Signature: (JLjava/lang/String;JJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
-          jlong space_id, jlong create_plist_id)
+Java_hdf_hdf5lib_H5__1H5Dcreate(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
+                                jlong space_id, jlong create_plist_id)
 {
     const char *dsetName = NULL;
-    hid_t       dset_id = H5I_INVALID_HID;
+    hid_t       dset_id  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -74,7 +76,8 @@ Java_hdf_hdf5lib_H5__1H5Dcreate
 
     PIN_JAVA_STRING(ENVONLY, name, dsetName, NULL, "H5Dcreate: dataset name not pinned");
 
-    if ((dset_id = H5Dcreate2((hid_t)loc_id, dsetName, (hid_t)type_id, (hid_t)space_id, H5P_DEFAULT, (hid_t)create_plist_id, H5P_DEFAULT)) < 0)
+    if ((dset_id = H5Dcreate2((hid_t)loc_id, dsetName, (hid_t)type_id, (hid_t)space_id, H5P_DEFAULT,
+                              (hid_t)create_plist_id, H5P_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -90,11 +93,10 @@ done:
  * Signature: (JLjava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dopen
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name)
+Java_hdf_hdf5lib_H5__1H5Dopen(JNIEnv *env, jclass clss, jlong loc_id, jstring name)
 {
     const char *dsetName = NULL;
-    hid_t       dset_id = H5I_INVALID_HID;
+    hid_t       dset_id  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -119,8 +121,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1space
-    (JNIEnv *env, jclass clss, jlong dataset_id)
+Java_hdf_hdf5lib_H5__1H5Dget_1space(JNIEnv *env, jclass clss, jlong dataset_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -139,8 +140,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1type
-    (JNIEnv *env, jclass clss, jlong dataset_id)
+Java_hdf_hdf5lib_H5__1H5Dget_1type(JNIEnv *env, jclass clss, jlong dataset_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -159,8 +159,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1create_1plist
-    (JNIEnv *env, jclass clss, jlong dataset_id)
+Java_hdf_hdf5lib_H5__1H5Dget_1create_1plist(JNIEnv *env, jclass clss, jlong dataset_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -179,14 +178,14 @@ done:
  * Signature: (JJJJJ[BZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jbyteArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
+                            jlong file_space_id, jlong xfer_plist_id, jbyteArray buf,
+                            jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    htri_t    data_class;
-    jbyte    *readBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    htri_t   data_class;
+    jbyte *  readBuf = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -207,14 +206,15 @@ Java_hdf_hdf5lib_H5_H5Dread
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread: read buffer not critically pinned");
+        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                "H5Dread: read buffer not critically pinned");
     }
     else {
         PIN_BYTE_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -236,14 +236,14 @@ done:
  * Signature: (JJJJJ[BZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jbyteArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                             jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id, jbyteArray buf,
+                             jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    htri_t    data_class;
-    jbyte    *writeBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    htri_t   data_class;
+    jbyte *  writeBuf = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -264,14 +264,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite: write buffer not critically pinned");
+        PIN_BYTE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                "H5Dwrite: write buffer not critically pinned");
     }
     else {
         PIN_BYTE_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -293,8 +294,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Dclose
-    (JNIEnv *env, jclass clss, jlong dataset_id)
+Java_hdf_hdf5lib_H5__1H5Dclose(JNIEnv *env, jclass clss, jlong dataset_id)
 {
     herr_t retVal = FAIL;
 
@@ -313,8 +313,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1storage_1size
-    (JNIEnv *env, jclass clss, jlong dataset_id)
+Java_hdf_hdf5lib_H5_H5Dget_1storage_1size(JNIEnv *env, jclass clss, jlong dataset_id)
 {
     hsize_t retVal = 0;
 
@@ -336,15 +335,14 @@ done:
  * Signature: (JJJ[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim
-    (JNIEnv *env, jclass clss, jlong type_id, jlong space_id,
-          jlong xfer_plist_id, jbyteArray buf)
+Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim(JNIEnv *env, jclass clss, jlong type_id, jlong space_id,
+                                     jlong xfer_plist_id, jbyteArray buf)
 {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
-    jboolean  vlenBufIsCopy;
-    jbyte    *vlenBuf = NULL;
+    jboolean vlenBufIsCopy;
+    jbyte *  vlenBuf = NULL;
 #endif
-    herr_t    status = FAIL;
+    herr_t status = FAIL;
 
     UNUSED(clss);
 
@@ -379,14 +377,14 @@ done:
  * Signature: (JJJJJ[SZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1short
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jshortArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread_1short(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                   jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                   jshortArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jshort   *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jshort * readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -407,14 +405,15 @@ Java_hdf_hdf5lib_H5_H5Dread_1short
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_short: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_short: read buffer not critically pinned");
+        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                 "H5Dread_short: read buffer not critically pinned");
     }
     else {
         PIN_SHORT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_short: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -436,14 +435,14 @@ done:
  * Signature: (JJJJJ[SZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1short
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jshortArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite_1short(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                    jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                    jshortArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jshort   *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jshort * writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -464,14 +463,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1short
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite_short: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_short: write buffer not critically pinned");
+        PIN_SHORT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                 "H5Dwrite_short: write buffer not critically pinned");
     }
     else {
         PIN_SHORT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_short: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -493,14 +493,14 @@ done:
  * Signature: (JJJJJ[IZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1int
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jintArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread_1int(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                 jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id, jintArray buf,
+                                 jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    htri_t    data_class;
-    jint     *readBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    htri_t   data_class;
+    jint *   readBuf = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -521,14 +521,15 @@ Java_hdf_hdf5lib_H5_H5Dread_1int
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_int: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_int: read buffer not critically pinned");
+        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                               "H5Dread_int: read buffer not critically pinned");
     }
     else {
         PIN_INT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_int: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -550,14 +551,14 @@ done:
  * Signature: (JJJJJ[IZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1int
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jintArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite_1int(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                  jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id, jintArray buf,
+                                  jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    htri_t    data_class;
-    jint     *writeBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    htri_t   data_class;
+    jint *   writeBuf = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -578,14 +579,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1int
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite_int: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_int: write buffer not critically pinned");
+        PIN_INT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                               "H5Dwrite_int: write buffer not critically pinned");
     }
     else {
         PIN_INT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_int: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -607,14 +609,14 @@ done:
  * Signature: (JJJJJ[JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1long
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jlongArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread_1long(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                  jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                  jlongArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    htri_t    data_class;
-    jlong    *readBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    htri_t   data_class;
+    jlong *  readBuf = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -635,14 +637,15 @@ Java_hdf_hdf5lib_H5_H5Dread_1long
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_long: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_long: read buffer not critically pinned");
+        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                "H5Dread_long: read buffer not critically pinned");
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_long: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -664,14 +667,14 @@ done:
  * Signature: (JJJJJ[JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1long
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jlongArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite_1long(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                   jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                   jlongArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    htri_t    data_class;
-    jlong    *writeBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    htri_t   data_class;
+    jlong *  writeBuf = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -692,14 +695,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1long
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite_long: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_long: write buffer not critically pinned");
+        PIN_LONG_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                "H5Dwrite_long: write buffer not critically pinned");
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_long: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -721,14 +725,14 @@ done:
  * Signature: (JJJJJ[FZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1float
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jfloatArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread_1float(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                   jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                   jfloatArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    htri_t    data_class;
-    jfloat   *readBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    htri_t   data_class;
+    jfloat * readBuf = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -749,14 +753,15 @@ Java_hdf_hdf5lib_H5_H5Dread_1float
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_float: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_float: read buffer not critically pinned");
+        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                 "H5Dread_float: read buffer not critically pinned");
     }
     else {
         PIN_FLOAT_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_float: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -778,14 +783,14 @@ done:
  * Signature: (JJJJJ[FZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1float
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jfloatArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite_1float(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                    jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                    jfloatArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    htri_t    data_class;
-    jfloat   *writeBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    htri_t   data_class;
+    jfloat * writeBuf = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -806,14 +811,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1float
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite_float: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_float: write buffer not critically pinned");
+        PIN_FLOAT_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                 "H5Dwrite_float: write buffer not critically pinned");
     }
     else {
         PIN_FLOAT_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_float: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -835,14 +841,14 @@ done:
  * Signature: (JJJJJ[DZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1double
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jdoubleArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dread_1double(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                    jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                    jdoubleArray buf, jboolean isCriticalPinning)
 {
-    jboolean  readBufIsCopy;
-    jdouble  *readBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean readBufIsCopy;
+    jdouble *readBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -863,14 +869,15 @@ Java_hdf_hdf5lib_H5_H5Dread_1double
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_double: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_double: read buffer not critically pinned");
+        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, readBuf, &readBufIsCopy,
+                                  "H5Dread_double: read buffer not critically pinned");
     }
     else {
         PIN_DOUBLE_ARRAY(ENVONLY, buf, readBuf, &readBufIsCopy, "H5Dread_double: read buffer not pinned");
     }
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, readBuf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, readBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -892,14 +899,14 @@ done:
  * Signature: (JJJJJ[DZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1double
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jdoubleArray buf, jboolean isCriticalPinning)
+Java_hdf_hdf5lib_H5_H5Dwrite_1double(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                     jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                     jdoubleArray buf, jboolean isCriticalPinning)
 {
-    jboolean  writeBufIsCopy;
-    jdouble  *writeBuf = NULL;
-    htri_t    data_class;
-    herr_t    status = FAIL;
+    jboolean writeBufIsCopy;
+    jdouble *writeBuf = NULL;
+    htri_t   data_class;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -920,14 +927,15 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1double
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dwrite_double: variable length type not supported");
 
     if (isCriticalPinning) {
-        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_double: write buffer not critically pinned");
+        PIN_DOUBLE_ARRAY_CRITICAL(ENVONLY, buf, writeBuf, &writeBufIsCopy,
+                                  "H5Dwrite_double: write buffer not critically pinned");
     }
     else {
         PIN_DOUBLE_ARRAY(ENVONLY, buf, writeBuf, &writeBufIsCopy, "H5Dwrite_double: write buffer not pinned");
     }
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, writeBuf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -949,17 +957,17 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1string
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray j_buf)
+Java_hdf_hdf5lib_H5_H5Dread_1string(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                    jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                    jobjectArray j_buf)
 {
-    jstring  jstr;
-    size_t   str_len;
-    size_t   pos;
-    jsize    i, n;
-    char    *c_buf = NULL;
-    char    *cstr = NULL;
-    herr_t   status = FAIL;
+    jstring jstr;
+    size_t  str_len;
+    size_t  pos;
+    jsize   i, n;
+    char *  c_buf  = NULL;
+    char *  cstr   = NULL;
+    herr_t  status = FAIL;
 
     UNUSED(clss);
 
@@ -974,23 +982,24 @@ Java_hdf_hdf5lib_H5_H5Dread_1string
     if (!(str_len = H5Tget_size((hid_t)mem_type_id)))
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (cstr = (char *) HDmalloc(str_len + 1)))
+    if (NULL == (cstr = (char *)HDmalloc(str_len + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dread_string: memory allocation failed");
 
-    if (NULL == (c_buf = (char *) HDmalloc((size_t)n * str_len)))
+    if (NULL == (c_buf = (char *)HDmalloc((size_t)n * str_len)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dread_string: memory allocation failed");
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, c_buf)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          (hid_t)xfer_plist_id, c_buf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0, pos = 0; i < n; i++) {
-        HDmemcpy(cstr, c_buf+pos, str_len);
+        HDmemcpy(cstr, c_buf + pos, str_len);
         cstr[str_len] = '\0';
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, cstr))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dread_string: out of memory - unable to construct string from UTF characters");
+            H5_OUT_OF_MEMORY_ERROR(
+                ENVONLY, "H5Dread_string: out of memory - unable to construct string from UTF characters");
         }
 
         ENVPTR->SetObjectArrayElement(ENVONLY, j_buf, i, jstr);
@@ -1016,15 +1025,15 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1string
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray j_buf)
+Java_hdf_hdf5lib_H5_H5Dwrite_1string(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                     jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                     jobjectArray j_buf)
 {
     const char *utf8 = NULL;
     jstring     obj;
     size_t      i, str_len;
     jsize       n;
-    char       *c_buf = NULL;
+    char *      c_buf  = NULL;
     herr_t      status = FAIL;
 
     UNUSED(clss);
@@ -1040,11 +1049,11 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1string
     if (!(str_len = H5Tget_size((hid_t)mem_type_id)))
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (c_buf = (char *) HDmalloc((size_t)n * str_len)))
+    if (NULL == (c_buf = (char *)HDmalloc((size_t)n * str_len)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dwrite_string: memory allocation failed");
 
-    for (i = 0; i < (size_t) n; i++) {
-        if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)j_buf, (jsize) i))) {
+    for (i = 0; i < (size_t)n; i++) {
+        if (NULL == (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)j_buf, (jsize)i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
@@ -1069,8 +1078,8 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1string
         ENVPTR->DeleteLocalRef(ENVONLY, obj);
     } /* end for */
 
-    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
-            (hid_t)file_space_id, (hid_t)xfer_plist_id, c_buf)) < 0)
+    if ((status = H5Dwrite((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                           (hid_t)xfer_plist_id, c_buf)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1088,17 +1097,16 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5DreadVL
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                              jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
 {
     H5T_class_t type_class;
-    htri_t      isStr = 0;
-    htri_t      isVlenStr = 0;
-    htri_t      isComplex = 0;
+    htri_t      isStr      = 0;
+    htri_t      isVlenStr  = 0;
+    htri_t      isComplex  = 0;
     htri_t      isComplex2 = 0;
     hid_t       nested_tid = H5I_INVALID_HID;
-    herr_t      status = FAIL;
+    herr_t      status     = FAIL;
 
     UNUSED(clss);
 
@@ -1118,7 +1126,7 @@ Java_hdf_hdf5lib_H5_H5DreadVL
         if ((num_members = H5Tget_nmembers(mem_type_id)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
-        for (i = 0; i < (unsigned) num_members; i++) {
+        for (i = 0; i < (unsigned)num_members; i++) {
             if ((nested_tid = H5Tget_member_type((hid_t)mem_type_id, i)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
@@ -1140,13 +1148,13 @@ Java_hdf_hdf5lib_H5_H5DreadVL
     }
 
     if (!isStr || isComplex || isVlenStr) {
-        if ((status = H5DreadVL_asstr(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DreadVL_asstr(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                      (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
     }
     else if (isStr) {
-        if ((status = H5DreadVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DreadVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                    (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
     }
 
@@ -1163,21 +1171,22 @@ done:
  * buffer in turn.
  */
 static herr_t
-H5DreadVL_str
-    (JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf)
+H5DreadVL_str(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id,
+              jobjectArray buf)
 {
-    jstring   jstr;
-    jsize     i, n;
-    char    **strs = NULL;
-    herr_t    status = FAIL;
+    jstring jstr;
+    jsize   i, n;
+    char ** strs   = NULL;
+    herr_t  status = FAIL;
 
     if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5DreadVL_str: buf length < 0");
     }
 
-    if (NULL == (strs = (char **) HDcalloc((size_t)n, sizeof(char *))))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5DreadVL_str: failed to allocate variable length string read buffer");
+    if (NULL == (strs = (char **)HDcalloc((size_t)n, sizeof(char *))))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5DreadVL_str: failed to allocate variable length string read buffer");
 
     if ((status = H5Dread(did, tid, mem_sid, file_sid, xfer_plist_id, strs)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1221,19 +1230,19 @@ done:
  * in the output buffer in turn.
  */
 static herr_t
-H5DreadVL_asstr
-    (JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf)
+H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id,
+                jobjectArray buf)
 {
-    H5T_class_t  tclass;
-    jstring      jstr;
-    h5str_t      h5str;
-    hbool_t      close_mem_space = FALSE;
-    size_t       typeSize;
-    size_t       i;
-    hid_t        mem_space = mem_sid;
-    jsize        n;
-    void        *readBuf = NULL;
-    herr_t       status = FAIL;
+    H5T_class_t tclass;
+    jstring     jstr;
+    h5str_t     h5str;
+    hbool_t     close_mem_space = FALSE;
+    size_t      typeSize;
+    size_t      i;
+    hid_t       mem_space = mem_sid;
+    jsize       n;
+    void *      readBuf = NULL;
+    herr_t      status  = FAIL;
 
     HDmemset(&h5str, 0, sizeof(h5str_t));
 
@@ -1278,16 +1287,16 @@ H5DreadVL_asstr
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Convert each element to a char string */
-    for (i = 0; i < (size_t) n; i++) {
+    for (i = 0; i < (size_t)n; i++) {
         h5str.s[0] = '\0';
 
-        if (!h5str_sprintf(ENVONLY, &h5str, did, tid, &(((char *) readBuf)[i * typeSize]), typeSize, 0))
+        if (!h5str_sprintf(ENVONLY, &h5str, did, tid, &(((char *)readBuf)[i * typeSize]), typeSize, 0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, h5str.s)))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize) i, jstr);
+        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize)i, jstr);
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         ENVPTR->DeleteLocalRef(ENVONLY, jstr);
@@ -1319,12 +1328,12 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1VLStrings
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5Dread_1VLStrings(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                       jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                       jobjectArray buf)
 {
     htri_t isVlenStr = 0;
-    herr_t status = FAIL;
+    herr_t status    = FAIL;
 
     UNUSED(clss);
 
@@ -1335,8 +1344,8 @@ Java_hdf_hdf5lib_H5_H5Dread_1VLStrings
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (isVlenStr) {
-        if ((status = H5DreadVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DreadVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                    (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
     }
     else
@@ -1352,17 +1361,16 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5DwriteVL
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5DwriteVL(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                               jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
 {
     H5T_class_t type_class;
-    htri_t      isStr = 0;
-    htri_t      isVlenStr = 0;
-    htri_t      isComplex = 0;
+    htri_t      isStr      = 0;
+    htri_t      isVlenStr  = 0;
+    htri_t      isComplex  = 0;
     htri_t      isComplex2 = 0;
     hid_t       nested_tid = H5I_INVALID_HID;
-    herr_t      status = FAIL;
+    herr_t      status     = FAIL;
 
     UNUSED(clss);
 
@@ -1382,7 +1390,7 @@ Java_hdf_hdf5lib_H5_H5DwriteVL
         if ((num_members = H5Tget_nmembers(mem_type_id)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
-        for (i = 0; i < (unsigned) num_members; i++) {
+        for (i = 0; i < (unsigned)num_members; i++) {
             if ((nested_tid = H5Tget_member_type((hid_t)mem_type_id, i)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
@@ -1404,13 +1412,13 @@ Java_hdf_hdf5lib_H5_H5DwriteVL
     }
 
     if (!isStr || isComplex || isVlenStr) {
-        if ((status = H5DwriteVL_asstr(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DwriteVL_asstr(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                       (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
     }
     else if (isStr) {
-        if ((status = H5DwriteVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DwriteVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                     (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
     }
 
@@ -1426,28 +1434,29 @@ done:
  * The buffer of C-strings is then written to the HDF5 dataset specified.
  */
 static herr_t
-H5DwriteVL_str
-    (JNIEnv *env, hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t xfer_plist_id, jobjectArray buf)
+H5DwriteVL_str(JNIEnv *env, hid_t dataset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
+               hid_t xfer_plist_id, jobjectArray buf)
 {
-    const char  *utf8 = NULL;
-    jstring      obj;
-    jsize        size;
-    jsize        i;
-    char       **writeBuf = NULL;
-    herr_t       status = FAIL;
-
-    if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray) buf)) < 0) {
+    const char *utf8 = NULL;
+    jstring     obj;
+    jsize       size;
+    jsize       i;
+    char **     writeBuf = NULL;
+    herr_t      status   = FAIL;
+
+    if ((size = ENVPTR->GetArrayLength(ENVONLY, (jarray)buf)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5DwriteVL_str: buf length < 0");
     }
 
-    if (NULL == (writeBuf = (char **) HDcalloc((size_t)size + 1, sizeof(char *))))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5DwriteVL_str: failed to allocate variable length string write buffer");
+    if (NULL == (writeBuf = (char **)HDcalloc((size_t)size + 1, sizeof(char *))))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5DwriteVL_str: failed to allocate variable length string write buffer");
 
     for (i = 0; i < size; ++i) {
         jsize length;
 
-        if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, i))) {
+        if (NULL == (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
@@ -1462,7 +1471,7 @@ H5DwriteVL_str
 
         PIN_JAVA_STRING(ENVONLY, obj, utf8, NULL, "H5DwriteVL_str: string not pinned");
 
-        if (NULL == (writeBuf[i] = (char *) HDmalloc((size_t)length + 1)))
+        if (NULL == (writeBuf[i] = (char *)HDmalloc((size_t)length + 1)))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5DwriteVL_str: failed to allocate string buffer");
 
         HDstrncpy(writeBuf[i], utf8, (size_t)length + 1);
@@ -1474,7 +1483,8 @@ H5DwriteVL_str
         ENVPTR->DeleteLocalRef(ENVONLY, obj);
     } /* end for (i = 0; i < size; ++i) */
 
-    if ((status = H5Dwrite(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, writeBuf)) < 0)
+    if ((status = H5Dwrite(dataset_id, mem_type_id, mem_space_id, file_space_id, xfer_plist_id, writeBuf)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1498,18 +1508,18 @@ done:
  * elements is then written to the HDF5 dataset.
  */
 static herr_t
-H5DwriteVL_asstr
-    (JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id, jobjectArray buf)
+H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid, hid_t xfer_plist_id,
+                 jobjectArray buf)
 {
-    const char *utf8 = NULL;
-    jstring     obj = NULL;
+    const char *utf8            = NULL;
+    jstring     obj             = NULL;
     hbool_t     close_mem_space = FALSE;
     size_t      typeSize;
     size_t      i;
     hid_t       mem_space = mem_sid;
     jsize       n;
-    void       *writeBuf = NULL;
-    herr_t      status = FAIL;
+    void *      writeBuf = NULL;
+    herr_t      status   = FAIL;
 
     if (mem_space == H5S_ALL) {
         mem_space = file_sid;
@@ -1538,14 +1548,14 @@ H5DwriteVL_asstr
     if (NULL == (writeBuf = HDcalloc((size_t)n, typeSize)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AwriteVL_asstr: failed to allocate write buffer");
 
-    for (i = 0; i < (size_t) n; ++i) {
-        if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, (jsize) i))) {
+    for (i = 0; i < (size_t)n; ++i) {
+        if (NULL == (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)buf, (jsize)i))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             /*
              * If the string object was NULL, skip it.
              */
-            HDmemset(&(((char *) writeBuf)[i * typeSize]), 0, typeSize);
+            HDmemset(&(((char *)writeBuf)[i * typeSize]), 0, typeSize);
             continue;
         }
 
@@ -1561,7 +1571,7 @@ H5DwriteVL_asstr
          * one before destroying it with h5str_convert.
          */
 
-        if (!h5str_convert(ENVONLY, (char **) &utf8, did, tid, &(((char *) writeBuf)[i * typeSize]), 0))
+        if (!h5str_convert(ENVONLY, (char **)&utf8, did, tid, &(((char *)writeBuf)[i * typeSize]), 0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         UNPIN_JAVA_STRING(ENVONLY, obj, utf8);
@@ -1592,12 +1602,12 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-          jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                        jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                        jobjectArray buf)
 {
-    htri_t  isVlenStr = 0;
-    herr_t  status = FAIL;
+    htri_t isVlenStr = 0;
+    herr_t status    = FAIL;
 
     UNUSED(clss);
 
@@ -1608,8 +1618,8 @@ Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (isVlenStr) {
-        if ((status = H5DwriteVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id,
-                (hid_t)mem_space_id, (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
+        if ((status = H5DwriteVL_str(env, (hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id,
+                                     (hid_t)file_space_id, (hid_t)xfer_plist_id, buf)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
     } /* end if */
     else
@@ -1625,16 +1635,15 @@ done:
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
-    (JNIEnv *env, jclass clss,
-        jlong dataset_id, jlong mem_type_id, jlong mem_space_id,
-        jlong file_space_id, jlong xfer_plist_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref(JNIEnv *env, jclass clss, jlong dataset_id, jlong mem_type_id,
+                                      jlong mem_space_id, jlong file_space_id, jlong xfer_plist_id,
+                                      jobjectArray buf)
 {
-    H5R_ref_t       *ref_data = NULL;
-    h5str_t          h5str;
-    jstring          jstr;
-    jsize            i, n;
-    herr_t           status = FAIL;
+    H5R_ref_t *ref_data = NULL;
+    h5str_t    h5str;
+    jstring    jstr;
+    jsize      i, n;
+    herr_t     status = FAIL;
 
     UNUSED(clss);
 
@@ -1645,10 +1654,11 @@ Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Dread_reg_ref: buf length < 0");
     }
 
-    if (NULL == (ref_data = (H5R_ref_t *) HDcalloc(1, (size_t)n * sizeof(H5R_ref_t))))
+    if (NULL == (ref_data = (H5R_ref_t *)HDcalloc(1, (size_t)n * sizeof(H5R_ref_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dread_reg_ref: failed to allocate read buffer");
 
-    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id, xfer_plist_id, ref_data)) < 0)
+    if ((status = H5Dread((hid_t)dataset_id, (hid_t)mem_type_id, (hid_t)mem_space_id, (hid_t)file_space_id,
+                          xfer_plist_id, ref_data)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     h5str_new(&h5str, 1024);
@@ -1659,7 +1669,8 @@ Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
     for (i = 0; i < n; i++) {
         h5str.s[0] = '\0';
 
-        if (!h5str_sprintf(ENVONLY, &h5str, (hid_t)dataset_id, (hid_t)mem_type_id, (void*)&ref_data[i], 0, 0))
+        if (!h5str_sprintf(ENVONLY, &h5str, (hid_t)dataset_id, (hid_t)mem_type_id, (void *)&ref_data[i], 0,
+                           0))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, h5str.s)))
@@ -1686,12 +1697,12 @@ done:
  * Signature: (JLjava/lang/String;JJJJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
-          jlong space_id, jlong link_plist_id, jlong create_plist_id, jlong access_plist_id)
+Java_hdf_hdf5lib_H5__1H5Dcreate2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type_id,
+                                 jlong space_id, jlong link_plist_id, jlong create_plist_id,
+                                 jlong access_plist_id)
 {
     const char *dsetName = NULL;
-    hid_t       dset_id = H5I_INVALID_HID;
+    hid_t       dset_id  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1700,7 +1711,8 @@ Java_hdf_hdf5lib_H5__1H5Dcreate2
 
     PIN_JAVA_STRING(ENVONLY, name, dsetName, NULL, "H5Dcreate2: dataset name not pinned");
 
-    if ((dset_id = H5Dcreate2((hid_t)loc_id, dsetName, (hid_t)type_id, (hid_t)space_id, (hid_t)link_plist_id, (hid_t)create_plist_id, (hid_t)access_plist_id)) < 0)
+    if ((dset_id = H5Dcreate2((hid_t)loc_id, dsetName, (hid_t)type_id, (hid_t)space_id, (hid_t)link_plist_id,
+                              (hid_t)create_plist_id, (hid_t)access_plist_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1716,11 +1728,10 @@ done:
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dopen2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist)
+Java_hdf_hdf5lib_H5__1H5Dopen2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist)
 {
     const char *dsetName = NULL;
-    hid_t       dset_id = H5I_INVALID_HID;
+    hid_t       dset_id  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1745,14 +1756,15 @@ done:
  * Signature: (JJJJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate_1anon
-    (JNIEnv *env, jclass clss, jlong loc_id, jlong type_id, jlong space_id, jlong dcpl_id, jlong dapl_id)
+Java_hdf_hdf5lib_H5__1H5Dcreate_1anon(JNIEnv *env, jclass clss, jlong loc_id, jlong type_id, jlong space_id,
+                                      jlong dcpl_id, jlong dapl_id)
 {
     hid_t dset_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((dset_id = H5Dcreate_anon((hid_t)loc_id, (hid_t)type_id, (hid_t)space_id, (hid_t)dcpl_id, (hid_t)dapl_id)) < 0)
+    if ((dset_id = H5Dcreate_anon((hid_t)loc_id, (hid_t)type_id, (hid_t)space_id, (hid_t)dcpl_id,
+                                  (hid_t)dapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1765,8 +1777,7 @@ done:
  * Signature: (J)I;
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1space_1status
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Dget_1space_1status(JNIEnv *env, jclass clss, jlong loc_id)
 {
     H5D_space_status_t space_status = H5D_SPACE_STATUS_ERROR;
 
@@ -1785,8 +1796,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1access_1plist
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Dget_1access_1plist(JNIEnv *env, jclass clss, jlong loc_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1805,8 +1815,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1offset
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Dget_1offset(JNIEnv *env, jclass clss, jlong loc_id)
 {
     haddr_t offset = HADDR_UNDEF;
 
@@ -1825,8 +1834,8 @@ done:
  * Signature: (JJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dvlen_1get_1buf_1size
-    (JNIEnv *env, jclass clss, jlong dataset_id, jlong type_id, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Dvlen_1get_1buf_1size(JNIEnv *env, jclass clss, jlong dataset_id, jlong type_id,
+                                            jlong space_id)
 {
     hsize_t sz = 0;
 
@@ -1845,14 +1854,14 @@ done:
  * Signature: ([BJ[BJJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dfill
-    (JNIEnv *env, jclass clss, jbyteArray fill, jlong fill_type_id, jbyteArray buf, jlong buf_type_id, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Dfill(JNIEnv *env, jclass clss, jbyteArray fill, jlong fill_type_id, jbyteArray buf,
+                            jlong buf_type_id, jlong space_id)
 {
-    jboolean  isCopy1;
-    jboolean  isCopy2;
-    herr_t    status = FAIL;
-    jbyte    *fillP = NULL;
-    jbyte    *buffP = NULL;
+    jboolean isCopy1;
+    jboolean isCopy2;
+    herr_t   status = FAIL;
+    jbyte *  fillP  = NULL;
+    jbyte *  buffP  = NULL;
 
     UNUSED(clss);
 
@@ -1865,7 +1874,8 @@ Java_hdf_hdf5lib_H5_H5Dfill
         PIN_BYTE_ARRAY(ENVONLY, fill, fillP, &isCopy1, "H5Dfill: fill buffer not pinned");
     }
 
-    if ((status = H5Dfill((const void *)fillP, (hid_t)fill_type_id, (void *)buffP, (hid_t)buf_type_id, (hid_t)space_id)) < 0)
+    if ((status = H5Dfill((const void *)fillP, (hid_t)fill_type_id, (void *)buffP, (hid_t)buf_type_id,
+                          (hid_t)space_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (fillP) {
@@ -1886,15 +1896,14 @@ done:
  * Signature: (J[J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dset_1extent
-    (JNIEnv *env, jclass clss, jlong loc_id, jlongArray buf)
+Java_hdf_hdf5lib_H5_H5Dset_1extent(JNIEnv *env, jclass clss, jlong loc_id, jlongArray buf)
 {
-    jboolean  isCopy;
-    hsize_t  *dims = NULL;
-    herr_t    status;
-    jsize     rank;
-    jlong    *dimsBuf = NULL;
-    int       i = 0;
+    jboolean isCopy;
+    hsize_t *dims = NULL;
+    herr_t   status;
+    jsize    rank;
+    jlong *  dimsBuf = NULL;
+    int      i       = 0;
 
     UNUSED(clss);
 
@@ -1908,7 +1917,7 @@ Java_hdf_hdf5lib_H5_H5Dset_1extent
 
     PIN_LONG_ARRAY(ENVONLY, buf, dimsBuf, &isCopy, "H5Dset_extent: buffer not pinned");
 
-    if (NULL == (dims = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+    if (NULL == (dims = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dset_extent: failed to allocate dataset dimension buffer");
 
     for (i = 0; i < rank; i++)
@@ -1925,18 +1934,18 @@ done:
 } /* end Java_hdf_hdf5lib_H5_H5Dset_1extent */
 
 static herr_t
-H5D_iterate_cb
-    (void *elem, hid_t elem_id, unsigned ndim, const hsize_t *point, void *cb_data) {
+H5D_iterate_cb(void *elem, hid_t elem_id, unsigned ndim, const hsize_t *point, void *cb_data)
+{
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jbyteArray  elemArray;
     jlongArray  pointArray;
     jmethodID   mid;
     jobject     visit_callback = wrapper->visit_callback;
     jclass      cls;
-    JNIEnv     *cbenv = NULL;
+    JNIEnv *    cbenv  = NULL;
     jint        status = FAIL;
     jsize       size;
-    void       *op_data = (void *)wrapper->op_data;
+    void *      op_data = (void *)wrapper->op_data;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -1946,7 +1955,8 @@ H5D_iterate_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "([BJI[JLhdf/hdf5lib/callbacks/H5D_iterate_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "([BJI[JLhdf/hdf5lib/callbacks/H5D_iterate_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL == elem)
@@ -1969,7 +1979,8 @@ H5D_iterate_cb
     CBENVPTR->SetLongArrayRegion(CBENVONLY, pointArray, 0, 2, (const jlong *)point);
     CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    status = CBENVPTR->CallIntMethod(CBENVONLY, visit_callback, mid, (void *)elemArray, elem_id, ndim, pointArray, op_data);
+    status = CBENVPTR->CallIntMethod(CBENVONLY, visit_callback, mid, (void *)elemArray, elem_id, ndim,
+                                     pointArray, op_data);
     CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     CBENVPTR->GetByteArrayRegion(CBENVONLY, elemArray, 0, size, (jbyte *)elem);
@@ -1988,14 +1999,13 @@ done:
  * Signature: ([BJJLjava/lang/Object;Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Diterate
-    (JNIEnv *env, jclass clss, jbyteArray buf, jlong buf_type, jlong space,
-          jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Diterate(JNIEnv *env, jclass clss, jbyteArray buf, jlong buf_type, jlong space,
+                               jobject callback_op, jobject op_data)
 {
-    cb_wrapper  wrapper = { callback_op, op_data };
-    jboolean    isCopy;
-    jbyte      *iterBuf = NULL;
-    herr_t      status = FAIL;
+    cb_wrapper wrapper = {callback_op, op_data};
+    jboolean   isCopy;
+    jbyte *    iterBuf = NULL;
+    herr_t     status  = FAIL;
 
     UNUSED(clss);
 
@@ -2011,12 +2021,14 @@ Java_hdf_hdf5lib_H5_H5Diterate
 
     PIN_BYTE_ARRAY(ENVONLY, buf, iterBuf, &isCopy, "H5Diterate: buffer not pinned");
 
-    if ((status = H5Diterate((void *)iterBuf, (hid_t)buf_type, (hid_t)space, (H5D_operator_t)H5D_iterate_cb, (void *)&wrapper)) < 0)
+    if ((status = H5Diterate((void *)iterBuf, (hid_t)buf_type, (hid_t)space, (H5D_operator_t)H5D_iterate_cb,
+                             (void *)&wrapper)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
     if (iterBuf)
-        UNPIN_BYTE_ARRAY(ENVONLY, buf, iterBuf, (status < 0) ? (JNI_ABORT) : ((isCopy == JNI_TRUE) ? 0 : JNI_ABORT));
+        UNPIN_BYTE_ARRAY(ENVONLY, buf, iterBuf,
+                         (status < 0) ? (JNI_ABORT) : ((isCopy == JNI_TRUE) ? 0 : JNI_ABORT));
 
     return (jint)status;
 } /* end Java_hdf_hdf5lib_H5_H5Diterate */
@@ -2027,8 +2039,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dflush
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Dflush(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -2045,8 +2056,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Drefresh
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Drefresh(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
diff --git a/java/src/jni/h5dImp.h b/java/src/jni/h5dImp.h
index f824452..b9ad1bb 100644
--- a/java/src/jni/h5dImp.h
+++ b/java/src/jni/h5dImp.h
@@ -21,357 +21,303 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dcreate
  * Signature: (JLjava/lang/String;JJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate
-  (JNIEnv*, jclass, jlong, jstring, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dcreate(JNIEnv *, jclass, jlong, jstring, jlong, jlong,
+                                                        jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dopen
  * Signature: (JLjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dopen
-  (JNIEnv*, jclass, jlong, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dopen(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dget_space
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1space
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dget_1space(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dget_type
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1type
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dget_1type(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dget_create_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dget_1create_1plist
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dget_1create_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread
  * Signature: (JJJJJ[BZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jbyteArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                   jbyteArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite
  * Signature: (JJJJJ[BZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jbyteArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                    jbyteArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Dclose
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Dclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dget_storage_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1storage_1size
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Dget_1storage_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dvlen_reclaim
  * Signature: (JJJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim
-  (JNIEnv*, jclass, jlong, jlong, jlong, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dvlen_1reclaim(JNIEnv *, jclass, jlong, jlong, jlong,
+                                                            jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_short
  * Signature: (JJJJJ[SZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1short
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jshortArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1short(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                          jshortArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_short
  * Signature: (JJJJJ[SZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1short
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jshortArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1short(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                           jlong, jshortArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_int
  * Signature: (JJJJJ[IZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1int
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jintArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1int(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                        jintArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_int
  * Signature: (JJJJJ[IZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1int
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jintArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1int(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                         jintArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_long
  * Signature: (JJJJJ[JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1long
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jlongArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1long(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                         jlongArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_long
  * Signature: (JJJJJ[JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1long
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jlongArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1long(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                          jlongArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_float
  * Signature: (JJJJJ[FZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1float
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jfloatArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1float(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                          jfloatArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_float
  * Signature: (JJJJJ[FZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1float
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jfloatArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1float(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                           jlong, jfloatArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_double
  * Signature: (JJJJJ[DZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1double
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jdoubleArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1double(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                           jlong, jdoubleArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_double
  * Signature: (JJJJJ[DZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1double
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jdoubleArray, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1double(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                            jlong, jdoubleArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5DreadVL
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5DreadVL
-(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5DreadVL(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                     jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5DwriteVL
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5DwriteVL
-(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5DwriteVL(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                      jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_string
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1string
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1string(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                           jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_string
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1string
-(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1string(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                            jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_VLStrings
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1VLStrings
-(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1VLStrings(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                              jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dwrite_VLStrings
  * Signature: (JJJJJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dwrite_1VLStrings(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                               jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dread_reg_ref
  * Signature: (JJJJJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref
-(JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dread_1reg_1ref(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                             jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dcreate2
  * Signature: (JLjava/lang/String;JJJJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate2
-  (JNIEnv*, jclass, jlong, jstring, jlong, jlong, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dcreate2(JNIEnv *, jclass, jlong, jstring, jlong, jlong,
+                                                         jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dopen2
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dopen2
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dopen2(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Dcreate_anon
  * Signature: (JJJJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Dcreate_1anon
-  (JNIEnv*, jclass, jlong, jlong, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Dcreate_1anon(JNIEnv *, jclass, jlong, jlong, jlong, jlong,
+                                                              jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dget_space_status
  * Signature: (J)I;
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1space_1status
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dget_1space_1status(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dget_access_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1access_1plist
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Dget_1access_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dget_offset
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dget_1offset
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Dget_1offset(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dvlen_get_buf_size
  * Signature: (JJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Dvlen_1get_1buf_1size
-  (JNIEnv*, jclass, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Dvlen_1get_1buf_1size(JNIEnv *, jclass, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dfill
  * Signature: ([BJ[BJJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dfill
-  (JNIEnv*, jclass, jbyteArray, jlong, jbyteArray, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Dfill(JNIEnv *, jclass, jbyteArray, jlong, jbyteArray, jlong,
+                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dset_extent
  * Signature: (J[J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dset_1extent
-  (JNIEnv*, jclass, jlong, jlongArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Dset_1extent(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Diterate
  * Signature: ([BJJLjava/lang/Object;Ljava/lang/Object;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Diterate
-  (JNIEnv*, jclass, jbyteArray, jlong, jlong, jobject, jobject);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Diterate(JNIEnv *, jclass, jbyteArray, jlong, jlong, jobject,
+                                                      jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Dflush
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Dflush
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Dflush(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Drefresh
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Drefresh
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Drefresh(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index 80e23a1..13826dc 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -61,8 +61,7 @@ static herr_t H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data);
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2
-    (JNIEnv *env, jclass clss, jlong stk_id)
+Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2(JNIEnv *env, jclass clss, jlong stk_id)
 {
     unsigned int is_stack = 0;
 
@@ -84,13 +83,13 @@ done:
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eregister_1class
-    (JNIEnv *env, jclass clss, jstring cls_name, jstring lib_name, jstring version)
+Java_hdf_hdf5lib_H5_H5Eregister_1class(JNIEnv *env, jclass clss, jstring cls_name, jstring lib_name,
+                                       jstring version)
 {
-    const char* the_cls_name = NULL;
-    const char* the_lib_name = NULL;
-    const char* the_version = NULL;
-    hid_t       ret_val = H5I_INVALID_HID;
+    const char *the_cls_name = NULL;
+    const char *the_lib_name = NULL;
+    const char *the_version  = NULL;
+    hid_t       ret_val      = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -125,8 +124,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eunregister_1class
-    (JNIEnv *env, jclass clss, jlong cls_id)
+Java_hdf_hdf5lib_H5_H5Eunregister_1class(JNIEnv *env, jclass clss, jlong cls_id)
 {
     UNUSED(clss);
 
@@ -146,8 +144,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclose_1msg
-    (JNIEnv *env, jclass clss, jlong err_id)
+Java_hdf_hdf5lib_H5_H5Eclose_1msg(JNIEnv *env, jclass clss, jlong err_id)
 {
     UNUSED(clss);
 
@@ -167,12 +164,11 @@ done:
  * Signature: (JILjava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ecreate_1msg
-    (JNIEnv *env, jclass clss, jlong err_id, jint msg_type, jstring err_msg)
+Java_hdf_hdf5lib_H5_H5Ecreate_1msg(JNIEnv *env, jclass clss, jlong err_id, jint msg_type, jstring err_msg)
 {
     H5E_type_t  error_msg_type = (H5E_type_t)msg_type;
-    const char *the_err_msg = NULL;
-    hid_t       ret_val = H5I_INVALID_HID;
+    const char *the_err_msg    = NULL;
+    hid_t       ret_val        = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -199,8 +195,7 @@ done:
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ecreate_1stack
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5Ecreate_1stack(JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
@@ -219,8 +214,7 @@ done:
  * Signature: ()J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1current_1stack
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5Eget_1current_1stack(JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
@@ -239,8 +233,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclose_1stack
-    (JNIEnv *env, jclass clss, jlong stk_id)
+Java_hdf_hdf5lib_H5_H5Eclose_1stack(JNIEnv *env, jclass clss, jlong stk_id)
 {
     UNUSED(clss);
 
@@ -260,8 +253,7 @@ done:
  * Signature: (JLjava/lang/Object;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eprint2
-    (JNIEnv *env, jclass clss, jlong stk_id, jobject stream_obj)
+Java_hdf_hdf5lib_H5_H5Eprint2(JNIEnv *env, jclass clss, jlong stk_id, jobject stream_obj)
 {
     herr_t ret_val = FAIL;
 
@@ -289,12 +281,11 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1class_1name
-    (JNIEnv *env, jclass clss, jlong cls_id)
+Java_hdf_hdf5lib_H5_H5Eget_1class_1name(JNIEnv *env, jclass clss, jlong cls_id)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size;
-    char    *namePtr = NULL;
+    jstring str = NULL;
+    ssize_t buf_size;
+    char *  namePtr = NULL;
 
     UNUSED(clss);
 
@@ -308,7 +299,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1class_1name
     if (!buf_size)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_class_name: no class name");
 
-    if (NULL == (namePtr = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (namePtr = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Eget_class_name: malloc failed");
 
     if ((H5Eget_class_name((hid_t)cls_id, (char *)namePtr, (size_t)buf_size + 1)) < 0)
@@ -331,8 +322,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eset_1current_1stack
-    (JNIEnv *env, jclass clss, jlong stk_id)
+Java_hdf_hdf5lib_H5_H5Eset_1current_1stack(JNIEnv *env, jclass clss, jlong stk_id)
 {
     UNUSED(clss);
 
@@ -352,8 +342,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Epop
-    (JNIEnv *env, jclass clss, jlong stk_id, jlong count)
+Java_hdf_hdf5lib_H5_H5Epop(JNIEnv *env, jclass clss, jlong stk_id, jlong count)
 {
     UNUSED(clss);
 
@@ -373,13 +362,13 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;IJJJLjava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Epush2
-    (JNIEnv *env, jclass clss, jlong stk_id, jstring filename, jstring funcname,
-        jint linenumber, jlong class_id, jlong major_id, jlong minor_id, jstring err_desc)
+Java_hdf_hdf5lib_H5_H5Epush2(JNIEnv *env, jclass clss, jlong stk_id, jstring filename, jstring funcname,
+                             jint linenumber, jlong class_id, jlong major_id, jlong minor_id,
+                             jstring err_desc)
 {
-    const char *fName = NULL;
+    const char *fName   = NULL;
     const char *fncName = NULL;
-    const char *errMsg = NULL;
+    const char *errMsg  = NULL;
     herr_t      ret_val = FAIL;
 
     UNUSED(clss);
@@ -404,7 +393,7 @@ Java_hdf_hdf5lib_H5_H5Epush2
     PIN_JAVA_STRING(ENVONLY, err_desc, errMsg, NULL, "H5Epush2: error message not pinned");
 
     if ((ret_val = H5Epush2((hid_t)stk_id, fName, fncName, (unsigned)linenumber, (hid_t)class_id,
-            (hid_t)major_id, (hid_t)minor_id, errMsg)) < 0)
+                            (hid_t)major_id, (hid_t)minor_id, errMsg)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -422,8 +411,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclear2
-    (JNIEnv *env, jclass clss, jlong stk_id)
+Java_hdf_hdf5lib_H5_H5Eclear2(JNIEnv *env, jclass clss, jlong stk_id)
 {
     UNUSED(clss);
 
@@ -443,14 +431,13 @@ done:
  * Signature: (J[I)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1msg
-    (JNIEnv *env, jclass clss, jlong msg_id, jintArray error_msg_type_list)
+Java_hdf_hdf5lib_H5_H5Eget_1msg(JNIEnv *env, jclass clss, jlong msg_id, jintArray error_msg_type_list)
 {
-    H5E_type_t  error_msg_type;
-    jstring     str = NULL;
-    ssize_t     buf_size;
-    jint       *theArray = NULL;
-    char       *namePtr = NULL;
+    H5E_type_t error_msg_type;
+    jstring    str = NULL;
+    ssize_t    buf_size;
+    jint *     theArray = NULL;
+    char *     namePtr  = NULL;
 
     UNUSED(clss);
 
@@ -466,7 +453,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg
     if (!buf_size)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_msg: invalid message");
 
-    if (NULL == (namePtr = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (namePtr = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Eget_msg: malloc failed");
 
     PIN_INT_ARRAY(ENVONLY, error_msg_type_list, theArray, NULL, "H5Eget_msg: error_msg_type_list not pinned");
@@ -495,8 +482,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1num
-    (JNIEnv *env, jclass clss, jlong stk_id)
+Java_hdf_hdf5lib_H5_H5Eget_1num(JNIEnv *env, jclass clss, jlong stk_id)
 {
     ssize_t ret_val = -1;
 
@@ -513,8 +499,7 @@ done:
 } /* end Java_hdf_hdf5lib_H5_H5Eget_1num */
 
 static herr_t
-H5E_walk_cb
-    (int nindx, const H5E_error2_t *info, void *cb_data)
+H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data)
 {
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jmethodID   mid;
@@ -522,10 +507,10 @@ H5E_walk_cb
     jstring     str1, str2, str3;
     jobject     cb_info_t = NULL;
     jvalue      args[7];
-    JNIEnv     *cbenv = NULL;
+    JNIEnv *    cbenv = NULL;
     jclass      cbcls;
-    void       *op_data = (void *)wrapper->op_data;
-    jint        status = FAIL;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = FAIL;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -535,7 +520,9 @@ H5E_walk_cb
     if (NULL == (cbcls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback", "(ILhdf/hdf5lib/structs/H5E_error2_t;Lhdf/hdf5lib/callbacks/H5E_walk_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(
+                     CBENVONLY, cbcls, "callback",
+                     "(ILhdf/hdf5lib/structs/H5E_error2_t;Lhdf/hdf5lib/callbacks/H5E_walk_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     args[0].j = info->cls_id;
@@ -558,7 +545,8 @@ H5E_walk_cb
 
     args[6].l = str3;
 
-    CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5E_error2_t", "(JJJILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, cb_info_t);
+    CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5E_error2_t",
+                     "(JJJILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, cb_info_t);
 
     status = CBENVPTR->CallIntMethod(CBENVONLY, visit_callback, mid, nindx, cb_info_t, op_data);
     CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
@@ -576,10 +564,10 @@ done:
  * Signature: (JJLjava/lang/Object;Ljava/lang/Object;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ewalk2
-    (JNIEnv *env, jclass clss, jlong stk_id, jlong direction, jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Ewalk2(JNIEnv *env, jclass clss, jlong stk_id, jlong direction, jobject callback_op,
+                             jobject op_data)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
+    cb_wrapper wrapper = {callback_op, op_data};
 
     UNUSED(clss);
 
diff --git a/java/src/jni/h5eImp.h b/java/src/jni/h5eImp.h
index 051b2ed..4754965 100644
--- a/java/src/jni/h5eImp.h
+++ b/java/src/jni/h5eImp.h
@@ -21,159 +21,125 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eauto_is_v2
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eregister_class
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eregister_1class
-  (JNIEnv *, jclass, jstring, jstring, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Eregister_1class(JNIEnv *, jclass, jstring, jstring, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eunregister_class
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eunregister_1class
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eunregister_1class(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eclose_msg
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclose_1msg
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eclose_1msg(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ecreate_msg
  * Signature: (JILjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ecreate_1msg
-  (JNIEnv *, jclass, jlong, jint, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ecreate_1msg(JNIEnv *, jclass, jlong, jint, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ecreate_stack
  * Signature: ()J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ecreate_1stack
-  (JNIEnv *, jclass);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ecreate_1stack(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eget_current_stack
  * Signature: ()J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1current_1stack
-  (JNIEnv *, jclass);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Eget_1current_1stack(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eclose_stack
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclose_1stack
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eclose_1stack(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eprint2
  * Signature: (JLjava/lang/Object;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eprint2
-  (JNIEnv *, jclass, jlong, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eprint2(JNIEnv *, jclass, jlong, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eget_class_name
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1class_1name
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Eget_1class_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eset_current_stack
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eset_1current_1stack
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eset_1current_1stack(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Epop
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Epop
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Epop(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Epush2
  * Signature: (JLjava/lang/String;Ljava/lang/String;IJJJLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Epush2
-  (JNIEnv *, jclass, jlong, jstring, jstring, jint, jlong, jlong, jlong, jstring);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Epush2(JNIEnv *, jclass, jlong, jstring, jstring, jint, jlong,
+                                                    jlong, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eclear2
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Eclear2
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Eclear2(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eget_msg
  * Signature: (J[I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1msg
-  (JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Eget_1msg(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Eget_num
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Eget_1num
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Eget_1num(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ewalk2
  * Signature: (JJLjava/lang/Object;Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ewalk2
-  (JNIEnv *, jclass, jlong, jlong, jobject, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Ewalk2(JNIEnv *, jclass, jlong, jlong, jobject, jobject);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 3b7b96c..76c5ad7 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -39,11 +39,10 @@ extern "C" {
  * Signature: (Ljava/lang/String;IJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fopen
-    (JNIEnv *env, jclass clss, jstring name, jint flags, jlong access_id)
+Java_hdf_hdf5lib_H5__1H5Fopen(JNIEnv *env, jclass clss, jstring name, jint flags, jlong access_id)
 {
     const char *fileName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -68,11 +67,11 @@ done:
  * Signature: (Ljava/lang/String;IJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fcreate
-    (JNIEnv *env, jclass clss, jstring name, jint flags, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5__1H5Fcreate(JNIEnv *env, jclass clss, jstring name, jint flags, jlong create_id,
+                                jlong access_id)
 {
     const char *fileName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status   = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -97,8 +96,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fflush
-    (JNIEnv *env, jclass clss, jlong object_id, jint scope)
+Java_hdf_hdf5lib_H5_H5Fflush(JNIEnv *env, jclass clss, jlong object_id, jint scope)
 {
     herr_t retVal = FAIL;
 
@@ -117,12 +115,11 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1name
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *env, jclass clss, jlong file_id)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size;
-    char    *namePtr = NULL;
+    jstring str = NULL;
+    ssize_t buf_size;
+    char *  namePtr = NULL;
 
     UNUSED(clss);
 
@@ -130,7 +127,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1name
     if ((buf_size = H5Fget_name((hid_t)file_id, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (namePtr = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (namePtr = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Fget_name: malloc failed");
 
     if ((H5Fget_name((hid_t)file_id, namePtr, (size_t)buf_size + 1)) < 0)
@@ -153,13 +150,12 @@ done:
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fis_1hdf5
-    (JNIEnv *env, jclass clss, jstring name)
+Java_hdf_hdf5lib_H5_H5Fis_1hdf5(JNIEnv *env, jclass clss, jstring name)
 {
 #ifndef H5_NO_DEPRECATED_SYMBOLS
     const char *fileName = NULL;
 #endif
-    htri_t      bval = JNI_FALSE;
+    htri_t bval = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -193,11 +189,10 @@ done:
  * Signature: (Ljava/lang/String;J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fis_1accessible
-    (JNIEnv *env, jclass clss, jstring name, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fis_1accessible(JNIEnv *env, jclass clss, jstring name, jlong file_id)
 {
     const char *fileName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -224,8 +219,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fget_1create_1plist
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5__1H5Fget_1create_1plist(JNIEnv *env, jclass clss, jlong file_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -244,8 +238,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fget_1access_1plist
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5__1H5Fget_1access_1plist(JNIEnv *env, jclass clss, jlong file_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -264,8 +257,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1intent
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1intent(JNIEnv *env, jclass clss, jlong file_id)
 {
     unsigned intent = 0;
 
@@ -284,8 +276,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1fileno
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1fileno(JNIEnv *env, jclass clss, jlong file_id)
 {
     unsigned long fileno = 0;
 
@@ -304,8 +295,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Fclose
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5__1H5Fclose(JNIEnv *env, jclass clss, jlong file_id)
 {
     herr_t status = FAIL;
 
@@ -324,11 +314,11 @@ done:
  * Signature: (JLjava/lang/String;JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fmount
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong child_id, jlong plist_id)
+Java_hdf_hdf5lib_H5_H5Fmount(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong child_id,
+                             jlong plist_id)
 {
     const char *fileName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -353,11 +343,10 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Funmount
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name)
+Java_hdf_hdf5lib_H5_H5Funmount(JNIEnv *env, jclass clss, jlong loc_id, jstring name)
 {
     const char *fileName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -382,8 +371,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1freespace
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1freespace(JNIEnv *env, jclass clss, jlong file_id)
 {
     hssize_t ret_val = -1;
 
@@ -402,8 +390,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Freopen
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5__1H5Freopen(JNIEnv *env, jclass clss, jlong file_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -422,16 +409,15 @@ done:
  * Signature: (JIJ[J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
-    (JNIEnv *env, jclass clss, jlong file_id, jint types, jlong maxObjs,
-          jlongArray obj_id_list)
+Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *env, jclass clss, jlong file_id, jint types, jlong maxObjs,
+                                     jlongArray obj_id_list)
 {
-    jboolean  isCopy;
-    ssize_t   ret_val = -1;
-    size_t    i;
-    jsize     rank;
-    jlong    *obj_id_listP = NULL;
-    hid_t    *id_list = NULL;
+    jboolean isCopy;
+    ssize_t  ret_val = -1;
+    size_t   i;
+    jsize    rank;
+    jlong *  obj_id_listP = NULL;
+    hid_t *  id_list      = NULL;
 
     UNUSED(clss);
 
@@ -445,7 +431,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Fget_obj_ids: obj_id_list length < 0");
     }
 
-    if (NULL == (id_list = (hid_t *) HDmalloc((size_t)rank * sizeof(hid_t))))
+    if (NULL == (id_list = (hid_t *)HDmalloc((size_t)rank * sizeof(hid_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Fget_obj_ids: malloc failed");
 
     if ((ret_val = H5Fget_obj_ids((hid_t)file_id, (unsigned int)types, (size_t)maxObjs, id_list)) < 0)
@@ -470,8 +456,7 @@ done:
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1obj_1count
-    (JNIEnv *env, jclass clss, jlong file_id, jint types)
+Java_hdf_hdf5lib_H5_H5Fget_1obj_1count(JNIEnv *env, jclass clss, jlong file_id, jint types)
 {
     ssize_t ret_val = -1;
 
@@ -490,8 +475,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1filesize
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1filesize(JNIEnv *env, jclass clss, jlong file_id)
 {
     hsize_t size = 0;
 
@@ -501,7 +485,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1filesize
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) size;
+    return (jlong)size;
 } /* end Java_hdf_hdf5lib_H5_H5Fget_1filesize */
 
 /*
@@ -510,8 +494,7 @@ done:
  * Signature: (J)D
  */
 JNIEXPORT jdouble JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate(JNIEnv *env, jclass clss, jlong file_id)
 {
     double rate = 0.0;
 
@@ -530,14 +513,13 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
-    (JNIEnv *env, jclass clss, jlong file_id, jlongArray metadata_cache)
+Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size(JNIEnv *env, jclass clss, jlong file_id, jlongArray metadata_cache)
 {
-    jboolean  isCopy;
-    size_t    max_size = 0, min_clean_size = 0, cur_size = 0;
-    jlong    *metadata_cache_ptr = NULL;
-    jsize     size = 0;
-    int       cur_num_entries = -1;
+    jboolean isCopy;
+    size_t   max_size = 0, min_clean_size = 0, cur_size = 0;
+    jlong *  metadata_cache_ptr = NULL;
+    jsize    size               = 0;
+    int      cur_num_entries    = -1;
 
     UNUSED(clss);
 
@@ -555,7 +537,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
     if (H5Fget_mdc_size((hid_t)file_id, &max_size, &min_clean_size, &cur_size, &cur_num_entries) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    PIN_LONG_ARRAY(ENVONLY, metadata_cache, metadata_cache_ptr, &isCopy, "H5Fget_mdc_size: metadata_cache array not pinned");
+    PIN_LONG_ARRAY(ENVONLY, metadata_cache, metadata_cache_ptr, &isCopy,
+                   "H5Fget_mdc_size: metadata_cache array not pinned");
 
     metadata_cache_ptr[0] = (jlong)max_size;
     metadata_cache_ptr[1] = (jlong)min_clean_size;
@@ -574,8 +557,7 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5F_info2_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1info
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Fget_1info(JNIEnv *env, jclass clss, jlong obj_id)
 {
     H5F_info2_t finfo;
     jobject     ihinfobuf;
@@ -604,7 +586,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1info
     args[7].j = (jlong)finfo.sohm.hdr_size;
     args[8].l = ihinfobuf;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5F_info2_t", "(IJJIJJIJLhdf/hdf5lib/structs/H5_ih_info_t;)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5F_info2_t",
+                     "(IJJIJJIJLhdf/hdf5lib/structs/H5_ih_info_t;)V", args, ret_obj);
 
 done:
     return ret_obj;
@@ -616,8 +599,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats(JNIEnv *env, jclass clss, jlong file_id)
 {
     UNUSED(clss);
 
@@ -634,8 +616,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache(JNIEnv *env, jclass clss, jlong file_id)
 {
     UNUSED(clss);
 
@@ -652,8 +633,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write(JNIEnv *env, jclass clss, jlong file_id)
 {
     UNUSED(clss);
 
@@ -670,8 +650,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging(JNIEnv *env, jclass clss, jlong file_id)
 {
     UNUSED(clss);
 
@@ -688,8 +667,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
-    (JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging(JNIEnv *env, jclass clss, jlong file_id)
 {
     UNUSED(clss);
 
@@ -706,14 +684,14 @@ done:
  * Signature: (J[Z)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
-    (JNIEnv *env, jclass clss, jlong file_id, jbooleanArray mdc_logging_status)
+Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status(JNIEnv *env, jclass clss, jlong file_id,
+                                                 jbooleanArray mdc_logging_status)
 {
-    jboolean  *mdc_logging_status_ptr = NULL;
-    jboolean   isCopy;
-    hbool_t    is_enabled;
-    hbool_t    is_currently_logging;
-    jsize      size;
+    jboolean *mdc_logging_status_ptr = NULL;
+    jboolean  isCopy;
+    hbool_t   is_enabled;
+    hbool_t   is_currently_logging;
+    jsize     size;
 
     UNUSED(clss);
 
@@ -731,7 +709,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
     if (H5Fget_mdc_logging_status((hid_t)file_id, &is_enabled, &is_currently_logging) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    PIN_BOOL_ARRAY(ENVONLY, mdc_logging_status, mdc_logging_status_ptr, &isCopy, "H5Fget_mdc_logging_status: mdc_logging_status array not pinned");
+    PIN_BOOL_ARRAY(ENVONLY, mdc_logging_status, mdc_logging_status_ptr, &isCopy,
+                   "H5Fget_mdc_logging_status: mdc_logging_status array not pinned");
 
     mdc_logging_status_ptr[0] = (jboolean)is_enabled;
     mdc_logging_status_ptr[1] = (jboolean)is_currently_logging;
@@ -749,8 +728,7 @@ done:
  * Signature: (JZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint
-(JNIEnv *env, jclass clss, jlong file_id, jboolean minimize)
+Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id, jboolean minimize)
 {
     hbool_t minimize_val;
     herr_t  retVal = FAIL;
@@ -772,10 +750,9 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint
-(JNIEnv *env, jclass clss, jlong file_id)
+Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id)
 {
-    jboolean bval = JNI_FALSE;
+    jboolean bval     = JNI_FALSE;
     hbool_t  minimize = FALSE;
 
     UNUSED(clss);
@@ -784,7 +761,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (minimize == TRUE)
-        bval =  JNI_TRUE;
+        bval = JNI_TRUE;
 
 done:
     return bval;
@@ -796,8 +773,7 @@ done:
  * Signature: (JII)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds
-    (JNIEnv *env, jclass clss, jlong file_id, jint low, jint high)
+Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds(JNIEnv *env, jclass clss, jlong file_id, jint low, jint high)
 {
     herr_t retVal = FAIL;
 
@@ -810,7 +786,6 @@ done:
     return;
 } /* end Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5fImp.h b/java/src/jni/h5fImp.h
index fc02c76..6696218 100644
--- a/java/src/jni/h5fImp.h
+++ b/java/src/jni/h5fImp.h
@@ -26,270 +26,212 @@ extern "C" {
  * Method:    H5Fopen
  * Signature: (Ljava/lang/String;IJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fopen
-  (JNIEnv*, jclass, jstring, jint, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Fopen(JNIEnv *, jclass, jstring, jint, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fcreate
  * Signature: (Ljava/lang/String;IJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fcreate
-  (JNIEnv*, jclass, jstring, jint, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Fcreate(JNIEnv *, jclass, jstring, jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fflush
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fflush
-  (JNIEnv*, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Fflush(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_name
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1name
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Fget_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fis_hdf5
  * Signature: (Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fis_1hdf5
-  (JNIEnv*, jclass, jstring);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Fis_1hdf5(JNIEnv *, jclass, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fis_accessible
  * Signature: (Ljava/lang/String;J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fis_1accessible
-  (JNIEnv*, jclass, jstring, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Fis_1accessible(JNIEnv *, jclass, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_create_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fget_1create_1plist
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Fget_1create_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_access_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Fget_1access_1plist
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Fget_1access_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_intent
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1intent
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Fget_1intent(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_fileno
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1fileno
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Fget_1fileno(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Fclose
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Fclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fmount
  * Signature: (JLjava/lang/String;JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fmount
-  (JNIEnv*, jclass, jlong, jstring, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Fmount(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Funmount
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Funmount
-  (JNIEnv*, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Funmount(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_freespace
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1freespace
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Fget_1freespace(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Freopen
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Freopen
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Freopen(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_obj_ids
  * Signature: (JIJ[J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
-  (JNIEnv*, jclass, jlong, jint, jlong, jlongArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids(JNIEnv *, jclass, jlong, jint, jlong,
+                                                             jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_obj_count
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1obj_1count
-  (JNIEnv*, jclass, jlong, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Fget_1obj_1count(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_filesize
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1filesize
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Fget_1filesize(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_mdc_hit_rate
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jdouble JNICALL Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_mdc_size
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
-  (JNIEnv*, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Freset_mdc_hit_rate_stats
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_info
  * Signature: (J)Lhdf/hdf5lib/structs/H5F_info2_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1info
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Fget_1info(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fclear_elink_file_cache
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fstart_swmr_write
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fstart_mdc_logging
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fstop_mdc_logging
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_mdc_logging_status
  * Signature: (J[Z)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
-  (JNIEnv *, jclass, jlong, jbooleanArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status(JNIEnv *, jclass, jlong,
+                                                                        jbooleanArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fset_dset_no_attrs_hint
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint
-  (JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fget_dset_no_attrs_hint
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Fset_libver_bounds
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Fset_1libver_1bounds(JNIEnv *, jclass, jlong, jint, jint);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c
index 79b1b65..43a6122 100644
--- a/java/src/jni/h5gImp.c
+++ b/java/src/jni/h5gImp.c
@@ -40,8 +40,7 @@ extern "C" {
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Gclose
-    (JNIEnv *env, jclass clss, jlong group_id)
+Java_hdf_hdf5lib_H5__1H5Gclose(JNIEnv *env, jclass clss, jlong group_id)
 {
     herr_t retVal = FAIL;
 
@@ -65,8 +64,7 @@ done:
  *
  */
 jobject
-create_H5G_info_t
-    (JNIEnv *env, H5G_info_t group_info)
+create_H5G_info_t(JNIEnv *env, H5G_info_t group_info)
 {
     jfieldID fid_storage_type, fid_nlinks, fid_max_corder, fid_mounted;
     jboolean jmounted;
@@ -92,7 +90,7 @@ create_H5G_info_t
     if (NULL == (fid_mounted = ENVPTR->GetFieldID(ENVONLY, cls, "mounted", "Z")))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-    jmounted = (group_info.mounted == 0) ? JNI_FALSE : JNI_TRUE;
+    jmounted     = (group_info.mounted == 0) ? JNI_FALSE : JNI_TRUE;
     storage_type = (jint)group_info.storage_type;
 
     ENVPTR->SetIntField(ENVONLY, obj, fid_storage_type, (jint)storage_type);
@@ -117,11 +115,10 @@ done:
  * Signature: (JLjava/lang/String;JJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gcreate2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name,
-          jlong link_plist_id, jlong create_plist_id, jlong access_plist_id)
+Java_hdf_hdf5lib_H5__1H5Gcreate2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong link_plist_id,
+                                 jlong create_plist_id, jlong access_plist_id)
 {
-    const char *grpName = NULL;
+    const char *grpName  = NULL;
     hid_t       group_id = H5I_INVALID_HID;
 
     UNUSED(clss);
@@ -131,7 +128,8 @@ Java_hdf_hdf5lib_H5__1H5Gcreate2
 
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Gcreate2: group name not pinned");
 
-    if ((group_id = H5Gcreate2((hid_t)loc_id, grpName, (hid_t)link_plist_id, (hid_t)create_plist_id, (hid_t)access_plist_id)) < 0)
+    if ((group_id = H5Gcreate2((hid_t)loc_id, grpName, (hid_t)link_plist_id, (hid_t)create_plist_id,
+                               (hid_t)access_plist_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -147,8 +145,7 @@ done:
  * Signature: (JJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gcreate_1anon
-    (JNIEnv *env, jclass clss, jlong loc_id, jlong gcpl_id, jlong gapl_id)
+Java_hdf_hdf5lib_H5__1H5Gcreate_1anon(JNIEnv *env, jclass clss, jlong loc_id, jlong gcpl_id, jlong gapl_id)
 {
     hid_t group_id = H5I_INVALID_HID;
 
@@ -167,10 +164,9 @@ done:
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gopen2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist_id)
+Java_hdf_hdf5lib_H5__1H5Gopen2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist_id)
 {
-    const char *grpName = NULL;
+    const char *grpName  = NULL;
     hid_t       group_id = H5I_INVALID_HID;
 
     UNUSED(clss);
@@ -190,15 +186,13 @@ done:
     return (jlong)group_id;
 } /* end Java_hdf_hdf5lib_H5__1H5Gopen2 */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_create_plist
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1create_1plist
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Gget_1create_1plist(JNIEnv *env, jclass clss, jlong loc_id)
 {
     hid_t plist_id = H5I_INVALID_HID;
 
@@ -217,8 +211,7 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5G_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Gget_1info(JNIEnv *env, jclass clss, jlong loc_id)
 {
     H5G_info_t group_info;
     jobject    obj = NULL;
@@ -241,12 +234,12 @@ done:
  * Signature: (JLjava/lang/String;J)Lhdf/hdf5lib/structs/H5G_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                           jlong lapl_id)
 {
     H5G_info_t  group_info;
     const char *grpName = NULL;
-    jobject     obj = NULL;
+    jobject     obj     = NULL;
     herr_t      ret_val = FAIL;
 
     UNUSED(clss);
@@ -277,16 +270,15 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5G_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_type,
-          jint order, jlong n, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                          jint index_type, jint order, jlong n, jlong lapl_id)
 {
-    H5_iter_order_t  corder = (H5_iter_order_t)order;
-    H5_index_t       cindex_type = (H5_index_t)index_type;
-    H5G_info_t       group_info;
-    const char      *grpName = NULL;
-    jobject          obj = NULL;
-    herr_t           ret_val = FAIL;
+    H5_iter_order_t corder      = (H5_iter_order_t)order;
+    H5_index_t      cindex_type = (H5_index_t)index_type;
+    H5G_info_t      group_info;
+    const char *    grpName = NULL;
+    jobject         obj     = NULL;
+    herr_t          ret_val = FAIL;
 
     UNUSED(clss);
 
@@ -295,8 +287,8 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Gget_info_by_idx: group name not pinned");
 
-    if ((ret_val = H5Gget_info_by_idx((hid_t)loc_id, grpName, cindex_type,
-            corder, (hsize_t)n, &group_info, (hid_t)lapl_id)) < 0)
+    if ((ret_val = H5Gget_info_by_idx((hid_t)loc_id, grpName, cindex_type, corder, (hsize_t)n, &group_info,
+                                      (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (obj = create_H5G_info_t(env, group_info))) {
@@ -317,8 +309,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Gflush
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Gflush(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -335,8 +326,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Grefresh
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Grefresh(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -347,8 +337,6 @@ done:
     return;
 } /* end Java_hdf_hdf5lib_H5_H5Grefresh */
 
-
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5gImp.h b/java/src/jni/h5gImp.h
index a411658..3de21b7 100644
--- a/java/src/jni/h5gImp.h
+++ b/java/src/jni/h5gImp.h
@@ -21,97 +21,77 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Gclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Gclose
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Gclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Gcreate2
  * Signature: (JLjava/lang/String;JJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gcreate2
-  (JNIEnv*, jclass, jlong, jstring, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Gcreate2(JNIEnv *, jclass, jlong, jstring, jlong, jlong,
+                                                         jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Gcreate_anon
  * Signature: (JJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gcreate_1anon
-  (JNIEnv*, jclass, jlong, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Gcreate_1anon(JNIEnv *, jclass, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Gopen2
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Gopen2
-  (JNIEnv*, jclass, jlong, jstring, jlong);
-
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Gopen2(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_create_plist
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1create_1plist
-(JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Gget_1create_1plist(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_info
  * Signature: (J)Lhdf/hdf5lib/structs/H5G_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Gget_1info(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_info_by_name
  * Signature: (JLjava/lang/String;J)Lhdf/hdf5lib/structs/H5G_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_info_by_idx
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5G_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gflush
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Gflush
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Gflush(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Grefresh
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Grefresh
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Grefresh(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5iImp.c b/java/src/jni/h5iImp.c
index e8030aee..78cc138 100644
--- a/java/src/jni/h5iImp.c
+++ b/java/src/jni/h5iImp.c
@@ -38,8 +38,7 @@ extern "C" {
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1type
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iget_1type(JNIEnv *env, jclass clss, jlong obj_id)
 {
     H5I_type_t retVal = H5I_BADID;
 
@@ -58,19 +57,19 @@ done:
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name_1long
-    (JNIEnv *env, jclass clss, jlong obj_id, jobjectArray name, jlong buf_size)
+Java_hdf_hdf5lib_H5_H5Iget_1name_1long(JNIEnv *env, jclass clss, jlong obj_id, jobjectArray name,
+                                       jlong buf_size)
 {
-    ssize_t  size = -1;
-    jstring  str;
-    char    *aName = NULL;
+    ssize_t size = -1;
+    jstring str;
+    char *  aName = NULL;
 
     UNUSED(clss);
 
     if (buf_size < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Iget_name_long: buf_size < 0");
 
-    if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (aName = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Iget_name_long: malloc failed");
 
     if ((size = H5Iget_name((hid_t)obj_id, aName, (size_t)buf_size + 1)) < 0)
@@ -90,19 +89,17 @@ done:
     return (jlong)size;
 } /* end Java_hdf_hdf5lib_H5_H5Iget_1name */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iget_name
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iget_1name(JNIEnv *env, jclass clss, jlong obj_id)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size = -1;
-    char    *aName = NULL;
+    jstring str      = NULL;
+    ssize_t buf_size = -1;
+    char *  aName    = NULL;
 
     UNUSED(clss);
 
@@ -110,7 +107,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1name
     if ((buf_size = H5Iget_name((hid_t)obj_id, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (aName = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Iget_name: malloc failed");
 
     if (H5Iget_name((hid_t)obj_id, aName, (size_t)buf_size + 1) < 0)
@@ -133,8 +130,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1ref
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iget_1ref(JNIEnv *env, jclass clss, jlong obj_id)
 {
     int retVal = FAIL;
 
@@ -153,8 +149,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iinc_1ref
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iinc_1ref(JNIEnv *env, jclass clss, jlong obj_id)
 {
     int retVal = FAIL;
 
@@ -173,8 +168,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Idec_1ref
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Idec_1ref(JNIEnv *env, jclass clss, jlong obj_id)
 {
     int retVal = FAIL;
 
@@ -194,8 +188,7 @@ done:
  */
 
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1file_1id
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iget_1file_1id(JNIEnv *env, jclass clss, jlong obj_id)
 {
     hid_t file_id = H5I_INVALID_HID;
 
@@ -205,7 +198,7 @@ Java_hdf_hdf5lib_H5_H5Iget_1file_1id
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) file_id;
+    return (jlong)file_id;
 } /* end Java_hdf_hdf5lib_H5_H5Iget_1file_1id */
 
 /*
@@ -214,8 +207,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1type_1ref
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Iget_1type_1ref(JNIEnv *env, jclass clss, jint type)
 {
     int retVal = FAIL;
 
@@ -234,8 +226,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Idec_1type_1ref
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Idec_1type_1ref(JNIEnv *env, jclass clss, jint type)
 {
     int retVal = FAIL;
 
@@ -254,8 +245,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iinc_1type_1ref
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Iinc_1type_1ref(JNIEnv *env, jclass clss, jint type)
 {
     int retVal = FAIL;
 
@@ -274,8 +264,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Inmembers
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Inmembers(JNIEnv *env, jclass clss, jint type)
 {
     hsize_t num_members = 0;
 
@@ -294,8 +283,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Iis_1valid
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Iis_1valid(JNIEnv *env, jclass clss, jlong obj_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -315,8 +303,7 @@ done:
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Itype_1exists
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Itype_1exists(JNIEnv *env, jclass clss, jint type)
 {
     htri_t bval = JNI_FALSE;
 
@@ -337,8 +324,7 @@ done:
  * Signature: (IZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Iclear_1type
-    (JNIEnv *env, jclass clss, jint type, jboolean force)
+Java_hdf_hdf5lib_H5_H5Iclear_1type(JNIEnv *env, jclass clss, jint type, jboolean force)
 {
     UNUSED(clss);
 
@@ -355,8 +341,7 @@ done:
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Idestroy_1type
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5_H5Idestroy_1type(JNIEnv *env, jclass clss, jint type)
 {
     UNUSED(clss);
 
diff --git a/java/src/jni/h5iImp.h b/java/src/jni/h5iImp.h
index 2c854e6..ff407d9 100644
--- a/java/src/jni/h5iImp.h
+++ b/java/src/jni/h5iImp.h
@@ -26,54 +26,42 @@ extern "C" {
  * Method:    H5Iget_type
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1type
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Iget_1type(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iget_name_long
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name_1long
-  (JNIEnv*, jclass, jlong, jobjectArray, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Iget_1name_1long(JNIEnv *, jclass, jlong, jobjectArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iget_name
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1name
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Iget_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iget_ref
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1ref
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Iget_1ref(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iinc_ref
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iinc_1ref
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Iinc_1ref(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Idec_1ref
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Idec_1ref
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Idec_1ref(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
@@ -81,81 +69,63 @@ Java_hdf_hdf5lib_H5_H5Idec_1ref
  * Signature: (J)J
  */
 
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1file_1id
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Iget_1file_1id(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iget_type_ref
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iget_1type_1ref
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Iget_1type_1ref(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Idec_type_ref
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Idec_1type_1ref
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Idec_1type_1ref(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iinc_type_ref
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Iinc_1type_1ref
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Iinc_1type_1ref(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Inmembers
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Inmembers
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Inmembers(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iis_valid
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Iis_1valid
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Iis_1valid(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Itype_exists
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Itype_1exists
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Itype_1exists(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Iclear_type
  * Signature: (IZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Iclear_1type
-  (JNIEnv*, jclass, jint, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Iclear_1type(JNIEnv *, jclass, jint, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Idestroy_type
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Idestroy_1type
-  (JNIEnv*, jclass, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Idestroy_1type(JNIEnv *, jclass, jint);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5jni.h b/java/src/jni/h5jni.h
index f583630..346b605 100644
--- a/java/src/jni/h5jni.h
+++ b/java/src/jni/h5jni.h
@@ -26,26 +26,26 @@
 #define _Included_h5jni
 
 #ifdef __cplusplus
-  #define ENVPTR (env)
-  #define ENVONLY
-  #define CBENVPTR (cbenv)
-  #define CBENVONLY
-  #define JVMPTR (jvm)
-  #define JVMPAR
+#define ENVPTR (env)
+#define ENVONLY
+#define CBENVPTR (cbenv)
+#define CBENVONLY
+#define JVMPTR (jvm)
+#define JVMPAR
 #else /* __cplusplus */
-  #define ENVPTR (*env)
-  #define ENVONLY env
-  #define CBENVPTR (*cbenv)
-  #define CBENVONLY cbenv
-  #define JVMPTR (*jvm)
-  #define JVMPAR jvm
+#define ENVPTR    (*env)
+#define ENVONLY   env
+#define CBENVPTR  (*cbenv)
+#define CBENVONLY cbenv
+#define JVMPTR    (*jvm)
+#define JVMPAR    jvm
 #endif /* __cplusplus */
 
 /*
  * Used to silence compiler when a particular
  * function parameter is not used.
  */
-#define UNUSED(o) (void) o
+#define UNUSED(o) (void)o
 
 /*
  * Macro to check for a JNI exception after a JNI method is called.
@@ -57,205 +57,207 @@
  * cleanup+return section of the native method, since at that point
  * cleaning up and returning is the only safe thing that can be done.
  */
-#define CHECK_JNI_EXCEPTION(envptr, clearException)         \
-do {                                                        \
-    if (JNI_TRUE == (*envptr)->ExceptionCheck(envptr)) {    \
-        if (JNI_TRUE == clearException)                     \
-            (*envptr)->ExceptionClear(envptr);              \
-        else                                                \
-            goto done;                                      \
-    }                                                       \
-} while(0)
+#define CHECK_JNI_EXCEPTION(envptr, clearException)                                                          \
+    do {                                                                                                     \
+        if (JNI_TRUE == (*envptr)->ExceptionCheck(envptr)) {                                                 \
+            if (JNI_TRUE == clearException)                                                                  \
+                (*envptr)->ExceptionClear(envptr);                                                           \
+            else                                                                                             \
+                goto done;                                                                                   \
+        }                                                                                                    \
+    } while (0)
 
 /* Macros for class access */
 /* Calling code must define ret_obj as jobject */
-#define CALL_CONSTRUCTOR(envptr, classname, classsig, args, ret_obj)                         \
-do {                                                                                         \
-    jmethodID constructor;                                                                   \
-    jclass    cls;                                                                           \
-                                                                                             \
-    if (NULL == (cls = (*envptr)->FindClass(envptr, (classname)))) {                         \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                               \
-        H5_JNI_FATAL_ERROR(envptr, "JNI error: GetObjectClass");                             \
-    }                                                                                        \
-    if (NULL == (constructor = (*envptr)->GetMethodID(envptr, cls, "<init>", (classsig)))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                               \
-        H5_JNI_FATAL_ERROR(envptr, "JNI error: GetMethodID failed");                         \
-    }                                                                                        \
-    if (NULL == (ret_obj = (*envptr)->NewObjectA(envptr, cls, constructor, (args)))) {       \
-        HDprintf("FATAL ERROR: %s: Creation failed\n", classname);                           \
-        CHECK_JNI_EXCEPTION(envptr, JNI_FALSE);                                              \
-    }                                                                                        \
-} while(0)
+#define CALL_CONSTRUCTOR(envptr, classname, classsig, args, ret_obj)                                         \
+    do {                                                                                                     \
+        jmethodID constructor;                                                                               \
+        jclass    cls;                                                                                       \
+                                                                                                             \
+        if (NULL == (cls = (*envptr)->FindClass(envptr, (classname)))) {                                     \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, "JNI error: GetObjectClass");                                         \
+        }                                                                                                    \
+        if (NULL == (constructor = (*envptr)->GetMethodID(envptr, cls, "<init>", (classsig)))) {             \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, "JNI error: GetMethodID failed");                                     \
+        }                                                                                                    \
+        if (NULL == (ret_obj = (*envptr)->NewObjectA(envptr, cls, constructor, (args)))) {                   \
+            HDprintf("FATAL ERROR: %s: Creation failed\n", classname);                                       \
+            CHECK_JNI_EXCEPTION(envptr, JNI_FALSE);                                                          \
+        }                                                                                                    \
+    } while (0)
 
 /*
  * Macros for pinning/unpinning objects.
  */
-#define PIN_BYTE_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                      \
-    if (NULL == (outBuf = (*envptr)->GetByteArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                            \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                           \
-    }                                                                                     \
-} while(0)
-
-#define PIN_BYTE_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                     \
-    if (NULL == (outBuf = (jbyte *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
-    }                                                                                                    \
-} while(0)
-
-#define UNPIN_BYTE_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                           \
-do {                                                                                            \
-    (*envptr)->ReleaseByteArrayElements(envptr, pinnedArray, (jbyte *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_SHORT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                       \
-    if (NULL == (outBuf = (*envptr)->GetShortArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                             \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                            \
-    }                                                                                      \
-} while(0)
-
-#define PIN_SHORT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                      \
-    if (NULL == (outBuf = (jshort *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                            \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                           \
-    }                                                                                                     \
-} while(0)
-
-#define UNPIN_SHORT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                            \
-do {                                                                                              \
-    (*envptr)->ReleaseShortArrayElements(envptr, pinnedArray, (jshort *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_INT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                     \
-    if (NULL == (outBuf = (*envptr)->GetIntArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                           \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                          \
-    }                                                                                    \
-} while(0)
-
-#define PIN_INT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                    \
-    if (NULL == (outBuf = (jint *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                          \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                         \
-    }                                                                                                   \
-} while(0)
-
-#define UNPIN_INT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                          \
-do {                                                                                          \
-    (*envptr)->ReleaseIntArrayElements(envptr, pinnedArray, (jint *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_LONG_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                      \
-    if (NULL == (outBuf = (*envptr)->GetLongArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                            \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                           \
-    }                                                                                     \
-} while(0)
-
-#define PIN_LONG_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                     \
-    if (NULL == (outBuf = (jlong *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
-    }                                                                                                    \
-} while(0)
-
-#define UNPIN_LONG_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                           \
-do {                                                                                            \
-    (*envptr)->ReleaseLongArrayElements(envptr, pinnedArray, (jlong *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_FLOAT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                       \
-    if (NULL == (outBuf = (*envptr)->GetFloatArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                             \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                            \
-    }                                                                                      \
-} while(0)
-
-#define PIN_FLOAT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                      \
-    if (NULL == (outBuf = (jfloat *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                            \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                           \
-    }                                                                                                     \
-} while(0)
-
-#define UNPIN_FLOAT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                            \
-do {                                                                                              \
-    (*envptr)->ReleaseFloatArrayElements(envptr, pinnedArray, (jfloat *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_DOUBLE_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                    \
-do {                                                                                        \
-    if (NULL == (outBuf = (*envptr)->GetDoubleArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                              \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                             \
-    }                                                                                       \
-} while(0)
-
-#define PIN_DOUBLE_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                          \
-do {                                                                                                       \
-    if (NULL == (outBuf = (jdouble *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                             \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                            \
-    }                                                                                                      \
-} while(0)
-
-#define UNPIN_DOUBLE_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                             \
-do {                                                                                                \
-    (*envptr)->ReleaseDoubleArrayElements(envptr, pinnedArray, (jdouble *) bufToRelease, freeMode); \
-} while(0)
-
-#define PIN_BOOL_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                       \
-do {                                                                                         \
-    if (NULL == (outBuf = (*envptr)->GetBooleanArrayElements(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                               \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                              \
-    }                                                                                        \
-} while(0)
-
-#define PIN_BOOL_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                             \
-do {                                                                                                        \
-    if (NULL == (outBuf = (jboolean *) (*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                              \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                             \
-    }                                                                                                       \
-} while(0)
-
-#define UNPIN_BOOL_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                 \
-do {                                                                                                  \
-    (*envptr)->ReleaseBooleanArrayElements(envptr, pinnedArray, (jboolean *) bufToRelease, freeMode); \
-} while(0)
-
-#define UNPIN_ARRAY_CRITICAL(envptr, pinnedArray, bufToRelease, freeMode)                  \
-do {                                                                                       \
-    (*envptr)->ReleasePrimitiveArrayCritical(envptr, pinnedArray, bufToRelease, freeMode); \
-} while(0)
+#define PIN_BYTE_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                       \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetByteArrayElements(envptr, arrayToPin, isCopy))) {                \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_BYTE_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                              \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (jbyte *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) {  \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_BYTE_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                        \
+    do {                                                                                                     \
+        (*envptr)->ReleaseByteArrayElements(envptr, pinnedArray, (jbyte *)bufToRelease, freeMode);           \
+    } while (0)
+
+#define PIN_SHORT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                      \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetShortArrayElements(envptr, arrayToPin, isCopy))) {               \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_SHORT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                             \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (jshort *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_SHORT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                       \
+    do {                                                                                                     \
+        (*envptr)->ReleaseShortArrayElements(envptr, pinnedArray, (jshort *)bufToRelease, freeMode);         \
+    } while (0)
+
+#define PIN_INT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                        \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetIntArrayElements(envptr, arrayToPin, isCopy))) {                 \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_INT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                               \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (jint *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) {   \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_INT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                         \
+    do {                                                                                                     \
+        (*envptr)->ReleaseIntArrayElements(envptr, pinnedArray, (jint *)bufToRelease, freeMode);             \
+    } while (0)
+
+#define PIN_LONG_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                       \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetLongArrayElements(envptr, arrayToPin, isCopy))) {                \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_LONG_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                              \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (jlong *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) {  \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_LONG_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                        \
+    do {                                                                                                     \
+        (*envptr)->ReleaseLongArrayElements(envptr, pinnedArray, (jlong *)bufToRelease, freeMode);           \
+    } while (0)
+
+#define PIN_FLOAT_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                      \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetFloatArrayElements(envptr, arrayToPin, isCopy))) {               \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_FLOAT_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                             \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (jfloat *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) { \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_FLOAT_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                       \
+    do {                                                                                                     \
+        (*envptr)->ReleaseFloatArrayElements(envptr, pinnedArray, (jfloat *)bufToRelease, freeMode);         \
+    } while (0)
+
+#define PIN_DOUBLE_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                     \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetDoubleArrayElements(envptr, arrayToPin, isCopy))) {              \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_DOUBLE_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                            \
+    do {                                                                                                     \
+        if (NULL ==                                                                                          \
+            (outBuf = (jdouble *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) {        \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_DOUBLE_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                      \
+    do {                                                                                                     \
+        (*envptr)->ReleaseDoubleArrayElements(envptr, pinnedArray, (jdouble *)bufToRelease, freeMode);       \
+    } while (0)
+
+#define PIN_BOOL_ARRAY(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                                       \
+    do {                                                                                                     \
+        if (NULL == (outBuf = (*envptr)->GetBooleanArrayElements(envptr, arrayToPin, isCopy))) {             \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define PIN_BOOL_ARRAY_CRITICAL(envptr, arrayToPin, outBuf, isCopy, failErrMsg)                              \
+    do {                                                                                                     \
+        if (NULL ==                                                                                          \
+            (outBuf = (jboolean *)(*envptr)->GetPrimitiveArrayCritical(envptr, arrayToPin, isCopy))) {       \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_BOOL_ARRAY(envptr, pinnedArray, bufToRelease, freeMode)                                        \
+    do {                                                                                                     \
+        (*envptr)->ReleaseBooleanArrayElements(envptr, pinnedArray, (jboolean *)bufToRelease, freeMode);     \
+    } while (0)
+
+#define UNPIN_ARRAY_CRITICAL(envptr, pinnedArray, bufToRelease, freeMode)                                    \
+    do {                                                                                                     \
+        (*envptr)->ReleasePrimitiveArrayCritical(envptr, pinnedArray, bufToRelease, freeMode);               \
+    } while (0)
 
 /* Macros for string access */
-#define PIN_JAVA_STRING(envptr, stringToPin, outString, isCopy, failErrMsg)                \
-do {                                                                                       \
-    if (NULL == (outString = (*envptr)->GetStringUTFChars(envptr, stringToPin, isCopy))) { \
-        CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                             \
-        H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                            \
-    }                                                                                      \
-} while(0)
-
-#define UNPIN_JAVA_STRING(envptr, pinnedString, stringToRelease)             \
-do {                                                                         \
-    (*envptr)->ReleaseStringUTFChars(envptr, pinnedString, stringToRelease); \
-} while(0)
+#define PIN_JAVA_STRING(envptr, stringToPin, outString, isCopy, failErrMsg)                                  \
+    do {                                                                                                     \
+        if (NULL == (outString = (*envptr)->GetStringUTFChars(envptr, stringToPin, isCopy))) {               \
+            CHECK_JNI_EXCEPTION(envptr, JNI_TRUE);                                                           \
+            H5_JNI_FATAL_ERROR(envptr, failErrMsg);                                                          \
+        }                                                                                                    \
+    } while (0)
+
+#define UNPIN_JAVA_STRING(envptr, pinnedString, stringToRelease)                                             \
+    do {                                                                                                     \
+        (*envptr)->ReleaseStringUTFChars(envptr, pinnedString, stringToRelease);                             \
+    } while (0)
 
 #ifdef __cplusplus
 extern "C" {
@@ -267,7 +269,7 @@ extern jboolean h5badArgument(JNIEnv *env, const char *);
 extern jboolean h5outOfMemory(JNIEnv *env, const char *);
 extern jboolean h5libraryError(JNIEnv *env);
 extern jboolean h5raiseException(JNIEnv *env, const char *, const char *);
-extern jboolean h5unimplemented( JNIEnv *env, const char *functName);
+extern jboolean h5unimplemented(JNIEnv *env, const char *functName);
 
 /*
  * The following macros are to facilitate immediate cleanup+return
@@ -279,52 +281,52 @@ extern jboolean h5unimplemented( JNIEnv *env, const char *functName);
  * Note that a native method can clear the exception when one occurs and
  * then do its own error handling, but we instead opt to immediately return.
  */
-#define H5_JNI_FATAL_ERROR(env, message) \
-do {                                     \
-    h5JNIFatalError(env, message);       \
-    goto done;                           \
-} while(0)
-
-#define H5_NULL_ARGUMENT_ERROR(env, message) \
-do {                                         \
-    h5nullArgument(env, message);            \
-    goto done;                               \
-} while(0)
-
-#define H5_BAD_ARGUMENT_ERROR(env, message) \
-do {                                        \
-    h5badArgument(env, message);            \
-    goto done;                              \
-} while(0)
-
-#define H5_OUT_OF_MEMORY_ERROR(env, message) \
-do {                                         \
-    h5outOfMemory(env, message);             \
-    goto done;                               \
-} while(0)
-
-#define H5_LIBRARY_ERROR(env) \
-do {                          \
-    h5libraryError(env);      \
-    goto done;                \
-} while(0)
-
-#define H5_RAISE_EXCEPTION(env, message, exception) \
-do {                                                \
-    h5raiseException(env, message, exception);      \
-    goto done;                                      \
-} while(0)
-
-#define H5_UNIMPLEMENTED(env, message) \
-do {                                   \
-    h5unimplemented(env, message);     \
-    goto done;                         \
-} while(0)
+#define H5_JNI_FATAL_ERROR(env, message)                                                                     \
+    do {                                                                                                     \
+        h5JNIFatalError(env, message);                                                                       \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_NULL_ARGUMENT_ERROR(env, message)                                                                 \
+    do {                                                                                                     \
+        h5nullArgument(env, message);                                                                        \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_BAD_ARGUMENT_ERROR(env, message)                                                                  \
+    do {                                                                                                     \
+        h5badArgument(env, message);                                                                         \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_OUT_OF_MEMORY_ERROR(env, message)                                                                 \
+    do {                                                                                                     \
+        h5outOfMemory(env, message);                                                                         \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_LIBRARY_ERROR(env)                                                                                \
+    do {                                                                                                     \
+        h5libraryError(env);                                                                                 \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_RAISE_EXCEPTION(env, message, exception)                                                          \
+    do {                                                                                                     \
+        h5raiseException(env, message, exception);                                                           \
+        goto done;                                                                                           \
+    } while (0)
+
+#define H5_UNIMPLEMENTED(env, message)                                                                       \
+    do {                                                                                                     \
+        h5unimplemented(env, message);                                                                       \
+        goto done;                                                                                           \
+    } while (0)
 
 /* implemented at H5.c */
-extern jint get_enum_value(JNIEnv *env, jobject enum_obj);
-extern jobject get_enum_object(JNIEnv *env, const char* enum_class_name,
-    jint enum_val, const char* enum_field_desc);
+extern jint    get_enum_value(JNIEnv *env, jobject enum_obj);
+extern jobject get_enum_object(JNIEnv *env, const char *enum_class_name, jint enum_val,
+                               const char *enum_field_desc);
 
 /* implemented at H5G.c */
 extern jobject create_H5G_info_t(JNIEnv *env, H5G_info_t group_info);
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index b5312bd..5dd2d0a 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -49,13 +49,12 @@ static herr_t H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *in
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcopy
-    (JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name, jlong dst_loc_id,
-        jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lcopy(JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name, jlong dst_loc_id,
+                            jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *lCurName = NULL;
     const char *lDstName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -67,7 +66,8 @@ Java_hdf_hdf5lib_H5_H5Lcopy
     PIN_JAVA_STRING(ENVONLY, cur_name, lCurName, NULL, "H5Lcopy: src name not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, lDstName, NULL, "H5Lcopy: dest name not pinned");
 
-    if ((status = H5Lcopy((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Lcopy((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id,
+                          (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -83,14 +83,13 @@ done:
  * Signature: (Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1external
-    (JNIEnv *env, jclass clss, jstring file_name, jstring cur_name,
-        jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lcreate_1external(JNIEnv *env, jclass clss, jstring file_name, jstring cur_name,
+                                        jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *lFileName = NULL;
-    const char *lCurName = NULL;
-    const char *lDstName = NULL;
-    herr_t      status = FAIL;
+    const char *lCurName  = NULL;
+    const char *lDstName  = NULL;
+    herr_t      status    = FAIL;
 
     UNUSED(clss);
 
@@ -105,7 +104,8 @@ Java_hdf_hdf5lib_H5_H5Lcreate_1external
     PIN_JAVA_STRING(ENVONLY, cur_name, lCurName, NULL, "H5Lcreate_external: object name not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, lDstName, NULL, "H5Lcreate_external: link name not pinned");
 
-    if ((status = H5Lcreate_external(lFileName, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Lcreate_external(lFileName, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id,
+                                     (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -123,13 +123,12 @@ done:
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1hard
-    (JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name,
-        jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lcreate_1hard(JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name,
+                                    jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *lCurName = NULL;
     const char *lDstName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -141,7 +140,8 @@ Java_hdf_hdf5lib_H5_H5Lcreate_1hard
     PIN_JAVA_STRING(ENVONLY, cur_name, lCurName, NULL, "H5Lcreate_hard: object name not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, lDstName, NULL, "H5Lcreate_hard: link name not pinned");
 
-    if ((status = H5Lcreate_hard((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Lcreate_hard((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id,
+                                 (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -157,13 +157,12 @@ done:
  * Signature: (Ljava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1soft
-    (JNIEnv *env, jclass clss, jstring cur_name, jlong dst_loc_id,
-        jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lcreate_1soft(JNIEnv *env, jclass clss, jstring cur_name, jlong dst_loc_id,
+                                    jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *linkTarget = NULL;
-    const char *linkName = NULL;
-    herr_t      status = FAIL;
+    const char *linkName   = NULL;
+    herr_t      status     = FAIL;
 
     UNUSED(clss);
 
@@ -175,7 +174,8 @@ Java_hdf_hdf5lib_H5_H5Lcreate_1soft
     PIN_JAVA_STRING(ENVONLY, cur_name, linkTarget, NULL, "H5Lcreate_soft: link target not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, linkName, NULL, "H5Lcreate_soft: link name not pinned");
 
-    if ((status = H5Lcreate_soft(linkTarget, (hid_t)dst_loc_id, linkName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status =
+             H5Lcreate_soft(linkTarget, (hid_t)dst_loc_id, linkName, (hid_t)create_id, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -191,11 +191,10 @@ done:
  * Signature: (JLjava/lang/String;J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ldelete
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Ldelete(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
 {
     const char *linkName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -218,13 +217,12 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ldelete_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name,
-        jint index_field, jint order, jlong link_n, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Ldelete_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_field,
+                                       jint order, jlong link_n, jlong access_id)
 {
     const char *groupName = NULL;
-    hsize_t     n = (hsize_t)link_n;
-    herr_t      status = FAIL;
+    hsize_t     n         = (hsize_t)link_n;
+    herr_t      status    = FAIL;
 
     UNUSED(clss);
 
@@ -233,7 +231,8 @@ Java_hdf_hdf5lib_H5_H5Ldelete_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, groupName, NULL, "H5Ldelete_by_idx: group name not pinned");
 
-    if ((status = H5Ldelete_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order, n, (hid_t)access_id)) < 0)
+    if ((status = H5Ldelete_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                   n, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -247,11 +246,10 @@ done:
  * Signature: (JLjava/lang/String;J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Lexists
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lexists(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
 {
     const char *linkName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -278,14 +276,13 @@ done:
  * Signature: (JLjava/lang/String;J)Lhdf/hdf5lib/structs/H5L_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1info
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lget_1info(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
 {
-    H5L_info2_t  infobuf;
-    const char  *linkName = NULL;
-    jvalue       args[5];
-    herr_t       status = FAIL;
-    jobject      ret_obj = NULL;
+    H5L_info2_t infobuf;
+    const char *linkName = NULL;
+    jvalue      args[5];
+    herr_t      status  = FAIL;
+    jobject     ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -315,7 +312,8 @@ Java_hdf_hdf5lib_H5_H5Lget_1info
         args[3].i = infobuf.cset;
         args[4].l = token;
 
-        CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5L_info_t", "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, ret_obj);
+        CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5L_info_t",
+                         "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, ret_obj);
     }
     else {
         args[0].i = infobuf.type;
@@ -340,15 +338,14 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5L_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name,
-        jint index_field, jint order, jlong link_n, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                          jint index_field, jint order, jlong link_n, jlong access_id)
 {
-    H5L_info2_t  infobuf;
-    const char  *groupName = NULL;
-    jvalue       args[5];
-    herr_t       status = FAIL;
-    jobject      ret_obj = NULL;
+    H5L_info2_t infobuf;
+    const char *groupName = NULL;
+    jvalue      args[5];
+    herr_t      status  = FAIL;
+    jobject     ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -357,7 +354,9 @@ Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, groupName, NULL, "H5Lget_info_by_idx: group name not pinned");
 
-    if ((status = H5Lget_info_by_idx2((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, &infobuf, (hid_t)access_id)) < 0)
+    if ((status = H5Lget_info_by_idx2((hid_t)loc_id, groupName, (H5_index_t)index_field,
+                                      (H5_iter_order_t)order, (hsize_t)link_n, &infobuf, (hid_t)access_id)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     /*
@@ -378,7 +377,8 @@ Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx
         args[3].i = infobuf.cset;
         args[4].l = token;
 
-        CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5L_info_t", "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, ret_obj);
+        CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5L_info_t",
+                         "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, ret_obj);
     }
     else {
         args[0].i = infobuf.type;
@@ -403,14 +403,13 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name,
-        jint index_field, jint order, jlong link_n, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                          jint index_field, jint order, jlong link_n, jlong access_id)
 {
-    const char *groupName = NULL;
-    jstring     str = NULL;
+    const char *groupName   = NULL;
+    jstring     str         = NULL;
     ssize_t     status_size = -1;
-    char       *linkName = NULL;
+    char *      linkName    = NULL;
 
     UNUSED(clss);
 
@@ -420,14 +419,18 @@ Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx
     PIN_JAVA_STRING(ENVONLY, name, groupName, NULL, "H5Lget_name_by_idx: group name not pinned");
 
     /* Get the length of the link name */
-    if ((status_size = H5Lget_name_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, (char *)NULL, (size_t)0, H5P_DEFAULT)) < 0)
+    if ((status_size =
+             H5Lget_name_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                (hsize_t)link_n, (char *)NULL, (size_t)0, H5P_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* add extra space for the null terminator */
-    if (NULL == (linkName = (char *) HDmalloc(sizeof(char) * (size_t)status_size + 1)))
+    if (NULL == (linkName = (char *)HDmalloc(sizeof(char) * (size_t)status_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_name_by_idx: failed to allocate buffer for link name");
 
-    if ((H5Lget_name_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, (char *)linkName, (size_t)status_size + 1, (hid_t)access_id)) < 0)
+    if ((H5Lget_name_by_idx((hid_t)loc_id, groupName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                            (hsize_t)link_n, (char *)linkName, (size_t)status_size + 1, (hid_t)access_id)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
     linkName[status_size] = '\0';
 
@@ -449,16 +452,16 @@ done:
  * Signature: (JLjava/lang/String;[Ljava/lang/String;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1value
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jobjectArray link_value, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                  jobjectArray link_value, jlong access_id)
 {
-    H5L_info2_t  infobuf;
-    const char  *file_name = NULL;
-    const char  *obj_name = NULL;
-    const char  *linkName = NULL;
-    jstring      str;
-    herr_t       status;
-    char        *linkValue = NULL;
+    H5L_info2_t infobuf;
+    const char *file_name = NULL;
+    const char *obj_name  = NULL;
+    const char *linkName  = NULL;
+    jstring     str;
+    herr_t      status;
+    char *      linkValue = NULL;
 
     UNUSED(clss);
 
@@ -476,16 +479,16 @@ Java_hdf_hdf5lib_H5_H5Lget_1value
     if (H5L_TYPE_HARD == infobuf.type)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Lget_val: hard links are unsupported");
 
-    if (NULL == (linkValue = (char *) HDmalloc(sizeof(char) * infobuf.u.val_size + 1)))
+    if (NULL == (linkValue = (char *)HDmalloc(sizeof(char) * infobuf.u.val_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_val: failed to allocate buffer for link value");
 
-    if ((status = H5Lget_val((hid_t)loc_id, linkName, (void *)linkValue, infobuf.u.val_size + 1, (hid_t)access_id)) < 0)
+    if ((status = H5Lget_val((hid_t)loc_id, linkName, (void *)linkValue, infobuf.u.val_size + 1,
+                             (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     linkValue[infobuf.u.val_size] = '\0';
 
     switch (infobuf.type) {
-        case H5L_TYPE_SOFT:
-        {
+        case H5L_TYPE_SOFT: {
             if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, linkValue)))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
@@ -495,9 +498,9 @@ Java_hdf_hdf5lib_H5_H5Lget_1value
             break;
         }
 
-        case H5L_TYPE_EXTERNAL:
-        {
-            if ((status = H5Lunpack_elink_val(linkValue, (size_t)infobuf.u.val_size, (unsigned *)NULL, &file_name, &obj_name)) < 0)
+        case H5L_TYPE_EXTERNAL: {
+            if ((status = H5Lunpack_elink_val(linkValue, (size_t)infobuf.u.val_size, (unsigned *)NULL,
+                                              &file_name, &obj_name)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
             if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, obj_name)))
@@ -538,17 +541,17 @@ done:
  * Signature: (JLjava/lang/String;IIJ[Ljava/lang/String;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_field, jint order,
-        jlong link_n, jobjectArray link_value, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                           jint index_field, jint order, jlong link_n,
+                                           jobjectArray link_value, jlong access_id)
 {
-    H5L_info2_t  infobuf;
-    const char  *file_name = NULL;
-    const char  *obj_name = NULL;
-    const char  *grpName = NULL;
-    jstring      str;
-    herr_t       status;
-    void        *linkValue = NULL;
+    H5L_info2_t infobuf;
+    const char *file_name = NULL;
+    const char *obj_name  = NULL;
+    const char *grpName   = NULL;
+    jstring     str;
+    herr_t      status;
+    void *      linkValue = NULL;
 
     UNUSED(clss);
 
@@ -560,7 +563,8 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Lget_val_by_idx: group name not pinned");
 
     /* Get the length of the link value */
-    if ((status = H5Lget_info_by_idx2((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, &infobuf, (hid_t)access_id)) < 0)
+    if ((status = H5Lget_info_by_idx2((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                      (hsize_t)link_n, &infobuf, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (H5L_TYPE_HARD == infobuf.type)
@@ -569,16 +573,17 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
     if (!infobuf.u.val_size)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (linkValue = (void *) HDmalloc(infobuf.u.val_size + 1)))
+    if (NULL == (linkValue = (void *)HDmalloc(infobuf.u.val_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Lget_val_by_idx: failed to allocate buffer for link value");
 
-    if ((status = H5Lget_val_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, (void *)linkValue, infobuf.u.val_size + 1, (hid_t)access_id)) < 0)
+    if ((status = H5Lget_val_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                    (hsize_t)link_n, (void *)linkValue, infobuf.u.val_size + 1,
+                                    (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
-    ((char *) linkValue)[infobuf.u.val_size] = '\0';
+    ((char *)linkValue)[infobuf.u.val_size] = '\0';
 
     switch (infobuf.type) {
-        case H5L_TYPE_SOFT:
-        {
+        case H5L_TYPE_SOFT: {
             if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, (char *)linkValue)))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
@@ -588,9 +593,9 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
             break;
         }
 
-        case H5L_TYPE_EXTERNAL:
-        {
-            if ((status = H5Lunpack_elink_val((char *)linkValue, (size_t)infobuf.u.val_size, (unsigned *)NULL, (const char **)&file_name, (const char**)&obj_name)) < 0)
+        case H5L_TYPE_EXTERNAL: {
+            if ((status = H5Lunpack_elink_val((char *)linkValue, (size_t)infobuf.u.val_size, (unsigned *)NULL,
+                                              (const char **)&file_name, (const char **)&obj_name)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
             if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, obj_name)))
@@ -631,13 +636,12 @@ done:
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lmove
-    (JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name,
-        jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lmove(JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name, jlong dst_loc_id,
+                            jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *lCurName = NULL;
     const char *lDstName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -649,7 +653,8 @@ Java_hdf_hdf5lib_H5_H5Lmove
     PIN_JAVA_STRING(ENVONLY, cur_name, lCurName, NULL, "H5Lmove: src name not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, lDstName, NULL, "H5Lmove: dest name not pinned");
 
-    if ((status = H5Lmove((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Lmove((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id,
+                          (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -663,19 +668,18 @@ done:
  * Shim function for link iteration and link visiting which
  */
 static herr_t
-H5L_iterate_cb
-    (hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_data)
+H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_data)
 {
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jmethodID   mid;
-    jobject     cb_info_t = NULL;
+    jobject     cb_info_t      = NULL;
     jobject     visit_callback = wrapper->visit_callback;
     jstring     str;
-    JNIEnv     *cbenv = NULL;
+    JNIEnv *    cbenv = NULL;
     jclass      cbcls;
     jvalue      args[5];
-    void       *op_data = (void *)wrapper->op_data;
-    jint        status = -1;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -686,7 +690,9 @@ H5L_iterate_cb
     if (NULL == (cbcls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback", "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5L_info_t;Lhdf/hdf5lib/callbacks/H5L_iterate_opdata_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback",
+                                             "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5L_info_t;Lhdf/"
+                                             "hdf5lib/callbacks/H5L_iterate_opdata_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL == (str = CBENVPTR->NewStringUTF(CBENVONLY, name)))
@@ -710,7 +716,8 @@ H5L_iterate_cb
         args[3].i = info->cset;
         args[4].l = token;
 
-        CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5L_info_t", "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, cb_info_t);
+        CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5L_info_t",
+                         "(IZJILhdf/hdf5lib/structs/H5O_token_t;)V", args, cb_info_t);
     }
     else {
         args[0].i = info->type;
@@ -738,12 +745,11 @@ done:
  * Signature: (JIILjava/lang/Object;Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lvisit
-    (JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
-        jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Lvisit(JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
+                             jobject callback_op, jobject op_data)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
-    herr_t     status = FAIL;
+    cb_wrapper wrapper = {callback_op, op_data};
+    herr_t     status  = FAIL;
 
     UNUSED(clss);
 
@@ -755,8 +761,8 @@ Java_hdf_hdf5lib_H5_H5Lvisit
     if (NULL == callback_op)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Lvisit: callback_op is NULL");
 
-    if ((status = H5Lvisit2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            H5L_iterate_cb, (void *)&wrapper)) < 0)
+    if ((status = H5Lvisit2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, H5L_iterate_cb,
+                            (void *)&wrapper)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -769,13 +775,12 @@ done:
  * Signature: (JLjava/lang/String;IILjava/lang/Object;Ljava/lang/Object;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lvisit_1by_1name
-    (JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type, jint order,
-        jobject callback_op, jobject op_data, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Lvisit_1by_1name(JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type,
+                                       jint order, jobject callback_op, jobject op_data, jlong access_id)
 {
-    cb_wrapper  wrapper = { callback_op, op_data };
+    cb_wrapper  wrapper = {callback_op, op_data};
     const char *grpName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status  = FAIL;
 
     UNUSED(clss);
 
@@ -792,7 +797,7 @@ Java_hdf_hdf5lib_H5_H5Lvisit_1by_1name
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Lvisit_by_name: group name not pinned");
 
     if ((status = H5Lvisit_by_name2((hid_t)grp_id, grpName, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            H5L_iterate_cb, (void *)&wrapper, (hid_t)access_id)) < 0)
+                                    H5L_iterate_cb, (void *)&wrapper, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -808,13 +813,12 @@ done:
  * Signature: (JIIJLjava/lang/Object;Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Literate
-    (JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
-        jlong idx, jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Literate(JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order, jlong idx,
+                               jobject callback_op, jobject op_data)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
+    cb_wrapper wrapper   = {callback_op, op_data};
     hsize_t    start_idx = (hsize_t)idx;
-    herr_t     status = FAIL;
+    herr_t     status    = FAIL;
 
     UNUSED(clss);
 
@@ -826,8 +830,8 @@ Java_hdf_hdf5lib_H5_H5Literate
     if (NULL == callback_op)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Literate: callback_op is NULL");
 
-    if ((status = H5Literate2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            &start_idx, H5L_iterate_cb, (void *)&wrapper)) < 0)
+    if ((status = H5Literate2((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, &start_idx,
+                              H5L_iterate_cb, (void *)&wrapper)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -840,14 +844,14 @@ done:
  * Signature: (JLjava/lang/String;IIJLjava/lang/Object;Ljava/lang/Object;J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Literate_1by_1name
-    (JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type, jint order,
-        jlong idx, jobject callback_op, jobject op_data, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Literate_1by_1name(JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type,
+                                         jint order, jlong idx, jobject callback_op, jobject op_data,
+                                         jlong access_id)
 {
-    cb_wrapper  wrapper = { callback_op, op_data };
+    cb_wrapper  wrapper   = {callback_op, op_data};
     const char *groupName = NULL;
     hsize_t     start_idx = (hsize_t)idx;
-    herr_t      status = FAIL;
+    herr_t      status    = FAIL;
 
     UNUSED(clss);
 
@@ -864,7 +868,7 @@ Java_hdf_hdf5lib_H5_H5Literate_1by_1name
     PIN_JAVA_STRING(ENVONLY, name, groupName, NULL, "H5Literate_by_name: group name not pinned");
 
     if ((status = H5Literate_by_name2((hid_t)grp_id, groupName, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            &start_idx, H5L_iterate_cb, (void*)&wrapper, (hid_t)access_id)) < 0)
+                                      &start_idx, H5L_iterate_cb, (void *)&wrapper, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -880,8 +884,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lis_1registered
-    (JNIEnv *env, jclass clss, jint link_cls_id)
+Java_hdf_hdf5lib_H5_H5Lis_1registered(JNIEnv *env, jclass clss, jint link_cls_id)
 {
     htri_t ret_val = FAIL;
 
@@ -900,8 +903,7 @@ done:
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lunregister
-    (JNIEnv *env, jclass clss, jint link_cls_id)
+Java_hdf_hdf5lib_H5_H5Lunregister(JNIEnv *env, jclass clss, jint link_cls_id)
 {
     UNUSED(clss);
 
@@ -912,7 +914,6 @@ done:
     return;
 } /* end Java_hdf_hdf5lib_H5_H5Lunregister */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5lImp.h b/java/src/jni/h5lImp.h
index 3a7d8ea..7a93c71 100644
--- a/java/src/jni/h5lImp.h
+++ b/java/src/jni/h5lImp.h
@@ -21,177 +21,151 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lcopy
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcopy
-  (JNIEnv*, jclass, jlong, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lcopy(JNIEnv *, jclass, jlong, jstring, jlong, jstring, jlong,
+                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lcreate_external
  * Signature: (Ljava/lang/String;Ljava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1external
-(JNIEnv*, jclass, jstring, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lcreate_1external(JNIEnv *, jclass, jstring, jstring, jlong,
+                                                               jstring, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lcreate_hard
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1hard
-  (JNIEnv*, jclass, jlong, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lcreate_1hard(JNIEnv *, jclass, jlong, jstring, jlong, jstring,
+                                                           jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lcreate_soft
  * Signature: (Ljava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lcreate_1soft
-  (JNIEnv*, jclass, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lcreate_1soft(JNIEnv *, jclass, jstring, jlong, jstring, jlong,
+                                                           jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ldelete
  * Signature: (JLjava/lang/String;J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ldelete
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Ldelete(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ldelete_by_idx
  * Signature: (JLjava/lang/String;IIJJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ldelete_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Ldelete_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                              jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lexists
  * Signature: (JLjava/lang/String;J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Lexists
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Lexists(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lget_info
  * Signature: (JLjava/lang/String;J)Lhdf/hdf5lib/structs/H5L_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1info
-(JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Lget_1info(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lget_info_by_idx
  * Signature: (JLjava/lang/String;IIJJ)Lhdf/hdf5lib/structs/H5L_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lget_name_by_idx
  * Signature: (JLjava/lang/String;IIJJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Lget_1name_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lget_value
  * Signature: (JLjava/lang/String;[Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1value
-  (JNIEnv*, jclass, jlong, jstring, jobjectArray, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *, jclass, jlong, jstring, jobjectArray,
+                                                         jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lget_value_by_idx
  * Signature: (JLjava/lang/String;IIJ[Ljava/lang/String;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jobjectArray, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                  jint, jlong, jobjectArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lmove
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lmove
-  (JNIEnv*, jclass, jlong, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lmove(JNIEnv *, jclass, jlong, jstring, jlong, jstring, jlong,
+                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lvisit
  * Signature: (JIILjava/lang/Object;Ljava/lang/Object;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lvisit
-  (JNIEnv*, jclass, jlong, jint, jint, jobject, jobject);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Lvisit(JNIEnv *, jclass, jlong, jint, jint, jobject, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lvisit_by_name
  * Signature: (JLjava/lang/String;IILjava/lang/Object;Ljava/lang/Object;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lvisit_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jobject, jobject, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Lvisit_1by_1name(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                              jobject, jobject, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Literate
  * Signature: (JIIJLjava/lang/Object;Ljava/lang/Object;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Literate
-  (JNIEnv*, jclass, jlong, jint, jint, jlong, jobject, jobject);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Literate(JNIEnv *, jclass, jlong, jint, jint, jlong, jobject,
+                                                      jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Literate_by_name
  * Signature: (JLjava/lang/String;IIJLjava/lang/Object;Ljava/lang/Object;J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Literate_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jobject, jobject, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Literate_1by_1name(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                                jlong, jobject, jobject, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lis_registered
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Lis_1registered
-  (JNIEnv*, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Lis_1registered(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Lunregister
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Lunregister
-  (JNIEnv*, jclass, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Lunregister(JNIEnv *, jclass, jint);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5oImp.c b/java/src/jni/h5oImp.c
index 33bec85..1582f04 100644
--- a/java/src/jni/h5oImp.c
+++ b/java/src/jni/h5oImp.c
@@ -46,22 +46,23 @@ static herr_t H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *in
  * Create a java object of hdf.hdf5lib.structs.H5O_token_t.
  */
 jobject
-create_H5O_token_t
-    (JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical_pinning)
+create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical_pinning)
 {
-    jbyteArray  tokenByteBuf;
-    jboolean    token_buf_is_copy;
-    jvalue      constructor_args[1];
-    jbyte      *token_buf = NULL;
-    jobject     ret_token_obj = NULL;
+    jbyteArray tokenByteBuf;
+    jboolean   token_buf_is_copy;
+    jvalue     constructor_args[1];
+    jbyte *    token_buf     = NULL;
+    jobject    ret_token_obj = NULL;
 
     if (NULL == (tokenByteBuf = (*envptr)->NewByteArray(envptr, H5O_MAX_TOKEN_SIZE)))
         CHECK_JNI_EXCEPTION(envptr, JNI_FALSE);
 
     if (is_critical_pinning)
-        PIN_BYTE_ARRAY_CRITICAL(envptr, tokenByteBuf, token_buf, &token_buf_is_copy, "create_H5O_token_t: object token buffer not pinned");
+        PIN_BYTE_ARRAY_CRITICAL(envptr, tokenByteBuf, token_buf, &token_buf_is_copy,
+                                "create_H5O_token_t: object token buffer not pinned");
     else
-        PIN_BYTE_ARRAY(envptr, tokenByteBuf, token_buf, &token_buf_is_copy, "create_H5O_token_t: object token buffer not pinned");
+        PIN_BYTE_ARRAY(envptr, tokenByteBuf, token_buf, &token_buf_is_copy,
+                       "create_H5O_token_t: object token buffer not pinned");
 
     HDmemcpy(token_buf, token, sizeof(H5O_token_t));
 
@@ -99,11 +100,10 @@ done:
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist_id)
+Java_hdf_hdf5lib_H5__1H5Oopen(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist_id)
 {
     const char *objName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -128,8 +128,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Oclose
-    (JNIEnv *env, jclass clss, jlong object_id)
+Java_hdf_hdf5lib_H5__1H5Oclose(JNIEnv *env, jclass clss, jlong object_id)
 {
     herr_t retVal = FAIL;
 
@@ -148,13 +147,12 @@ done:
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ocopy
-    (JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name,
-        jlong dst_loc_id, jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Ocopy(JNIEnv *env, jclass clss, jlong cur_loc_id, jstring cur_name, jlong dst_loc_id,
+                            jstring dst_name, jlong create_id, jlong access_id)
 {
     const char *lCurName = NULL;
     const char *lDstName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -166,7 +164,8 @@ Java_hdf_hdf5lib_H5_H5Ocopy
     PIN_JAVA_STRING(ENVONLY, cur_name, lCurName, NULL, "H5Ocopy: src name not pinned");
     PIN_JAVA_STRING(ENVONLY, dst_name, lDstName, NULL, "H5Ocopy: dest name not pinned");
 
-    if ((status = H5Ocopy((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Ocopy((hid_t)cur_loc_id, lCurName, (hid_t)dst_loc_id, lDstName, (hid_t)create_id,
+                          (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -182,13 +181,12 @@ done:
  * Signature: (JI)Lhdf/hdf5lib/structs/H5O_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info
-    (JNIEnv *env, jclass clss, jlong loc_id, jint fields)
+Java_hdf_hdf5lib_H5_H5Oget_1info(JNIEnv *env, jclass clss, jlong loc_id, jint fields)
 {
     H5O_info2_t infobuf;
     jobject     token;
     jvalue      args[9];
-    herr_t      status = FAIL;
+    herr_t      status  = FAIL;
     jobject     ret_obj = NULL;
 
     UNUSED(clss);
@@ -209,7 +207,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1info
     args[7].j = infobuf.btime;
     args[8].j = (jlong)infobuf.num_attrs;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t", "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t",
+                     "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
 
 done:
     return ret_obj;
@@ -221,15 +220,15 @@ done:
  * Signature: (JLjava/lang/String;IJ)Lhdf/hdf5lib/structs/H5O_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint fields, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint fields,
+                                           jlong access_id)
 {
-    H5O_info2_t  infobuf;
-    const char  *objName = NULL;
-    jobject      token;
-    jvalue       args[9];
-    herr_t       status = FAIL;
-    jobject      ret_obj = NULL;
+    H5O_info2_t infobuf;
+    const char *objName = NULL;
+    jobject     token;
+    jvalue      args[9];
+    herr_t      status  = FAIL;
+    jobject     ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -238,7 +237,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name
 
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Oget_info_by_name: object name not pinned");
 
-    if ((status = H5Oget_info_by_name3((hid_t)loc_id, objName, &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
+    if ((status =
+             H5Oget_info_by_name3((hid_t)loc_id, objName, &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Create an H5O_token_t object */
@@ -255,7 +255,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name
     args[7].j = infobuf.btime;
     args[8].j = (jlong)infobuf.num_attrs;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t", "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t",
+                     "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
 
 done:
     if (objName)
@@ -270,16 +271,16 @@ done:
  * Signature: (JLjava/lang/String;IIJIJ)Lhdf/hdf5lib/structs/H5O_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id,
-        jstring name, jint index_field, jint order, jlong link_n, jint fields, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                          jint index_field, jint order, jlong link_n, jint fields,
+                                          jlong access_id)
 {
-    H5O_info2_t  infobuf;
-    const char  *grpName = NULL;
-    jobject      token;
-    jvalue       args[9];
-    herr_t       status = FAIL;
-    jobject      ret_obj = NULL;
+    H5O_info2_t infobuf;
+    const char *grpName = NULL;
+    jobject     token;
+    jvalue      args[9];
+    herr_t      status  = FAIL;
+    jobject     ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -288,8 +289,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Oget_info_by_idx: group name not pinned");
 
-    if ((status = H5Oget_info_by_idx3((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n,
-            &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
+    if ((status = H5Oget_info_by_idx3((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                      (hsize_t)link_n, &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Create an H5O_token_t object */
@@ -306,7 +307,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx
     args[7].j = infobuf.btime;
     args[8].j = (jlong)infobuf.num_attrs;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t", "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_info_t",
+                     "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, ret_obj);
 
 done:
     if (grpName)
@@ -321,15 +323,14 @@ done:
  * Signature: (JI)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info
-    (JNIEnv *env, jclass clss, jlong loc_id, jint fields)
+Java_hdf_hdf5lib_H5_H5Oget_1native_1info(JNIEnv *env, jclass clss, jlong loc_id, jint fields)
 {
     H5O_native_info_t infobuf;
     jobject           hdrinfobuf;
     jobject           obj_ihinfobuf;
     jobject           attr_ihinfobuf;
     jvalue            args[10];
-    herr_t            status = FAIL;
+    herr_t            status  = FAIL;
     jobject           ret_obj = NULL;
 
     UNUSED(clss);
@@ -367,7 +368,10 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info
     args[1].l = obj_ihinfobuf;
     args[2].l = attr_ihinfobuf;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t", "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t",
+                     "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/"
+                     "structs/H5_ih_info_t;)V",
+                     args, ret_obj);
 
 done:
     return ret_obj;
@@ -379,17 +383,17 @@ done:
  * Signature: (JLjava/lang/String;IJ)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint fields, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                                   jint fields, jlong access_id)
 {
-    H5O_native_info_t  infobuf;
-    const char        *objName = NULL;
-    jobject            hdrinfobuf;
-    jobject            obj_ihinfobuf;
-    jobject            attr_ihinfobuf;
-    jvalue             args[10];
-    herr_t             status = FAIL;
-    jobject            ret_obj = NULL;
+    H5O_native_info_t infobuf;
+    const char *      objName = NULL;
+    jobject           hdrinfobuf;
+    jobject           obj_ihinfobuf;
+    jobject           attr_ihinfobuf;
+    jvalue            args[10];
+    herr_t            status  = FAIL;
+    jobject           ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -398,7 +402,8 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name
 
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Oget_native_info_by_name: object name not pinned");
 
-    if ((status = H5Oget_native_info_by_name((hid_t)loc_id, objName, &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
+    if ((status = H5Oget_native_info_by_name((hid_t)loc_id, objName, &infobuf, (unsigned)fields,
+                                             (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     args[0].i = (jint)infobuf.hdr.version;
@@ -431,7 +436,10 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name
     args[1].l = obj_ihinfobuf;
     args[2].l = attr_ihinfobuf;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t", "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t",
+                     "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/"
+                     "structs/H5_ih_info_t;)V",
+                     args, ret_obj);
 
 done:
     if (objName)
@@ -446,18 +454,18 @@ done:
  * Signature: (JLjava/lang/String;IIJIJ)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id,
-        jstring name, jint index_field, jint order, jlong link_n, jint fields, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                                  jint index_field, jint order, jlong link_n, jint fields,
+                                                  jlong access_id)
 {
-    H5O_native_info_t  infobuf;
-    const char        *grpName = NULL;
-    jobject            hdrinfobuf;
-    jobject            obj_ihinfobuf;
-    jobject            attr_ihinfobuf;
-    jvalue             args[10];
-    herr_t             status = FAIL;
-    jobject            ret_obj = NULL;
+    H5O_native_info_t infobuf;
+    const char *      grpName = NULL;
+    jobject           hdrinfobuf;
+    jobject           obj_ihinfobuf;
+    jobject           attr_ihinfobuf;
+    jvalue            args[10];
+    herr_t            status  = FAIL;
+    jobject           ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -466,8 +474,9 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Oget_native_info_by_idx: group name not pinned");
 
-    if ((status = H5Oget_native_info_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n,
-            &infobuf, (unsigned)fields, (hid_t)access_id)) < 0)
+    if ((status = H5Oget_native_info_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field,
+                                            (H5_iter_order_t)order, (hsize_t)link_n, &infobuf,
+                                            (unsigned)fields, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     args[0].i = (jint)infobuf.hdr.version;
@@ -500,7 +509,10 @@ Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx
     args[1].l = obj_ihinfobuf;
     args[2].l = attr_ihinfobuf;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t", "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5O_native_info_t",
+                     "(Lhdf/hdf5lib/structs/H5O_hdr_info_t;Lhdf/hdf5lib/structs/H5_ih_info_t;Lhdf/hdf5lib/"
+                     "structs/H5_ih_info_t;)V",
+                     args, ret_obj);
 
 done:
     if (grpName)
@@ -515,12 +527,11 @@ done:
  * Signature: (JJLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Olink
-    (JNIEnv *env, jclass clss, jlong cur_loc_id, jlong dst_loc_id,
-        jstring dst_name, jlong create_id, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Olink(JNIEnv *env, jclass clss, jlong cur_loc_id, jlong dst_loc_id, jstring dst_name,
+                            jlong create_id, jlong access_id)
 {
     const char *linkDstName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status      = FAIL;
 
     UNUSED(clss);
 
@@ -529,7 +540,8 @@ Java_hdf_hdf5lib_H5_H5Olink
 
     PIN_JAVA_STRING(ENVONLY, dst_name, linkDstName, NULL, "H5Olink: link destination name not pinned");
 
-    if ((status = H5Olink((hid_t)cur_loc_id, (hid_t)dst_loc_id, linkDstName, (hid_t)create_id, (hid_t)access_id)) < 0)
+    if ((status = H5Olink((hid_t)cur_loc_id, (hid_t)dst_loc_id, linkDstName, (hid_t)create_id,
+                          (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -538,20 +550,19 @@ done:
 } /* end Java_hdf_hdf5lib_H5_H5Olink */
 
 static herr_t
-H5O_iterate_cb
-    (hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_data)
+H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_data)
 {
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jmethodID   mid;
-    jobject     cb_info_t = NULL;
+    jobject     cb_info_t      = NULL;
     jobject     visit_callback = wrapper->visit_callback;
     jobject     token;
     jstring     str;
-    JNIEnv     *cbenv = NULL;
+    JNIEnv *    cbenv = NULL;
     jclass      cbcls;
     jvalue      args[12];
-    void       *op_data = (void *)wrapper->op_data;
-    jint        status = FAIL;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = FAIL;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -561,7 +572,9 @@ H5O_iterate_cb
     if (NULL == (cbcls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback", "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5O_info_t;Lhdf/hdf5lib/callbacks/H5O_iterate_opdata_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cbcls, "callback",
+                                             "(JLjava/lang/String;Lhdf/hdf5lib/structs/H5O_info_t;Lhdf/"
+                                             "hdf5lib/callbacks/H5O_iterate_opdata_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL == (str = CBENVPTR->NewStringUTF(CBENVONLY, name)))
@@ -582,7 +595,8 @@ H5O_iterate_cb
     args[8].j = (jlong)info->num_attrs;
 
     /* Get a reference to the H5O_info_t class */
-    CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5O_info_t", "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, cb_info_t);
+    CALL_CONSTRUCTOR(CBENVONLY, "hdf/hdf5lib/structs/H5O_info_t",
+                     "(JLhdf/hdf5lib/structs/H5O_token_t;IIJJJJJ)V", args, cb_info_t);
 
     status = CBENVPTR->CallIntMethod(CBENVONLY, visit_callback, mid, g_id, str, cb_info_t, op_data);
     CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
@@ -600,12 +614,11 @@ done:
  * Signature: (JIILjava/lang/Object;Ljava/lang/Object;I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Ovisit
-    (JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
-        jobject callback_op, jobject op_data, jint fields)
+Java_hdf_hdf5lib_H5_H5Ovisit(JNIEnv *env, jclass clss, jlong grp_id, jint idx_type, jint order,
+                             jobject callback_op, jobject op_data, jint fields)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
-    herr_t     status = FAIL;
+    cb_wrapper wrapper = {callback_op, op_data};
+    herr_t     status  = FAIL;
 
     UNUSED(clss);
 
@@ -617,8 +630,8 @@ Java_hdf_hdf5lib_H5_H5Ovisit
     if (NULL == callback_op)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Ovisit: callback_op is NULL");
 
-    if ((status = H5Ovisit3((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            H5O_iterate_cb, (void *)&wrapper, (unsigned)fields)) < 0)
+    if ((status = H5Ovisit3((hid_t)grp_id, (H5_index_t)idx_type, (H5_iter_order_t)order, H5O_iterate_cb,
+                            (void *)&wrapper, (unsigned)fields)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -631,13 +644,13 @@ done:
  * Signature: (JLjava/lang/String;IILjava/lang/Object;Ljava/lang/Object;IJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name
-    (JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type, jint order,
-        jobject callback_op, jobject op_data, jint fields, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name(JNIEnv *env, jclass clss, jlong grp_id, jstring name, jint idx_type,
+                                       jint order, jobject callback_op, jobject op_data, jint fields,
+                                       jlong access_id)
 {
-    cb_wrapper  wrapper = { callback_op, op_data };
+    cb_wrapper  wrapper = {callback_op, op_data};
     const char *objName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status  = FAIL;
 
     UNUSED(clss);
 
@@ -654,7 +667,8 @@ Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Ovisit_by_name: object name not pinned");
 
     if ((status = H5Ovisit_by_name3((hid_t)grp_id, objName, (H5_index_t)idx_type, (H5_iter_order_t)order,
-            H5O_iterate_cb, (void *)&wrapper, (unsigned)fields, (hid_t)access_id)) < 0)
+                                    H5O_iterate_cb, (void *)&wrapper, (unsigned)fields, (hid_t)access_id)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -670,11 +684,10 @@ done:
  * Signature: (JLjava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oset_1comment
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring comment)
+Java_hdf_hdf5lib_H5_H5Oset_1comment(JNIEnv *env, jclass clss, jlong loc_id, jstring comment)
 {
     const char *oComment = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -695,11 +708,10 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oset_1comment_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id,
-        jstring name, jstring comment, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oset_1comment_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                              jstring comment, jlong access_id)
 {
-    const char *objName = NULL;
+    const char *objName    = NULL;
     const char *objComment = NULL;
     jboolean    isCopy;
     herr_t      status = FAIL;
@@ -712,7 +724,8 @@ Java_hdf_hdf5lib_H5_H5Oset_1comment_1by_1name
     PIN_JAVA_STRING(ENVONLY, name, objName, NULL, "H5Oset_comment_by_name: object name not pinned");
 
     if (NULL != comment)
-        PIN_JAVA_STRING(ENVONLY, comment, objComment, &isCopy, "H5Oset_comment_by_name: object comment not pinned");
+        PIN_JAVA_STRING(ENVONLY, comment, objComment, &isCopy,
+                        "H5Oset_comment_by_name: object comment not pinned");
 
     if ((status = H5Oset_comment_by_name((hid_t)loc_id, objName, objComment, (hid_t)access_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -730,13 +743,12 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1comment
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *env, jclass clss, jlong loc_id)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size;
-    ssize_t  status = -1;
-    char    *oComment = NULL;
+    jstring str = NULL;
+    ssize_t buf_size;
+    ssize_t status   = -1;
+    char *  oComment = NULL;
 
     UNUSED(clss);
 
@@ -745,7 +757,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (buf_size) {
-        if (NULL == (oComment = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+        if (NULL == (oComment = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Oget_comment: failed to allocate object comment buffer");
 
         if ((status = H5Oget_comment((hid_t)loc_id, oComment, (size_t)buf_size + 1)) < 0)
@@ -769,14 +781,14 @@ done:
  * Signature: (JLjava/lang/String;J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
+                                              jlong access_id)
 {
     const char *objName = NULL;
-    jstring     str = NULL;
+    jstring     str     = NULL;
     ssize_t     buf_size;
     ssize_t     status;
-    char       *objComment = NULL;
+    char *      objComment = NULL;
 
     UNUSED(clss);
 
@@ -790,10 +802,12 @@ Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (buf_size) {
-        if (NULL == (objComment = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Oget_comment_by_name: failed to allocate buffer for object comment");
+        if (NULL == (objComment = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "H5Oget_comment_by_name: failed to allocate buffer for object comment");
 
-        if ((status = H5Oget_comment_by_name((hid_t)loc_id, objName, objComment, (size_t)buf_size + 1, (hid_t)access_id)) < 0)
+        if ((status = H5Oget_comment_by_name((hid_t)loc_id, objName, objComment, (size_t)buf_size + 1,
+                                             (hid_t)access_id)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
         objComment[buf_size] = '\0';
 
@@ -816,11 +830,10 @@ done:
  * Signature: (JLjava/lang/String;J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Oexists_1by_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
+Java_hdf_hdf5lib_H5_H5Oexists_1by_1name(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
 {
     const char *objName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval    = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -847,8 +860,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Odecr_1refcount
-    (JNIEnv *env, jclass clss, jlong object_id)
+Java_hdf_hdf5lib_H5_H5Odecr_1refcount(JNIEnv *env, jclass clss, jlong object_id)
 {
     UNUSED(clss);
 
@@ -865,8 +877,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oincr_1refcount
-    (JNIEnv *env, jclass clss, jlong object_id)
+Java_hdf_hdf5lib_H5_H5Oincr_1refcount(JNIEnv *env, jclass clss, jlong object_id)
 {
     UNUSED(clss);
 
@@ -883,16 +894,15 @@ done:
  * Signature: (JLhdf/hdf5lib/structs/H5O_token_t;)J;
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token
-    (JNIEnv *env, jclass clss, jlong loc_id, jobject token)
+Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *env, jclass clss, jlong loc_id, jobject token)
 {
-    H5O_token_t  obj_token;
-    jboolean     token_buf_is_copy;
-    jfieldID     token_data_field_id;
-    jclass       token_cls;
-    jbyte       *token_buf = NULL;
-    jobject      token_data;
-    hid_t        retVal = H5I_INVALID_HID;
+    H5O_token_t obj_token;
+    jboolean    token_buf_is_copy;
+    jfieldID    token_data_field_id;
+    jclass      token_cls;
+    jbyte *     token_buf = NULL;
+    jobject     token_data;
+    hid_t       retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -905,7 +915,8 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token
     token_data = ENVPTR->GetObjectField(ENVONLY, token, token_data_field_id);
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-    PIN_BYTE_ARRAY(ENVONLY, (jbyteArray)token_data, token_buf, &token_buf_is_copy, "H5Oopen_by_token: token buffer not pinned");
+    PIN_BYTE_ARRAY(ENVONLY, (jbyteArray)token_data, token_buf, &token_buf_is_copy,
+                   "H5Oopen_by_token: token buffer not pinned");
     HDmemcpy(&obj_token, token_buf, sizeof(H5O_token_t));
     UNPIN_BYTE_ARRAY(ENVONLY, (jbyteArray)token_data, token_buf, JNI_ABORT);
     token_buf = NULL;
@@ -926,12 +937,11 @@ done:
  * Signature: (JLjava/lang/String;IIJJ)J;
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen_1by_1idx
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name,
-        jint index_field, jint order, jlong link_n, jlong lapl_id)
+Java_hdf_hdf5lib_H5__1H5Oopen_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_field,
+                                       jint order, jlong link_n, jlong lapl_id)
 {
     const char *grpName = NULL;
-    hid_t       retVal = H5I_INVALID_HID;
+    hid_t       retVal  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -940,7 +950,8 @@ Java_hdf_hdf5lib_H5__1H5Oopen_1by_1idx
 
     PIN_JAVA_STRING(ENVONLY, name, grpName, NULL, "H5Oopen_by_idx: object name not pinned");
 
-    if ((retVal = H5Oopen_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order, (hsize_t)link_n, (hid_t)lapl_id)) < 0)
+    if ((retVal = H5Oopen_by_idx((hid_t)loc_id, grpName, (H5_index_t)index_field, (H5_iter_order_t)order,
+                                 (hsize_t)link_n, (hid_t)lapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -956,8 +967,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oflush
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Oflush(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -974,8 +984,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Orefresh
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Orefresh(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -992,8 +1001,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Odisable_1mdc_1flushes
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Odisable_1mdc_1flushes(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -1010,8 +1018,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oenable_1mdc_1flushes
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Oenable_1mdc_1flushes(JNIEnv *env, jclass clss, jlong loc_id)
 {
     UNUSED(clss);
 
@@ -1028,11 +1035,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled
-    (JNIEnv *env, jclass clss, jlong loc_id)
+Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled(JNIEnv *env, jclass clss, jlong loc_id)
 {
-    jboolean bval = JNI_FALSE;
-    hbool_t    is_disabled = FALSE;
+    jboolean bval        = JNI_FALSE;
+    hbool_t  is_disabled = FALSE;
 
     UNUSED(clss);
 
@@ -1040,14 +1046,12 @@ Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (is_disabled == TRUE)
-        bval =  JNI_TRUE;
+        bval = JNI_TRUE;
 
 done:
     return bval;
 } /* end Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled */
 
-
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5oImp.h b/java/src/jni/h5oImp.h
index 2b53fd3..965df19 100644
--- a/java/src/jni/h5oImp.h
+++ b/java/src/jni/h5oImp.h
@@ -21,240 +21,198 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Oopen
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Oopen(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Oclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Oclose
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Oclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ocopy
  * Signature: (JLjava/lang/String;JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Ocopy
-  (JNIEnv*, jclass, jlong, jstring, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Ocopy(JNIEnv *, jclass, jlong, jstring, jlong, jstring, jlong,
+                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_info
  * Signature: (JI)Lhdf/hdf5lib/structs/H5O_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info
-(JNIEnv*, jclass, jlong, jint fields);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1info(JNIEnv *, jclass, jlong, jint fields);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_info_by_name
  * Signature: (JLjava/lang/String;IJ)Lhdf/hdf5lib/structs/H5O_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name
-(JNIEnv*, jclass, jlong, jstring, jint fields, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name(JNIEnv *, jclass, jlong, jstring,
+                                                                     jint fields, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_info_by_idx
  * Signature: (JLjava/lang/String;IIJIJ)Lhdf/hdf5lib/structs/H5O_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jint fields, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint,
+                                                                    jint, jlong, jint fields, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_native_info
  * Signature: (JI)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info
-(JNIEnv*, jclass, jlong, jint fields);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1native_1info(JNIEnv *, jclass, jlong, jint fields);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_native_info_by_name
  * Signature: (JLjava/lang/String;IJ)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name
-(JNIEnv*, jclass, jlong, jstring, jint fields, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1name(JNIEnv *, jclass, jlong, jstring,
+                                                                             jint fields, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_native_info_by_idx
  * Signature: (JLjava/lang/String;IIJIJ)Lhdf/hdf5lib/structs/H5O_native_info_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx
-(JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jint fields, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Oget_1native_1info_1by_1idx(JNIEnv *, jclass, jlong, jstring,
+                                                                            jint, jint, jlong, jint fields,
+                                                                            jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Olink
  * Signature: (JJLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Olink
-  (JNIEnv*, jclass, jlong, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Olink(JNIEnv *, jclass, jlong, jlong, jstring, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ovisit
  * Signature: (JIILjava/lang/Object;Ljava/lang/Object;I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Ovisit
-  (JNIEnv*, jclass, jlong, jint, jint, jobject, jobject, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Ovisit(JNIEnv *, jclass, jlong, jint, jint, jobject, jobject,
+                                                    jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ovisit_by_name
  * Signature: (JLjava/lang/String;IILjava/lang/Object;Ljava/lang/Object;IJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jobject, jobject, jint, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Ovisit_1by_1name(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                              jobject, jobject, jint, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oset_comment
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oset_1comment
-  (JNIEnv*, jclass, jlong, jstring);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Oset_1comment(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oset_comment_by_name
  * Signature: (JLjava/lang/String;Ljava/lang/String;J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oset_1comment_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jstring, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Oset_1comment_1by_1name(JNIEnv *, jclass, jlong, jstring,
+                                                                     jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_comment
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1comment
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Oget_1comment(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oget_comment_by_name
  * Signature: (JLjava/lang/String;J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Oget_1comment_1by_1name(JNIEnv *, jclass, jlong, jstring,
+                                                                        jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oexists_by_name
  * Signature: (JLjava/lang/String;J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Oexists_1by_1name
-  (JNIEnv*, jclass, jlong, jstring, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Oexists_1by_1name(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Odecr_refcount
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Odecr_1refcount
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Odecr_1refcount(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oincr_refcount
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oincr_1refcount
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Oincr_1refcount(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Oopen_by_token
  * Signature: (JLhdf/hdf5lib/structs/H5O_token_t;)J;
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token
-  (JNIEnv*, jclass, jlong, jobject);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Oopen_1by_1token(JNIEnv *, jclass, jlong, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Oopen_by_idx
  * Signature: (JLjava/lang/String;IIJJ)J;
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Oopen_1by_1idx
-  (JNIEnv*, jclass, jlong, jstring, jint, jint, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Oopen_1by_1idx(JNIEnv *, jclass, jlong, jstring, jint, jint,
+                                                               jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oflush
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oflush
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Oflush(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Orefresh
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Orefresh
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Orefresh(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Odisable_mdc_flushes
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Odisable_1mdc_1flushes
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Odisable_1mdc_1flushes(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oenable_mdc_flushes
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Oenable_1mdc_1flushes
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Oenable_1mdc_1flushes(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Oare_mdc_flushes_disabled
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pDAPLImp.c b/java/src/jni/h5pDAPLImp.c
index 2386df1..4654aa3 100644
--- a/java/src/jni/h5pDAPLImp.c
+++ b/java/src/jni/h5pDAPLImp.c
@@ -44,13 +44,12 @@ static herr_t H5D_append_cb(hid_t dataset_id, hsize_t *cur_dims, void *cb_data);
  * Signature: (JJJD)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk_1cache
-    (JNIEnv *env, jclass clss, jlong dapl, jlong rdcc_nslots,
-        jlong rdcc_nbytes, jdouble rdcc_w0)
+Java_hdf_hdf5lib_H5_H5Pset_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, jlong rdcc_nslots,
+                                         jlong rdcc_nbytes, jdouble rdcc_w0)
 {
     UNUSED(clss);
 
-    if (H5Pset_chunk_cache((hid_t)dapl, (size_t)rdcc_nslots, (size_t)rdcc_nbytes, (double) rdcc_w0) < 0)
+    if (H5Pset_chunk_cache((hid_t)dapl, (size_t)rdcc_nslots, (size_t)rdcc_nbytes, (double)rdcc_w0) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -63,37 +62,38 @@ done:
  * Signature: (J[J[J[D)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache
-    (JNIEnv *env, jclass clss, jlong dapl, jlongArray rdcc_nslots,
-        jlongArray rdcc_nbytes, jdoubleArray rdcc_w0)
+Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, jlongArray rdcc_nslots,
+                                         jlongArray rdcc_nbytes, jdoubleArray rdcc_w0)
 {
-    jboolean  isCopy;
-    jdouble  *w0Array = NULL;
-    jlong    *rdcc_nslotsArray = NULL;
-    jlong    *nbytesArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jdouble *w0Array          = NULL;
+    jlong *  rdcc_nslotsArray = NULL;
+    jlong *  nbytesArray      = NULL;
+    herr_t   status           = FAIL;
 
     UNUSED(clss);
 
     if (NULL != rdcc_w0)
         PIN_DOUBLE_ARRAY(ENVONLY, rdcc_w0, w0Array, &isCopy, "H5Pget_chunk_cache: rdcc_w0 array not pinned");
     if (NULL != rdcc_nslots)
-        PIN_LONG_ARRAY(ENVONLY, rdcc_nslots, rdcc_nslotsArray, &isCopy, "H5Pget_chunk_cache: rdcc_nslots array not pinned");
+        PIN_LONG_ARRAY(ENVONLY, rdcc_nslots, rdcc_nslotsArray, &isCopy,
+                       "H5Pget_chunk_cache: rdcc_nslots array not pinned");
     if (NULL != rdcc_nbytes)
-        PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy, "H5Pget_chunk_cache: nbytesArray array not pinned");
+        PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy,
+                       "H5Pget_chunk_cache: nbytesArray array not pinned");
 
     {
         /* direct cast (size_t *)variable fails on 32-bit environment */
         long long rdcc_nslots_temp = *rdcc_nslotsArray;
-        long long nbytes_temp = *nbytesArray;
-        size_t    rdcc_nslots_t = (size_t) rdcc_nslots_temp;
-        size_t    nbytes_t = (size_t) nbytes_temp;
+        long long nbytes_temp      = *nbytesArray;
+        size_t    rdcc_nslots_t    = (size_t)rdcc_nslots_temp;
+        size_t    nbytes_t         = (size_t)nbytes_temp;
 
         if ((status = H5Pget_chunk_cache((hid_t)dapl, &rdcc_nslots_t, &nbytes_t, (double *)w0Array)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         *rdcc_nslotsArray = (jlong)rdcc_nslots_t;
-        *nbytesArray = (jlong)nbytes_t;
+        *nbytesArray      = (jlong)nbytes_t;
     } /* end direct cast special handling */
 
 done:
@@ -111,18 +111,18 @@ done:
  * Signature: (JLjava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix
-    (JNIEnv *env, jclass clss, jlong dapl_id, jstring prefix)
+Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix(JNIEnv *env, jclass clss, jlong dapl_id, jstring prefix)
 {
     const char *extFilePrefix = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal        = FAIL;
 
     UNUSED(clss);
 
     if (NULL == prefix)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pset_efile_prefix: external file prefix is NULL");
 
-    PIN_JAVA_STRING(ENVONLY, prefix, extFilePrefix, NULL, "H5Pset_efile_prefix: external file prefix not pinned");
+    PIN_JAVA_STRING(ENVONLY, prefix, extFilePrefix, NULL,
+                    "H5Pset_efile_prefix: external file prefix not pinned");
 
     if ((retVal = H5Pset_efile_prefix((hid_t)dapl_id, extFilePrefix)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -138,19 +138,18 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix
-    (JNIEnv *env, jclass clss, jlong dapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix(JNIEnv *env, jclass clss, jlong dapl_id)
 {
-    ssize_t  prefix_size = -1;
-    char    *pre = NULL;
-    jstring  str = NULL;
+    ssize_t prefix_size = -1;
+    char *  pre         = NULL;
+    jstring str         = NULL;
 
     UNUSED(clss);
 
     if ((prefix_size = H5Pget_efile_prefix((hid_t)dapl_id, (char *)NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (pre = (char *) HDmalloc(sizeof(char) * (size_t)prefix_size + 1)))
+    if (NULL == (pre = (char *)HDmalloc(sizeof(char) * (size_t)prefix_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_efile_prefix: memory allocation failed");
 
     if (H5Pget_efile_prefix((hid_t)dapl_id, (char *)pre, (size_t)prefix_size + 1) < 0)
@@ -159,7 +158,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, pre))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_efile_prefix: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_efile_prefix: out of memory - unable to construct string from UTF characters");
     }
 
 done:
@@ -175,11 +175,11 @@ done:
  * Signature: (JI[JLjava/lang/Object;Ljava/lang/Object;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1append_1flush
-    (JNIEnv *env, jclass clss, jlong plist_id, jint ndims, jlongArray boundary, jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Pset_1append_1flush(JNIEnv *env, jclass clss, jlong plist_id, jint ndims,
+                                          jlongArray boundary, jobject callback_op, jobject op_data)
 {
-    cb_wrapper wrapper = { callback_op, op_data };
-    herr_t     status = FAIL;
+    cb_wrapper wrapper = {callback_op, op_data};
+    herr_t     status  = FAIL;
 
     UNUSED(clss);
 
@@ -191,7 +191,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1append_1flush
     if (NULL == callback_op)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pset_append_flush: callback_op is NULL");
 
-    if ((status = H5Pset_append_flush((hid_t)plist_id, (unsigned)ndims, (const hsize_t *)boundary, (H5D_append_cb_t)H5D_append_cb, (void *)&wrapper)) < 0)
+    if ((status = H5Pset_append_flush((hid_t)plist_id, (unsigned)ndims, (const hsize_t *)boundary,
+                                      (H5D_append_cb_t)H5D_append_cb, (void *)&wrapper)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -208,8 +209,7 @@ done:
  * Signature: (JI)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1view
-    (JNIEnv *env, jclass clss, jlong dapl_id, jint view)
+Java_hdf_hdf5lib_H5_H5Pset_1virtual_1view(JNIEnv *env, jclass clss, jlong dapl_id, jint view)
 {
     UNUSED(clss);
 
@@ -226,8 +226,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1view
-    (JNIEnv *env, jclass clss, jlong dapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1view(JNIEnv *env, jclass clss, jlong dapl_id)
 {
     H5D_vds_view_t virtual_view = H5D_VDS_ERROR;
 
@@ -246,8 +245,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1printf_1gap
-    (JNIEnv *env, jclass clss, jlong dapl_id, jlong gap_size)
+Java_hdf_hdf5lib_H5_H5Pset_1virtual_1printf_1gap(JNIEnv *env, jclass clss, jlong dapl_id, jlong gap_size)
 {
     UNUSED(clss);
 
@@ -264,8 +262,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1printf_1gap
-    (JNIEnv *env, jclass clss, jlong dapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1printf_1gap(JNIEnv *env, jclass clss, jlong dapl_id)
 {
     hsize_t gap_size = 0;
 
@@ -279,17 +276,16 @@ done:
 } /* end Java_hdf_hdf5lib_H5_H5Pget_1virtual_1printf_1gap */
 
 static herr_t
-H5D_append_cb
-    (hid_t dataset_id, hsize_t *cur_dims, void *cb_data)
+H5D_append_cb(hid_t dataset_id, hsize_t *cur_dims, void *cb_data)
 {
     cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jlongArray  cur_dimsArray;
     jmethodID   mid;
     jobject     visit_callback = wrapper->visit_callback;
     jclass      cls;
-    JNIEnv     *cbenv = NULL;
-    void       *op_data = (void *)wrapper->op_data;
-    jint        status = -1;
+    JNIEnv *    cbenv   = NULL;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -299,7 +295,8 @@ H5D_append_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "(J[JLhdf/hdf5lib/callbacks/H5D_append_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "(J[JLhdf/hdf5lib/callbacks/H5D_append_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL != cur_dims) {
diff --git a/java/src/jni/h5pDAPLImp.h b/java/src/jni/h5pDAPLImp.h
index a9fbadd..85238e1 100644
--- a/java/src/jni/h5pDAPLImp.h
+++ b/java/src/jni/h5pDAPLImp.h
@@ -25,45 +25,38 @@ extern "C" {
  * Method:    H5Pset_chunk_cache
  * Signature: (JJJD)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk_1cache
-(JNIEnv *, jclass, jlong, jlong, jlong, jdouble);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1chunk_1cache(JNIEnv *, jclass, jlong, jlong, jlong,
+                                                                jdouble);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_chunk_cache
  * Signature: (J[J[J[D)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache
-(JNIEnv *, jclass, jlong, jlongArray, jlongArray, jdoubleArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *, jclass, jlong, jlongArray,
+                                                                jlongArray, jdoubleArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_efile_prefix
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1efile_1prefix(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_efile_prefix
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1efile_1prefix(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_append_flush
  * Signature: (JI[JLjava/lang/Object;Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1append_1flush
-  (JNIEnv*, jclass, jlong, jint, jlongArray, jobject, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1append_1flush(JNIEnv *, jclass, jlong, jint, jlongArray,
+                                                                 jobject, jobject);
 
 /*
  * TODO: H5Pget_append_flush
@@ -74,36 +67,28 @@ Java_hdf_hdf5lib_H5_H5Pset_1append_1flush
  * Method:    H5Pset_virtual_view
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1view
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1virtual_1view(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_view
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1view
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1view(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_virtual_printf_gap
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1printf_1gap
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1virtual_1printf_1gap(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_printf_gap
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1printf_1gap
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1printf_1gap(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pDCPLImp.c b/java/src/jni/h5pDCPLImp.c
index f5bbcb1..df9c4eb 100644
--- a/java/src/jni/h5pDCPLImp.c
+++ b/java/src/jni/h5pDCPLImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1layout
-    (JNIEnv *env, jclass clss, jlong plist, jint layout)
+Java_hdf_hdf5lib_H5_H5Pset_1layout(JNIEnv *env, jclass clss, jlong plist, jint layout)
 {
     herr_t retVal = FAIL;
 
@@ -57,8 +56,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1layout
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1layout(JNIEnv *env, jclass clss, jlong plist)
 {
     H5D_layout_t retVal = H5D_LAYOUT_ERROR;
 
@@ -77,18 +75,17 @@ done:
  * Signature: (JI[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk
-    (JNIEnv *env, jclass clss, jlong plist, jint ndims, jbyteArray dim)
+Java_hdf_hdf5lib_H5_H5Pset_1chunk(JNIEnv *env, jclass clss, jlong plist, jint ndims, jbyteArray dim)
 {
-    jboolean  isCopy;
-    hsize_t  *da = NULL;
-    hsize_t  *lp = NULL;
-    size_t    i;
-    size_t    rank;
-    jsize     arrLen;
-    jbyte    *theArray = NULL;
-    jlong    *jlp = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *da = NULL;
+    hsize_t *lp = NULL;
+    size_t   i;
+    size_t   rank;
+    jsize    arrLen;
+    jbyte *  theArray = NULL;
+    jlong *  jlp      = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -102,13 +99,13 @@ Java_hdf_hdf5lib_H5_H5Pset_1chunk
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_chunk: dim array length < 0");
     }
 
-    rank = (size_t) arrLen / sizeof(jlong);
-    if (rank < (size_t) ndims)
+    rank = (size_t)arrLen / sizeof(jlong);
+    if (rank < (size_t)ndims)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_chunk: dims array rank < ndims");
 
     PIN_BYTE_ARRAY(ENVONLY, dim, theArray, &isCopy, "H5Pset_chunk: dim array not pinned");
 
-    if (NULL == (da = lp = (hsize_t *) HDmalloc(rank * sizeof(hsize_t))))
+    if (NULL == (da = lp = (hsize_t *)HDmalloc(rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pset_chunk: memory allocation failed");
 
     jlp = (jlong *)theArray;
@@ -136,15 +133,14 @@ done:
  * Signature: (JI[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk
-    (JNIEnv *env, jclass clss, jlong plist, jint max_ndims, jlongArray dims)
+Java_hdf_hdf5lib_H5_H5Pget_1chunk(JNIEnv *env, jclass clss, jlong plist, jint max_ndims, jlongArray dims)
 {
-    jboolean  isCopy;
-    hsize_t  *da = NULL;
-    jlong    *theArray = NULL;
-    jsize     arrLen;
-    int       i;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *da       = NULL;
+    jlong *  theArray = NULL;
+    jsize    arrLen;
+    int      i;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -160,7 +156,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk
 
     PIN_LONG_ARRAY(ENVONLY, dims, theArray, &isCopy, "H5Pget_chunk: input dims not pinned");
 
-    if (NULL == (da = (hsize_t *) HDmalloc((size_t)max_ndims * sizeof(hsize_t))))
+    if (NULL == (da = (hsize_t *)HDmalloc((size_t)max_ndims * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_chunk: memory allocation failed");
 
     if ((status = H5Pget_chunk((hid_t)plist, (int)max_ndims, da)) < 0)
@@ -184,8 +180,7 @@ done:
  * Signature: (JI)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jint opts)
+Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts(JNIEnv *env, jclass clss, jlong dcpl_id, jint opts)
 {
     herr_t retVal = FAIL;
 
@@ -204,8 +199,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
-    (JNIEnv *env, jclass clss, jlong dcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts(JNIEnv *env, jclass clss, jlong dcpl_id)
 {
     unsigned opts = 0;
 
@@ -224,8 +218,7 @@ done:
  * Signature: (JZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint
-(JNIEnv *env, jclass clss, jlong dcpl_id, jboolean minimize)
+Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong dcpl_id, jboolean minimize)
 {
     hbool_t minimize_val;
     herr_t  retVal = FAIL;
@@ -247,11 +240,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint
-(JNIEnv *env, jclass clss, jlong dcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong dcpl_id)
 {
     hbool_t  minimize = FALSE;
-    jboolean bval = JNI_FALSE;
+    jboolean bval     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -271,8 +263,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1deflate
-    (JNIEnv *env, jclass clss, jlong plist, jint level)
+Java_hdf_hdf5lib_H5_H5Pset_1deflate(JNIEnv *env, jclass clss, jlong plist, jint level)
 {
     herr_t retVal = FAIL;
 
@@ -291,12 +282,12 @@ done:
  * Signature: (JJ[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fill_1value
-    (JNIEnv *env, jclass clss, jlong plist_id, jlong type_id, jbyteArray value)
+Java_hdf_hdf5lib_H5_H5Pset_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id, jlong type_id,
+                                        jbyteArray value)
 {
-    jboolean  isCopy;
-    jbyte    *byteP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jbyte *  byteP  = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -324,12 +315,12 @@ done:
  * Signature: (JJ[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fill_1value
-    (JNIEnv *env, jclass clss, jlong plist_id, jlong type_id, jbyteArray value)
+Java_hdf_hdf5lib_H5_H5Pget_1fill_1value(JNIEnv *env, jclass clss, jlong plist_id, jlong type_id,
+                                        jbyteArray value)
 {
-    jboolean  isCopy;
-    herr_t    status = FAIL;
-    jbyte    *byteP = NULL;
+    jboolean isCopy;
+    herr_t   status = FAIL;
+    jbyte *  byteP  = NULL;
 
     UNUSED(clss);
 
@@ -354,13 +345,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined
-    (JNIEnv *env, jclass clss, jlong plist, jintArray status)
+Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined(JNIEnv *env, jclass clss, jlong plist, jintArray status)
 {
-    H5D_fill_value_t  value = H5D_FILL_VALUE_ERROR;
-    jboolean          isCopy;
-    jint             *theArray = NULL;
-    herr_t            retVal = FAIL;
+    H5D_fill_value_t value = H5D_FILL_VALUE_ERROR;
+    jboolean         isCopy;
+    jint *           theArray = NULL;
+    herr_t           retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -387,8 +377,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fill_1time
-    (JNIEnv *env, jclass clss, jlong plist, jint fill_time)
+Java_hdf_hdf5lib_H5_H5Pset_1fill_1time(JNIEnv *env, jclass clss, jlong plist, jint fill_time)
 {
     herr_t retVal = FAIL;
 
@@ -407,13 +396,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fill_1time
-    (JNIEnv *env, jclass clss, jlong plist, jintArray fill_time)
+Java_hdf_hdf5lib_H5_H5Pget_1fill_1time(JNIEnv *env, jclass clss, jlong plist, jintArray fill_time)
 {
-    H5D_fill_time_t  time = H5D_FILL_TIME_ERROR;
-    jboolean         isCopy;
-    jint            *theArray = NULL;
-    herr_t           retVal = FAIL;
+    H5D_fill_time_t time = H5D_FILL_TIME_ERROR;
+    jboolean        isCopy;
+    jint *          theArray = NULL;
+    herr_t          retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -440,8 +428,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1alloc_1time
-    (JNIEnv *env, jclass clss, jlong plist, jint alloc_time)
+Java_hdf_hdf5lib_H5_H5Pset_1alloc_1time(JNIEnv *env, jclass clss, jlong plist, jint alloc_time)
 {
     herr_t retVal = FAIL;
 
@@ -460,13 +447,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time
-    (JNIEnv *env, jclass clss, jlong plist, jintArray alloc_time)
+Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time(JNIEnv *env, jclass clss, jlong plist, jintArray alloc_time)
 {
-    H5D_alloc_time_t  time = H5D_ALLOC_TIME_ERROR;
-    jboolean          isCopy;
-    jint             *theArray = NULL;
-    herr_t            retVal = FAIL;
+    H5D_alloc_time_t time = H5D_ALLOC_TIME_ERROR;
+    jboolean         isCopy;
+    jint *           theArray = NULL;
+    herr_t           retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -475,7 +461,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time
 
     PIN_INT_ARRAY(ENVONLY, alloc_time, theArray, &isCopy, "H5Pget_alloc_time: alloc_time not pinned");
 
-    if ((retVal =  H5Pget_alloc_time((hid_t)plist, &time)) < 0)
+    if ((retVal = H5Pget_alloc_time((hid_t)plist, &time)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     theArray[0] = time;
@@ -493,26 +479,25 @@ done:
  * Signature: (JIIJ[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1filter
-    (JNIEnv *env, jclass clss, jlong plist, jint filter, jint flags,
-  jlong cd_nelmts, jintArray cd_values)
+Java_hdf_hdf5lib_H5_H5Pset_1filter(JNIEnv *env, jclass clss, jlong plist, jint filter, jint flags,
+                                   jlong cd_nelmts, jintArray cd_values)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
     if (NULL == cd_values) {
-        if ((status = H5Pset_filter((hid_t)plist, (H5Z_filter_t)filter,
-                (unsigned int)flags, (size_t)cd_nelmts, NULL)) < 0)
+        if ((status = H5Pset_filter((hid_t)plist, (H5Z_filter_t)filter, (unsigned int)flags,
+                                    (size_t)cd_nelmts, NULL)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
     }
     else {
         PIN_INT_ARRAY(ENVONLY, cd_values, theArray, &isCopy, "H5Pset_filter: input array not pinned");
 
-        if ((status = H5Pset_filter((hid_t)plist, (H5Z_filter_t)filter,
-                (unsigned int)flags, (size_t)cd_nelmts, (const unsigned int *)theArray)) < 0)
+        if ((status = H5Pset_filter((hid_t)plist, (H5Z_filter_t)filter, (unsigned int)flags,
+                                    (size_t)cd_nelmts, (const unsigned int *)theArray)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
     }
 
@@ -529,8 +514,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pall_1filters_1avail
-    (JNIEnv *env, jclass clss, jlong dcpl_id)
+Java_hdf_hdf5lib_H5_H5Pall_1filters_1avail(JNIEnv *env, jclass clss, jlong dcpl_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -551,8 +535,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nfilters
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1nfilters(JNIEnv *env, jclass clss, jlong plist)
 {
     int retVal = -1;
 
@@ -571,17 +554,17 @@ done:
  * Signature: (JI[I[J[IJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter
-    (JNIEnv *env, jclass clss, jlong plist, jint filter_number, jintArray flags,
-        jlongArray cd_nelmts, jintArray cd_values, jlong namelen, jobjectArray name)
+Java_hdf_hdf5lib_H5_H5Pget_1filter(JNIEnv *env, jclass clss, jlong plist, jint filter_number, jintArray flags,
+                                   jlongArray cd_nelmts, jintArray cd_values, jlong namelen,
+                                   jobjectArray name)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jint     *flagsArray = NULL;
-    jlong    *cd_nelmtsArray = NULL;
-    jint     *cd_valuesArray = NULL;
-    char     *filter = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    jint *   flagsArray     = NULL;
+    jlong *  cd_nelmtsArray = NULL;
+    jint *   cd_valuesArray = NULL;
+    char *   filter         = NULL;
+    herr_t   status         = FAIL;
 
     UNUSED(clss);
 
@@ -594,23 +577,22 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter
     if (NULL == cd_values)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_filter: cd_values is NULL");
 
-    if (NULL == (filter = (char *) HDmalloc(sizeof(char) * (size_t)namelen)))
+    if (NULL == (filter = (char *)HDmalloc(sizeof(char) * (size_t)namelen)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter: memory allocation failed");
 
     PIN_INT_ARRAY(ENVONLY, flags, flagsArray, &isCopy, "H5Pget_filter: flags array not pinned");
     PIN_LONG_ARRAY(ENVONLY, cd_nelmts, cd_nelmtsArray, &isCopy, "H5Pget_filter: nelmts array not pinned");
     PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesArray, &isCopy, "H5Pget_filter: elmts array not pinned");
 
-
     /* direct cast (size_t *)variable fails on 32-bit environment */
     {
         unsigned int filter_config;
         long long    cd_nelmts_temp = *cd_nelmtsArray;
-        size_t       cd_nelmts_t = (size_t) cd_nelmts_temp;
+        size_t       cd_nelmts_t    = (size_t)cd_nelmts_temp;
 
-        if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number,
-                (unsigned int *)flagsArray, &cd_nelmts_t, (unsigned int *)cd_valuesArray,
-                (size_t)namelen, filter, &filter_config)) < 0)
+        if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number, (unsigned int *)flagsArray,
+                                     &cd_nelmts_t, (unsigned int *)cd_valuesArray, (size_t)namelen, filter,
+                                     &filter_config)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         filter[namelen - 1] = '\0';
@@ -620,7 +602,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, filter))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_filter: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, name, 0, (jobject)str);
@@ -645,19 +628,18 @@ done:
  * Signature: (JI[I[J[IJ[Ljava/lang/String;[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter2
-    (JNIEnv *env, jclass clss, jlong plist, jint filter_number,
-        jintArray flags, jlongArray cd_nelmts, jintArray cd_values, jlong namelen,
-        jobjectArray name, jintArray filter_config)
+Java_hdf_hdf5lib_H5_H5Pget_1filter2(JNIEnv *env, jclass clss, jlong plist, jint filter_number,
+                                    jintArray flags, jlongArray cd_nelmts, jintArray cd_values, jlong namelen,
+                                    jobjectArray name, jintArray filter_config)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jint     *flagsArray = NULL;
-    jlong    *cd_nelmtsArray = NULL;
-    jint     *cd_valuesArray = NULL;
-    jint     *filter_configArray = NULL;
-    char     *filter = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    jint *   flagsArray         = NULL;
+    jlong *  cd_nelmtsArray     = NULL;
+    jint *   cd_valuesArray     = NULL;
+    jint *   filter_configArray = NULL;
+    char *   filter             = NULL;
+    herr_t   status             = FAIL;
 
     UNUSED(clss);
 
@@ -670,21 +652,22 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2
     if (NULL == filter_config)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_filter2: filter_config is NULL");
 
-    if (NULL == (filter = (char *) HDmalloc(sizeof(char) * (size_t)namelen)))
+    if (NULL == (filter = (char *)HDmalloc(sizeof(char) * (size_t)namelen)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter2: memory allocation failed");
 
     PIN_INT_ARRAY(ENVONLY, flags, flagsArray, &isCopy, "H5Pget_filter2: flags array not pinned");
     PIN_LONG_ARRAY(ENVONLY, cd_nelmts, cd_nelmtsArray, &isCopy, "H5Pget_filter2: nelmts array not pinned");
-    PIN_INT_ARRAY(ENVONLY, filter_config, filter_configArray, &isCopy, "H5Pget_filter2: filter_config array not pinned");
+    PIN_INT_ARRAY(ENVONLY, filter_config, filter_configArray, &isCopy,
+                  "H5Pget_filter2: filter_config array not pinned");
 
     if (NULL == cd_values && *cd_nelmtsArray == 0) {
         /* direct cast (size_t *)variable fails on 32-bit environment */
         long long cd_nelmts_temp = 0;
-        size_t cd_nelmts_t = (size_t) cd_nelmts_temp;
+        size_t    cd_nelmts_t    = (size_t)cd_nelmts_temp;
 
-        if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number,
-                (unsigned int *)flagsArray, &cd_nelmts_t, NULL,
-                (size_t)namelen, filter, (unsigned int *)filter_configArray)) < 0)
+        if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number, (unsigned int *)flagsArray,
+                                     &cd_nelmts_t, NULL, (size_t)namelen, filter,
+                                     (unsigned int *)filter_configArray)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         filter[namelen - 1] = '\0';
@@ -700,11 +683,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2
         {
             /* direct cast (size_t *)variable fails on 32-bit environment */
             long long cd_nelmts_temp = *cd_nelmtsArray;
-            size_t    cd_nelmts_t = (size_t) cd_nelmts_temp;
+            size_t    cd_nelmts_t    = (size_t)cd_nelmts_temp;
 
-            if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number,
-                    (unsigned int *)flagsArray, &cd_nelmts_t, (unsigned int *)cd_valuesArray,
-                    (size_t)namelen, filter, (unsigned int *)filter_configArray)) < 0)
+            if ((status = H5Pget_filter2((hid_t)plist, (unsigned)filter_number, (unsigned int *)flagsArray,
+                                         &cd_nelmts_t, (unsigned int *)cd_valuesArray, (size_t)namelen,
+                                         filter, (unsigned int *)filter_configArray)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
             filter[namelen - 1] = '\0';
@@ -715,7 +698,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, filter))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter2: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_filter2: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, name, 0, (jobject)str);
@@ -742,19 +726,19 @@ done:
  * Signature: (JI[I[J[IJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
-    (JNIEnv *env, jclass clss, jlong plist, jint filter,
-        jintArray flags, jlongArray cd_nelmts, jintArray cd_values, jlong namelen, jobjectArray name)
+Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id(JNIEnv *env, jclass clss, jlong plist, jint filter,
+                                           jintArray flags, jlongArray cd_nelmts, jintArray cd_values,
+                                           jlong namelen, jobjectArray name)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jlong    *cd_nelmtsArray = NULL;
-    jint     *cd_valuesArray = NULL;
-    jint     *flagsArray = NULL;
-    char     *aName = NULL;
-    long      bs;
-    int       rank;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    jlong *  cd_nelmtsArray = NULL;
+    jint *   cd_valuesArray = NULL;
+    jint *   flagsArray     = NULL;
+    char *   aName          = NULL;
+    long     bs;
+    int      rank;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -771,12 +755,13 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pget_filter_by_id: name is NULL");
 
-    if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)bs)))
+    if (NULL == (aName = (char *)HDmalloc(sizeof(char) * (size_t)bs)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter_by_id: memory allocation failed");
 
     PIN_INT_ARRAY(ENVONLY, flags, flagsArray, &isCopy, "H5Pget_filter_by_id: flags not pinned");
     PIN_LONG_ARRAY(ENVONLY, cd_nelmts, cd_nelmtsArray, &isCopy, "H5Pget_filter_by_id: cd_nelms not pinned");
-    PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesArray, &isCopy, "H5Pget_filter_by_id: cd_values array not pinned");
+    PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesArray, &isCopy,
+                  "H5Pget_filter_by_id: cd_values array not pinned");
 
     if ((rank = ENVPTR->GetArrayLength(ENVONLY, cd_values)) < 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
@@ -787,11 +772,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
         /* direct cast (size_t *)variable fails on 32-bit environment */
         unsigned int filter_config;
         long long    cd_nelmts_temp = *cd_nelmtsArray;
-        size_t       cd_nelmts_t = (size_t) cd_nelmts_temp;
+        size_t       cd_nelmts_t    = (size_t)cd_nelmts_temp;
 
-        if ((status = H5Pget_filter_by_id2((hid_t)plist, (H5Z_filter_t)filter,
-                (unsigned int *)flagsArray, &cd_nelmts_t, (unsigned int *)cd_valuesArray,
-                (size_t)namelen, (char *)aName, &filter_config)) < 0)
+        if ((status = H5Pget_filter_by_id2((hid_t)plist, (H5Z_filter_t)filter, (unsigned int *)flagsArray,
+                                           &cd_nelmts_t, (unsigned int *)cd_valuesArray, (size_t)namelen,
+                                           (char *)aName, &filter_config)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         aName[bs - 1] = '\0';
@@ -801,7 +786,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, aName))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter_by_id: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_filter_by_id: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, name, 0, (jobject)str);
@@ -826,19 +812,19 @@ done:
  * Signature: (JI[I[J[IJ[Ljava/lang/String;[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2
-    (JNIEnv *env, jclass clss, jlong plist, jint filter,
-        jintArray flags, jlongArray cd_nelmts, jintArray cd_values, jlong namelen, jobjectArray name, jintArray filter_config)
+Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2(JNIEnv *env, jclass clss, jlong plist, jint filter,
+                                            jintArray flags, jlongArray cd_nelmts, jintArray cd_values,
+                                            jlong namelen, jobjectArray name, jintArray filter_config)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jlong    *cd_nelmtsArray = NULL;
-    jint     *cd_valuesArray = NULL;
-    jint     *flagsArray = NULL;
-    jint     *filter_configArray = NULL;
-    long      bs;
-    char     *aName = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    jlong *  cd_nelmtsArray     = NULL;
+    jint *   cd_valuesArray     = NULL;
+    jint *   flagsArray         = NULL;
+    jint *   filter_configArray = NULL;
+    long     bs;
+    char *   aName  = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -857,22 +843,24 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2
     if (NULL == filter_config)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pget_filter_by_id2: filter_config is NULL");
 
-    if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)bs)))
+    if (NULL == (aName = (char *)HDmalloc(sizeof(char) * (size_t)bs)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter_by_id2: memory allocation failed");
 
     PIN_INT_ARRAY(ENVONLY, flags, flagsArray, &isCopy, "H5Pget_filter_by_id2: flags not pinned");
     PIN_LONG_ARRAY(ENVONLY, cd_nelmts, cd_nelmtsArray, &isCopy, "H5Pget_filter_by_id2: cd_nelms not pinned");
-    PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesArray, &isCopy, "H5Pget_filter_by_id2: cd_values array not pinned");
-    PIN_INT_ARRAY(ENVONLY, filter_config, filter_configArray, &isCopy, "H5Pget_filter_by_id2: filter_config not pinned");
+    PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesArray, &isCopy,
+                  "H5Pget_filter_by_id2: cd_values array not pinned");
+    PIN_INT_ARRAY(ENVONLY, filter_config, filter_configArray, &isCopy,
+                  "H5Pget_filter_by_id2: filter_config not pinned");
 
     {
         /* direct cast (size_t *)variable fails on 32-bit environment */
         long long cd_nelmts_temp = *cd_nelmtsArray;
-        size_t    cd_nelmts_t = (size_t) cd_nelmts_temp;
+        size_t    cd_nelmts_t    = (size_t)cd_nelmts_temp;
 
-        if ((status = H5Pget_filter_by_id2((hid_t)plist, (H5Z_filter_t)filter,
-                (unsigned int *)flagsArray, &cd_nelmts_t, (unsigned int *)cd_valuesArray,
-                (size_t)namelen, (char *)aName, (unsigned int *)filter_configArray)) < 0)
+        if ((status = H5Pget_filter_by_id2((hid_t)plist, (H5Z_filter_t)filter, (unsigned int *)flagsArray,
+                                           &cd_nelmts_t, (unsigned int *)cd_valuesArray, (size_t)namelen,
+                                           (char *)aName, (unsigned int *)filter_configArray)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         aName[bs - 1] = '\0';
@@ -882,7 +870,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, aName))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_filter_by_id2: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_filter_by_id2: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, name, 0, (jobject)str);
@@ -909,13 +898,12 @@ done:
  * Signature: (JIIJ[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pmodify_1filter
-    (JNIEnv *env, jclass clss, jlong plist, jint filter,
-        jint flags, jlong cd_nelmts, jintArray cd_values)
+Java_hdf_hdf5lib_H5_H5Pmodify_1filter(JNIEnv *env, jclass clss, jlong plist, jint filter, jint flags,
+                                      jlong cd_nelmts, jintArray cd_values)
 {
-    jboolean  isCopy;
-    jint     *cd_valuesP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jint *   cd_valuesP = NULL;
+    herr_t   status     = FAIL;
 
     UNUSED(clss);
 
@@ -925,7 +913,7 @@ Java_hdf_hdf5lib_H5_H5Pmodify_1filter
     PIN_INT_ARRAY(ENVONLY, cd_values, cd_valuesP, &isCopy, "H5Pmodify_filter: cd_values not pinned");
 
     if ((status = H5Pmodify_filter((hid_t)plist, (H5Z_filter_t)filter, (const unsigned int)flags,
-            (size_t)cd_nelmts, (unsigned int *)cd_valuesP)) < 0)
+                                   (size_t)cd_nelmts, (unsigned int *)cd_valuesP)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -941,8 +929,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5P1remove_1filter
-    (JNIEnv *env, jclass clss, jlong obj_id, jint filter)
+Java_hdf_hdf5lib_H5_H5P1remove_1filter(JNIEnv *env, jclass clss, jlong obj_id, jint filter)
 {
     herr_t status = FAIL;
 
@@ -961,8 +948,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fletcher32
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pset_1fletcher32(JNIEnv *env, jclass clss, jlong plist)
 {
     herr_t retVal = FAIL;
 
@@ -981,8 +967,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1nbit
-    (JNIEnv *env, jclass clss, jlong plist_id)
+Java_hdf_hdf5lib_H5_H5Pset_1nbit(JNIEnv *env, jclass clss, jlong plist_id)
 {
     herr_t retVal = FAIL;
 
@@ -1001,8 +986,8 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1scaleoffset
-    (JNIEnv *env, jclass clss, jlong plist_id, jint scale_type, jint scale_factor)
+Java_hdf_hdf5lib_H5_H5Pset_1scaleoffset(JNIEnv *env, jclass clss, jlong plist_id, jint scale_type,
+                                        jint scale_factor)
 {
     herr_t retVal = FAIL;
 
@@ -1026,8 +1011,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shuffle
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pset_1shuffle(JNIEnv *env, jclass clss, jlong plist)
 {
     herr_t retVal = FAIL;
 
@@ -1046,8 +1030,8 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1szip
-    (JNIEnv *env, jclass clss, jlong plist, jint options_mask, jint pixels_per_block)
+Java_hdf_hdf5lib_H5_H5Pset_1szip(JNIEnv *env, jclass clss, jlong plist, jint options_mask,
+                                 jint pixels_per_block)
 {
     herr_t retVal = FAIL;
 
@@ -1066,11 +1050,11 @@ done:
  * Signature: (JLjava/lang/String;JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1external
-    (JNIEnv *env, jclass clss, jlong plist, jstring name, jlong offset, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1external(JNIEnv *env, jclass clss, jlong plist, jstring name, jlong offset,
+                                     jlong size)
 {
     const char *fileName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -1095,18 +1079,17 @@ done:
  * Signature: (JIJ[Ljava/lang/String;[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1external
-    (JNIEnv *env, jclass clss, jlong plist, jint idx, jlong name_size,
-        jobjectArray name, jlongArray size)
+Java_hdf_hdf5lib_H5_H5Pget_1external(JNIEnv *env, jclass clss, jlong plist, jint idx, jlong name_size,
+                                     jobjectArray name, jlongArray size)
 {
-    jboolean  isCopy;
-    jstring   str;
-    hsize_t   s;
-    off_t     o;
-    jsize     arrLen;
-    jlong    *theArray = NULL;
-    char     *file = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    hsize_t  s;
+    off_t    o;
+    jsize    arrLen;
+    jlong *  theArray = NULL;
+    char *   file     = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -1121,11 +1104,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1external
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_external: size input array < 2");
 
     if (name_size > 0)
-        if (NULL == (file = (char *) HDmalloc(sizeof(char) * (size_t)name_size)))
+        if (NULL == (file = (char *)HDmalloc(sizeof(char) * (size_t)name_size)))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_external: memory allocation failed");
 
-    if ((status = H5Pget_external((hid_t) plist, (unsigned)idx, (size_t)name_size,
-            file, (off_t *)&o, (hsize_t *)&s)) < 0)
+    if ((status = H5Pget_external((hid_t)plist, (unsigned)idx, (size_t)name_size, file, (off_t *)&o,
+                                  (hsize_t *)&s)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL != size) {
@@ -1140,7 +1123,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1external
 
         if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, file))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_external: out of memory - unable to construct string from UTF characters");
+            H5_OUT_OF_MEMORY_ERROR(
+                ENVONLY, "H5Pget_external: out of memory - unable to construct string from UTF characters");
         }
 
         ENVPTR->SetObjectArrayElement(ENVONLY, name, 0, (jobject)str);
@@ -1162,8 +1146,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1external_1count
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1external_1count(JNIEnv *env, jclass clss, jlong plist)
 {
     int retVal = -1;
 
@@ -1182,12 +1165,11 @@ done:
  * Signature: (JJLjava/lang/String;Ljava/lang/String;J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong vspace_id,
-        jstring src_file_name, jstring src_dset_name, jlong src_space_id)
+Java_hdf_hdf5lib_H5_H5Pset_1virtual(JNIEnv *env, jclass clss, jlong dcpl_id, jlong vspace_id,
+                                    jstring src_file_name, jstring src_dset_name, jlong src_space_id)
 {
-    const char *fstr = NULL;
-    const char *dstr = NULL;
+    const char *fstr   = NULL;
+    const char *dstr   = NULL;
     herr_t      retVal = FAIL;
 
     UNUSED(clss);
@@ -1216,8 +1198,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1count
-    (JNIEnv *env, jclass clss, jlong dcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1count(JNIEnv *env, jclass clss, jlong dcpl_id)
 {
     size_t s = 0;
 
@@ -1236,29 +1217,30 @@ done:
  * Signature: (JJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
-    ssize_t  buf_size;
-    char    *dname = NULL;
-    jstring  str = NULL;
+    ssize_t buf_size;
+    char *  dname = NULL;
+    jstring str   = NULL;
 
     UNUSED(clss);
 
     /* get the length of the filename */
-    if ((buf_size = H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t) idx, NULL, 0)) < 0)
+    if ((buf_size = H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t)idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (dname = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (dname = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_dsetname: memory allocation failed");
 
-    if (H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t) idx, dname, (size_t)buf_size + 1) < 0)
+    if (H5Pget_virtual_dsetname((hid_t)dcpl_id, (size_t)idx, dname, (size_t)buf_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     dname[buf_size] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, dname))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_dsetname: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY,
+            "H5Pget_virtual_dsetname: out of memory - unable to construct string from UTF characters");
     }
 
 done:
@@ -1274,29 +1256,30 @@ done:
  * Signature: (JJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
-    ssize_t  buf_size;
-    char    *fname = NULL;
-    jstring  str = NULL;
+    ssize_t buf_size;
+    char *  fname = NULL;
+    jstring str   = NULL;
 
     UNUSED(clss);
 
     /* get the length of the filename */
-    if ((buf_size = H5Pget_virtual_filename((hid_t)dcpl_id, (size_t) idx, NULL, 0)) < 0)
+    if ((buf_size = H5Pget_virtual_filename((hid_t)dcpl_id, (size_t)idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (fname = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (fname = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_filename: memory allocation failed");
 
-    if (H5Pget_virtual_filename((hid_t)dcpl_id, (size_t) idx, fname, (size_t)buf_size + 1) < 0)
+    if (H5Pget_virtual_filename((hid_t)dcpl_id, (size_t)idx, fname, (size_t)buf_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     fname[buf_size] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, fname))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_filename: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY,
+            "H5Pget_virtual_filename: out of memory - unable to construct string from UTF characters");
     }
 
 done:
@@ -1312,14 +1295,13 @@ done:
  * Signature: (JJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     hid_t space_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((space_id = H5Pget_virtual_srcspace((hid_t)dcpl_id, (size_t) idx)) < 0)
+    if ((space_id = H5Pget_virtual_srcspace((hid_t)dcpl_id, (size_t)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1332,14 +1314,13 @@ done:
  * Signature: (JJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace(JNIEnv *env, jclass clss, jlong dcpl_id, jlong idx)
 {
     hid_t space_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((space_id = H5Pget_virtual_vspace((hid_t)dcpl_id, (size_t) idx)) < 0)
+    if ((space_id = H5Pget_virtual_vspace((hid_t)dcpl_id, (size_t)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1352,11 +1333,10 @@ done:
  * Signature: (JLjava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1prefix
-    (JNIEnv *env, jclass clss, jlong dapl_id, jstring prefix)
+Java_hdf_hdf5lib_H5_H5Pset_1virtual_1prefix(JNIEnv *env, jclass clss, jlong dapl_id, jstring prefix)
 {
     const char *virtPrefix = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal     = FAIL;
 
     UNUSED(clss);
 
@@ -1379,28 +1359,28 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix
-    (JNIEnv *env, jclass clss, jlong dapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix(JNIEnv *env, jclass clss, jlong dapl_id)
 {
-    ssize_t  prefix_size = -1;
-    char    *pre = NULL;
-    jstring  str = NULL;
+    ssize_t prefix_size = -1;
+    char *  pre         = NULL;
+    jstring str         = NULL;
 
     UNUSED(clss);
 
     if ((prefix_size = H5Pget_virtual_prefix((hid_t)dapl_id, (char *)NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (pre = (char *) HDmalloc(sizeof(char) * (size_t) prefix_size + 1)))
+    if (NULL == (pre = (char *)HDmalloc(sizeof(char) * (size_t)prefix_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_prefix: memory allocation failed");
 
-    if (H5Pget_virtual_prefix((hid_t)dapl_id, (char *)pre, (size_t) prefix_size + 1) < 0)
+    if (H5Pget_virtual_prefix((hid_t)dapl_id, (char *)pre, (size_t)prefix_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     pre[prefix_size] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, pre))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_virtual_prefix: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_virtual_prefix: out of memory - unable to construct string from UTF characters");
     }
 
 done:
diff --git a/java/src/jni/h5pDCPLImp.h b/java/src/jni/h5pDCPLImp.h
index 6e5c225..3a6a088 100644
--- a/java/src/jni/h5pDCPLImp.h
+++ b/java/src/jni/h5pDCPLImp.h
@@ -25,369 +25,297 @@ extern "C" {
  * Method:    H5Pset_layout
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1layout
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1layout(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_layout
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1layout
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1layout(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_chunk
  * Signature: (JI[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk
-(JNIEnv *, jclass, jlong, jint, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1chunk(JNIEnv *, jclass, jlong, jint, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_chunk
  * Signature: (JI[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk
-(JNIEnv *, jclass, jlong, jint, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1chunk(JNIEnv *, jclass, jlong, jint, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_chunk_opts
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1chunk_1opts(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_chunk_opts
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1chunk_1opts(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_dset_no_attrs_hint
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint
-  (JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_dset_no_attrs_hint
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_deflate
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1deflate
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1deflate(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fill_value
  * Signature: (JJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fill_1value
-(JNIEnv *, jclass, jlong, jlong, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fill_1value(JNIEnv *, jclass, jlong, jlong, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fill_value
  * Signature: (JJ[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fill_1value
-(JNIEnv *, jclass, jlong, jlong, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fill_1value(JNIEnv *, jclass, jlong, jlong, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pfill_value_defined
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pfill_1value_1defined(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fill_time
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fill_1time
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fill_1time(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fill_time
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fill_1time
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fill_1time(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_alloc_time
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1alloc_1time
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1alloc_1time(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_alloc_time
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1alloc_1time(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_filter
  * Signature: (JIIJ[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1filter
-(JNIEnv *, jclass, jlong, jint, jint, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1filter(JNIEnv *, jclass, jlong, jint, jint, jlong,
+                                                          jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pall_filters_avail
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pall_1filters_1avail
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pall_1filters_1avail(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_nfilters
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nfilters
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1nfilters(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_filter
  * Signature: (JI[I[J[IJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter
-(JNIEnv *, jclass, jlong, jint, jintArray, jlongArray, jintArray, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1filter(JNIEnv *, jclass, jlong, jint, jintArray,
+                                                          jlongArray, jintArray, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_filter2
  * Signature: (JI[I[J[IJ[Ljava/lang/String;[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter2
-(JNIEnv *, jclass, jlong, jint, jintArray, jlongArray, jintArray, jlong, jobjectArray, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1filter2(JNIEnv *, jclass, jlong, jint, jintArray,
+                                                           jlongArray, jintArray, jlong, jobjectArray,
+                                                           jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_filter_by_id
  * Signature: (JI[I[J[IJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
-(JNIEnv *, jclass, jlong, jint, jintArray, jlongArray, jintArray, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id(JNIEnv *, jclass, jlong, jint, jintArray,
+                                                                  jlongArray, jintArray, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_filter_by_id2
  * Signature: (JI[I[J[IJ[Ljava/lang/String;[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2
-(JNIEnv *, jclass, jlong, jint, jintArray, jlongArray, jintArray, jlong, jobjectArray, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2(JNIEnv *, jclass, jlong, jint, jintArray,
+                                                                   jlongArray, jintArray, jlong, jobjectArray,
+                                                                   jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pmodify_filter
  * Signature: (JIIJ[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pmodify_1filter
-(JNIEnv *, jclass, jlong, jint, jint, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pmodify_1filter(JNIEnv *, jclass, jlong, jint, jint, jlong,
+                                                             jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Premove_filter
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5P1remove_1filter
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5P1remove_1filter(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fletcher32
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fletcher32
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fletcher32(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_nbit
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1nbit
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1nbit(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_scaleoffset
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1scaleoffset
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1scaleoffset(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_shuffle
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shuffle
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1shuffle(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_szip
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1szip
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1szip(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_external
  * Signature: (JLjava/lang/String;JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1external
-(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1external(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_external
  * Signature: (JIJ[Ljava/lang/String;[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1external
-(JNIEnv *, jclass, jlong, jint, jlong, jobjectArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1external(JNIEnv *, jclass, jlong, jint, jlong,
+                                                            jobjectArray, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_external_count
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1external_1count
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1external_1count(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_virtual
  * Signature: (JJLjava/lang/String;Ljava/lang/String;J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual
-(JNIEnv *, jclass, jlong, jlong, jstring, jstring, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1virtual(JNIEnv *, jclass, jlong, jlong, jstring, jstring,
+                                                           jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_count
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1count
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1count(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_dsetname
  * Signature: (JJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1dsetname(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_filename
  * Signature: (JJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1filename(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_srcspace
  * Signature: (JJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_vspace
  * Signature: (JJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_virtual_prefix
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1virtual_1prefix
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1virtual_1prefix(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_virtual_prefix
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1virtual_1prefix(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pDXPLImp.c b/java/src/jni/h5pDXPLImp.c
index 12e3367..f7f9f96 100644
--- a/java/src/jni/h5pDXPLImp.c
+++ b/java/src/jni/h5pDXPLImp.c
@@ -37,15 +37,15 @@ extern "C" {
  * Signature: (JJ[B[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1buffer
-    (JNIEnv *env, jclass clss, jlong plist, jlong size, jbyteArray tconv, jbyteArray bkg)
+Java_hdf_hdf5lib_H5_H5Pset_1buffer(JNIEnv *env, jclass clss, jlong plist, jlong size, jbyteArray tconv,
+                                   jbyteArray bkg)
 {
 #ifdef notdef
-    jboolean  isCopy;
-    jbyte    *tconvP = NULL;
-    jbyte    *bkgP = NULL;
+    jboolean isCopy;
+    jbyte *  tconvP = NULL;
+    jbyte *  bkgP   = NULL;
 #endif
-    herr_t    status = FAIL;
+    herr_t status = FAIL;
 
     UNUSED(clss);
 #ifndef notdef
@@ -85,15 +85,14 @@ done:
  * Signature: (J[B[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1buffer
-    (JNIEnv *env, jclass clss, jlong plist, jbyteArray tconv, jbyteArray bkg)
+Java_hdf_hdf5lib_H5_H5Pget_1buffer(JNIEnv *env, jclass clss, jlong plist, jbyteArray tconv, jbyteArray bkg)
 {
 #ifdef notdef
-    jboolean  isCopy;
-    jbyte    *tconvP = NULL;
-    jbyte    *bkgP = NULL;
+    jboolean isCopy;
+    jbyte *  tconvP = NULL;
+    jbyte *  bkgP   = NULL;
 #endif
-    herr_t    status = FAIL;
+    herr_t status = FAIL;
 
     UNUSED(clss);
 #ifndef notdef
@@ -135,8 +134,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1buffer_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1buffer_1size(JNIEnv *env, jclass clss, jlong plist, jlong size)
 {
     UNUSED(clss);
 
@@ -153,8 +151,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1buffer_1size
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1buffer_1size(JNIEnv *env, jclass clss, jlong plist)
 {
     size_t size = 0;
 
@@ -173,10 +170,9 @@ done:
  * Signature: (JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1preserve
-    (JNIEnv *env, jclass clss, jlong plist, jboolean status)
+Java_hdf_hdf5lib_H5_H5Pset_1preserve(JNIEnv *env, jclass clss, jlong plist, jboolean status)
 {
-    hbool_t st = JNI_FALSE;
+    hbool_t st     = JNI_FALSE;
     herr_t  retVal = FAIL;
 
     UNUSED(clss);
@@ -201,8 +197,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1preserve
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1preserve(JNIEnv *env, jclass clss, jlong plist)
 {
     herr_t retVal = FAIL;
 
@@ -221,8 +216,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1edc_1check
-    (JNIEnv *env, jclass clss, jlong plist, jint check)
+Java_hdf_hdf5lib_H5_H5Pset_1edc_1check(JNIEnv *env, jclass clss, jlong plist, jint check)
 {
     herr_t retVal = FAIL;
 
@@ -241,8 +235,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1edc_1check
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1edc_1check(JNIEnv *env, jclass clss, jlong plist)
 {
     H5Z_EDC_t retVal = -1;
 
@@ -265,18 +258,18 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1data_1transform
-    (JNIEnv *env, jclass clss, jlong plist_id, jstring expression)
+Java_hdf_hdf5lib_H5_H5Pset_1data_1transform(JNIEnv *env, jclass clss, jlong plist_id, jstring expression)
 {
     const char *express = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal  = FAIL;
 
     UNUSED(clss);
 
     if (NULL == expression)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pset_data_transform: data transform expression is NULL");
 
-    PIN_JAVA_STRING(ENVONLY, expression, express, NULL, "H5Pset_data_transform: data transform expression not pinned");
+    PIN_JAVA_STRING(ENVONLY, expression, express, NULL,
+                    "H5Pset_data_transform: data transform expression not pinned");
 
     if ((retVal = H5Pset_data_transform((hid_t)plist_id, express)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -294,12 +287,12 @@ done:
  * Signature: (J[Ljava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1data_1transform
-    (JNIEnv *env, jclass clss, jlong plist_id, jobjectArray expression, jlong size)
+Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *env, jclass clss, jlong plist_id, jobjectArray expression,
+                                            jlong size)
 {
-    jstring  str = NULL;
-    char    *express = NULL;
-    ssize_t  express_size = -1;
+    jstring str          = NULL;
+    char *  express      = NULL;
+    ssize_t express_size = -1;
 
     UNUSED(clss);
 
@@ -309,7 +302,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform
     if ((express_size = H5Pget_data_transform((hid_t)plist_id, (char *)NULL, (size_t)size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (express = (char *) HDmalloc(sizeof(char) * (size_t)express_size + 1)))
+    if (NULL == (express = (char *)HDmalloc(sizeof(char) * (size_t)express_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_data_transform: memory allocation failed");
 
     if (H5Pget_data_transform((hid_t)plist_id, express, (size_t)express_size + 1) < 0)
@@ -318,7 +311,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, express))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_data_transform: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_data_transform: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, expression, 0, str);
@@ -345,8 +339,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1hyper_1vector_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlong vector_size)
+Java_hdf_hdf5lib_H5_H5Pset_1hyper_1vector_1size(JNIEnv *env, jclass clss, jlong plist, jlong vector_size)
 {
     herr_t retVal = FAIL;
 
@@ -365,22 +358,22 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlongArray vector_size)
+Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size(JNIEnv *env, jclass clss, jlong plist, jlongArray vector_size)
 {
-    jboolean  isCopy;
-    size_t    size;
-    jlong    *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    size_t   size;
+    jlong *  theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
     if (NULL == vector_size)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pget_hyper_vector_size: vector_size is NULL");
 
-    PIN_LONG_ARRAY(ENVONLY, vector_size, theArray, &isCopy, "H5Pget_hyper_vector_size: vector_size not pinned");
+    PIN_LONG_ARRAY(ENVONLY, vector_size, theArray, &isCopy,
+                   "H5Pget_hyper_vector_size: vector_size not pinned");
 
-    if ((retVal =  H5Pget_hyper_vector_size((hid_t)plist, &size)) < 0)
+    if ((retVal = H5Pget_hyper_vector_size((hid_t)plist, &size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     theArray[0] = (jlong)size;
@@ -398,14 +391,14 @@ done:
  * Signature: (JDDD)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1btree_1ratios
-    (JNIEnv *env, jclass clss, jlong plist_id, jdouble left, jdouble middle, jdouble right)
+Java_hdf_hdf5lib_H5_H5Pset_1btree_1ratios(JNIEnv *env, jclass clss, jlong plist_id, jdouble left,
+                                          jdouble middle, jdouble right)
 {
     herr_t status = FAIL;
 
     UNUSED(clss);
 
-    if ((status = H5Pset_btree_ratios((hid_t)plist_id, (double)left,(double)middle, (double)right)) < 0)
+    if ((status = H5Pset_btree_ratios((hid_t)plist_id, (double)left, (double)middle, (double)right)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -418,15 +411,14 @@ done:
  * Signature: (J[D[D[D)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1btree_1ratios
-    (JNIEnv *env, jclass clss, jlong plist_id, jdoubleArray left,
-        jdoubleArray middle, jdoubleArray right)
+Java_hdf_hdf5lib_H5_H5Pget_1btree_1ratios(JNIEnv *env, jclass clss, jlong plist_id, jdoubleArray left,
+                                          jdoubleArray middle, jdoubleArray right)
 {
-    jboolean  isCopy;
-    jdouble  *leftP = NULL;
-    jdouble  *middleP = NULL;
-    jdouble  *rightP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jdouble *leftP   = NULL;
+    jdouble *middleP = NULL;
+    jdouble *rightP  = NULL;
+    herr_t   status  = FAIL;
 
     UNUSED(clss);
 
@@ -441,8 +433,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1btree_1ratios
     PIN_DOUBLE_ARRAY(ENVONLY, middle, middleP, &isCopy, "H5Pget_btree_ratios: middle array not pinned");
     PIN_DOUBLE_ARRAY(ENVONLY, right, rightP, &isCopy, "H5Pget_btree_ratios: right array not pinned");
 
-    if ((status = H5Pget_btree_ratios((hid_t)plist_id, (double *)leftP,
-            (double *)middleP, (double *)rightP)) < 0)
+    if ((status =
+             H5Pget_btree_ratios((hid_t)plist_id, (double *)leftP, (double *)middleP, (double *)rightP)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5pDXPLImp.h b/java/src/jni/h5pDXPLImp.h
index d62f9c5..9793ce7 100644
--- a/java/src/jni/h5pDXPLImp.h
+++ b/java/src/jni/h5pDXPLImp.h
@@ -25,72 +25,57 @@ extern "C" {
  * Method:    H5Pset_buffer
  * Signature: (JJ[B[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1buffer
-(JNIEnv *, jclass, jlong, jlong, jbyteArray, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1buffer(JNIEnv *, jclass, jlong, jlong, jbyteArray,
+                                                          jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_buffer
  * Signature: (J[B[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1buffer
-(JNIEnv *, jclass, jlong, jbyteArray, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1buffer(JNIEnv *, jclass, jlong, jbyteArray, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_buffer_size
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1buffer_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1buffer_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_buffer_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1buffer_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1buffer_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_preserve
  * Signature: (JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1preserve
-(JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1preserve(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_preserve
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1preserve
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1preserve(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_edc_check
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1edc_1check
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1edc_1check(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_edc_check
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1edc_1check
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1edc_1check(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pset_filter_callback
@@ -101,18 +86,15 @@ Java_hdf_hdf5lib_H5_H5Pget_1edc_1check
  * Method:    H5Pset_data_transform
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1data_1transform
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1data_1transform(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_data_transform
  * Signature: (J[Ljava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1data_1transform
-(JNIEnv *, jclass, jlong, jobjectArray, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1data_1transform(JNIEnv *, jclass, jlong, jobjectArray,
+                                                                    jlong);
 
 /*
  * TODO: H5Pset_type_conv_cb
@@ -127,36 +109,30 @@ Java_hdf_hdf5lib_H5_H5Pget_1data_1transform
  * Method:    H5Pset_hyper_vector_size
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1hyper_1vector_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1hyper_1vector_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_hyper_vector_size
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size
-(JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1hyper_1vector_1size(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_btree_ratios
  * Signature: (JDDD)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1btree_1ratios
-(JNIEnv *, jclass, jlong, jdouble, jdouble, jdouble);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1btree_1ratios(JNIEnv *, jclass, jlong, jdouble, jdouble,
+                                                                 jdouble);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_btree_ratios
  * Signature: (J[D[D[D)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1btree_1ratios
-(JNIEnv *, jclass, jlong, jdoubleArray, jdoubleArray, jdoubleArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1btree_1ratios(JNIEnv *, jclass, jlong, jdoubleArray,
+                                                                 jdoubleArray, jdoubleArray);
 
 /*
  * TODO: H5Pset_vlen_mem_manager
diff --git a/java/src/jni/h5pFAPLImp.c b/java/src/jni/h5pFAPLImp.c
index dbfbb5a..0077df4 100644
--- a/java/src/jni/h5pFAPLImp.c
+++ b/java/src/jni/h5pFAPLImp.c
@@ -42,14 +42,13 @@ extern "C" {
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1driver
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1driver(JNIEnv *env, jclass clss, jlong plist)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pget_driver((hid_t) plist)) < 0)
+    if ((retVal = H5Pget_driver((hid_t)plist)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -66,8 +65,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fclose_1degree
-    (JNIEnv *env, jclass clss, jlong plist, jint fc_degree)
+Java_hdf_hdf5lib_H5_H5Pset_1fclose_1degree(JNIEnv *env, jclass clss, jlong plist, jint fc_degree)
 {
     herr_t retVal = FAIL;
 
@@ -86,8 +84,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fclose_1degree
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1fclose_1degree(JNIEnv *env, jclass clss, jlong plist)
 {
     H5F_close_degree_t degree = H5F_CLOSE_DEFAULT;
 
@@ -106,8 +103,8 @@ done:
  * Signature: (JJZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1core
-    (JNIEnv *env, jclass clss, jlong fapl_id, jlong increment, jboolean backing_store)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id, jlong increment,
+                                       jboolean backing_store)
 {
     herr_t retVal = FAIL;
 
@@ -126,13 +123,13 @@ done:
  * Signature: (J[J[Z)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core
-    (JNIEnv *env, jclass clss, jlong fapl_id, jlongArray increment, jbooleanArray backing_store)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id, jlongArray increment,
+                                       jbooleanArray backing_store)
 {
     jboolean  isCopy;
     jboolean *backArray = NULL;
-    jlong    *incArray = NULL;
-    herr_t    status = FAIL;
+    jlong *   incArray  = NULL;
+    herr_t    status    = FAIL;
 
     UNUSED(clss);
 
@@ -147,7 +144,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core
     {
         /* Direct cast (size_t *)variable fails on 32-bit environment */
         long long inc_temp = *incArray;
-        size_t    inc_t = (size_t) inc_temp;
+        size_t    inc_t    = (size_t)inc_temp;
 
         if ((status = H5Pget_fapl_core((hid_t)fapl_id, &inc_t, (hbool_t *)backArray)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
@@ -178,16 +175,16 @@ done:
  * Signature: (JJJJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1direct
-    (JNIEnv *env, jclass clss, jlong fapl_id, jlong alignment,
-        jlong block_size, jlong cbuf_size)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1direct(JNIEnv *env, jclass clss, jlong fapl_id, jlong alignment,
+                                         jlong block_size, jlong cbuf_size)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
 #ifdef H5_HAVE_DIRECT
-    if ((retVal = H5Pset_fapl_direct((hid_t)fapl_id, (size_t)alignment, (size_t)block_size, (size_t)cbuf_size)) < 0)
+    if ((retVal = H5Pset_fapl_direct((hid_t)fapl_id, (size_t)alignment, (size_t)block_size,
+                                     (size_t)cbuf_size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -208,18 +205,17 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct
-    (JNIEnv *env, jclass clss, jlong fapl_id, jlongArray info)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct(JNIEnv *env, jclass clss, jlong fapl_id, jlongArray info)
 {
 #ifdef H5_HAVE_DIRECT
-    jboolean  isCopy;
-    jlong    *theArray = NULL;
-    size_t    alignment = 0;
-    size_t    block_size = 0;
-    size_t    cbuf_size = 0;
-    jsize     arrLen;
+    jboolean isCopy;
+    jlong *  theArray   = NULL;
+    size_t   alignment  = 0;
+    size_t   block_size = 0;
+    size_t   cbuf_size  = 0;
+    jsize    arrLen;
 #endif
-    herr_t    retVal = FAIL;
+    herr_t retVal = FAIL;
 
     UNUSED(clss);
 
@@ -261,10 +257,10 @@ done:
  * Signature: (JJJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1family
-    (JNIEnv *env, jclass clss, jlong plist, jlong memb_size, jlong memb_plist)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1family(JNIEnv *env, jclass clss, jlong plist, jlong memb_size,
+                                         jlong memb_plist)
 {
-    long   ms = (long)memb_size;
+    long   ms     = (long)memb_size;
     herr_t retVal = FAIL;
 
     UNUSED(clss);
@@ -282,16 +278,16 @@ done:
  * Signature: (J[J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family
-    (JNIEnv *env, jclass clss, jlong tid, jlongArray memb_size, jlongArray memb_plist)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family(JNIEnv *env, jclass clss, jlong tid, jlongArray memb_size,
+                                         jlongArray memb_plist)
 {
-    jboolean  isCopy;
-    hsize_t  *sa = NULL;
-    size_t    i;
-    jlong    *sizeArray = NULL;
-    jlong    *plistArray = NULL;
-    jsize     rank;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *sa = NULL;
+    size_t   i;
+    jlong *  sizeArray  = NULL;
+    jlong *  plistArray = NULL;
+    jsize    rank;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -307,7 +303,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_family: memb_size array length < 0");
     }
 
-    if (NULL == (sa = (hsize_t *) HDmalloc((size_t) rank * sizeof(hsize_t))))
+    if (NULL == (sa = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_family: memory allocation failed");
 
     PIN_LONG_ARRAY(ENVONLY, memb_plist, plistArray, &isCopy, "H5Pget_family: plistArray not pinned");
@@ -315,7 +311,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family
     if ((status = H5Pget_fapl_family((hid_t)tid, sa, (hid_t *)plistArray)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    for (i = 0; i < (size_t) rank; i++)
+    for (i = 0; i < (size_t)rank; i++)
         sizeArray[i] = (jlong)sa[i];
 
 done:
@@ -335,8 +331,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1family_1offset
-    (JNIEnv *env, jclass clss, jlong fapl_id, jlong offset)
+Java_hdf_hdf5lib_H5_H5Pset_1family_1offset(JNIEnv *env, jclass clss, jlong fapl_id, jlong offset)
 {
     herr_t retVal = FAIL;
 
@@ -355,8 +350,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1family_1offset
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1family_1offset(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     hsize_t offset = 0;
     herr_t  retVal = FAIL;
@@ -375,8 +369,7 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5FD_hdfs_fapl_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs(JNIEnv *env, jclass clss, jlong fapl_id)
 {
 #ifdef H5_HAVE_LIBHDFS
     H5FD_hdfs_fapl_t fa;
@@ -387,7 +380,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs
     jstring          j_kerb_cache_path    = NULL;
     jint             j_stream_buffer_size = 0;
 #endif /* H5_HAVE_LIBHDFS */
-    jobject          ret_obj              = NULL;
+    jobject ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -397,7 +390,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs
 
     if (NULL == (j_namenode_name = ENVPTR->NewStringUTF(ENVONLY, fa.namenode_name))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_hdfs: out of memory - can't create namenode_name string");
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5Pget_fapl_hdfs: out of memory - can't create namenode_name string");
     }
     args[0].l = j_namenode_name;
 
@@ -411,13 +405,15 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs
 
     if (NULL == (j_kerb_cache_path = ENVPTR->NewStringUTF(ENVONLY, fa.kerberos_ticket_cache))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_hdfs: out of memory - can't create kerberos_ticket_cache string");
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5Pget_fapl_hdfs: out of memory - can't create kerberos_ticket_cache string");
     }
     args[3].l = j_kerb_cache_path;
 
     args[4].i = (jint)fa.stream_buffer_size;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5FD_hdfs_fapl_t", "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5FD_hdfs_fapl_t",
+                     "(Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;I)V", args, ret_obj);
 #else
     UNUSED(fapl_id);
 
@@ -434,15 +430,14 @@ done:
  * Signature: (JLhdf/hdf5lib/structs/H5FD_hdfs_fapl_t;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs
-    (JNIEnv *env, jclass clss, jlong fapl_id, jobject fapl_config)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs(JNIEnv *env, jclass clss, jlong fapl_id, jobject fapl_config)
 {
 #ifdef H5_HAVE_LIBHDFS
-    H5FD_hdfs_fapl_t  instance;
-    const char       *str = NULL;
-    jfieldID          fid;
-    jstring           j_str;
-    jclass            cls;
+    H5FD_hdfs_fapl_t instance;
+    const char *     str = NULL;
+    jfieldID         fid;
+    jstring          j_str;
+    jclass           cls;
 #endif /* H5_HAVE_LIBHDFS */
 
     UNUSED(clss);
@@ -508,7 +503,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
     if (j_str) {
-        PIN_JAVA_STRING(ENVONLY, j_str, str, NULL, "H5FDset_fapl_hdfs: fapl_config kerberos_ticket_cache not pinned");
+        PIN_JAVA_STRING(ENVONLY, j_str, str, NULL,
+                        "H5FDset_fapl_hdfs: fapl_config kerberos_ticket_cache not pinned");
 
         HDstrncpy(instance.kerberos_ticket_cache, str, H5FD__HDFS_KERB_CACHE_PATH_SPACE + 1);
         instance.kerberos_ticket_cache[H5FD__HDFS_KERB_CACHE_PATH_SPACE] = '\0';
@@ -526,7 +522,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
     if (H5Pset_fapl_hdfs((hid_t)fapl_id, &instance) < 0)
-            H5_LIBRARY_ERROR(ENVONLY);
+        H5_LIBRARY_ERROR(ENVONLY);
 #else
     UNUSED(fapl_id);
     UNUSED(fapl_config);
@@ -548,11 +544,11 @@ done:
  * Signature: (JLjava/lang/String;JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1log
-    (JNIEnv *env, jclass clss, jlong fapl_id, jstring logfile, jlong flags, jlong buf_size)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1log(JNIEnv *env, jclass clss, jlong fapl_id, jstring logfile, jlong flags,
+                                      jlong buf_size)
 {
     const char *pLogfile = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -591,24 +587,24 @@ done:
  * Signature: (J[I[J[Ljava/lang/String;[JZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
-    (JNIEnv *env, jclass clss, jlong tid, jintArray memb_map,
-        jlongArray memb_fapl, jobjectArray memb_name, jlongArray memb_addr, jboolean relax)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jintArray memb_map,
+                                        jlongArray memb_fapl, jobjectArray memb_name, jlongArray memb_addr,
+                                        jboolean relax)
 {
-    const char * const *mName = NULL;
-    const char         *utf8 = NULL;
-    jboolean            isCopy;
-    jboolean            bb;
-    jobject             o;
-    jstring             rstring;
-    jstring             obj;
-    jclass              Sjc;
-    size_t              i;
-    jlong              *thefaplArray = NULL;
-    jlong              *theaddrArray = NULL;
-    jint               *themapArray = NULL;
-    char               *member_name[H5FD_MEM_NTYPES];
-    herr_t              status = FAIL;
+    const char *const *mName = NULL;
+    const char *       utf8  = NULL;
+    jboolean           isCopy;
+    jboolean           bb;
+    jobject            o;
+    jstring            rstring;
+    jstring            obj;
+    jclass             Sjc;
+    size_t             i;
+    jlong *            thefaplArray = NULL;
+    jlong *            theaddrArray = NULL;
+    jint *             themapArray  = NULL;
+    char *             member_name[H5FD_MEM_NTYPES];
+    herr_t             status = FAIL;
 
     UNUSED(clss);
 
@@ -625,7 +621,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
         for (i = 0; i < H5FD_MEM_NTYPES; i++) {
             size_t str_len;
 
-            if (NULL == (obj = (jstring) ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray) memb_name, (jsize) i))) {
+            if (NULL ==
+                (obj = (jstring)ENVPTR->GetObjectArrayElement(ENVONLY, (jobjectArray)memb_name, (jsize)i))) {
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
                 /*
@@ -644,7 +641,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
 
             str_len = HDstrlen(utf8);
 
-            if (NULL == (member_name[i] = (char *) HDmalloc(str_len + 1)))
+            if (NULL == (member_name[i] = (char *)HDmalloc(str_len + 1)))
                 H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pset_fapl_multi: memory allocation failed");
 
             HDstrncpy(member_name[i], utf8, str_len + 1);
@@ -656,11 +653,11 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
             ENVPTR->DeleteLocalRef(ENVONLY, obj);
         }
 
-        mName = (const char * const *)member_name;
+        mName = (const char *const *)member_name;
     }
 
     if ((status = H5Pset_fapl_multi((hid_t)tid, (const H5FD_mem_t *)themapArray, (const hid_t *)thefaplArray,
-            mName, (const haddr_t *)theaddrArray, (hbool_t)relax)) < 0)
+                                    mName, (const haddr_t *)theaddrArray, (hbool_t)relax)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (memb_name && mName) {
@@ -668,14 +665,17 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         for (i = 0; i < H5FD_MEM_NTYPES; i++) {
-            if (!member_name[i]) continue;
+            if (!member_name[i])
+                continue;
 
             if (NULL == (rstring = ENVPTR->NewStringUTF(ENVONLY, member_name[i]))) {
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-                H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pset_fapl_multi: out of memory - unable to construct string from UTF characters");
+                H5_OUT_OF_MEMORY_ERROR(
+                    ENVONLY,
+                    "H5Pset_fapl_multi: out of memory - unable to construct string from UTF characters");
             }
 
-            if (NULL == (o = ENVPTR->GetObjectArrayElement(ENVONLY, memb_name, (jsize) i))) {
+            if (NULL == (o = ENVPTR->GetObjectArrayElement(ENVONLY, memb_name, (jsize)i))) {
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
                 /*
@@ -686,7 +686,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
             }
 
             if (JNI_TRUE == (bb = ENVPTR->IsInstanceOf(ENVONLY, o, Sjc))) {
-                ENVPTR->SetObjectArrayElement(ENVONLY, memb_name, (jsize) i, (jobject)rstring);
+                ENVPTR->SetObjectArrayElement(ENVONLY, memb_name, (jsize)i, (jobject)rstring);
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
             }
 
@@ -719,20 +719,19 @@ done:
  * Signature: (J[I[J[Ljava/lang/String;[J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi
-    (JNIEnv *env, jclass clss, jlong tid, jintArray memb_map,
-        jlongArray memb_fapl, jobjectArray memb_name, jlongArray memb_addr)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jintArray memb_map,
+                                        jlongArray memb_fapl, jobjectArray memb_name, jlongArray memb_addr)
 {
-    jboolean   isCopy;
-    jstring    str;
-    herr_t     status = FAIL;
-    size_t     i;
-    jlong     *thefaplArray = NULL;
-    jlong     *theaddrArray = NULL;
-    jint      *themapArray = NULL;
-    char     **mName = NULL;
-    int        relax = 0;
-    int        retVal = 0;
+    jboolean isCopy;
+    jstring  str;
+    herr_t   status = FAIL;
+    size_t   i;
+    jlong *  thefaplArray = NULL;
+    jlong *  theaddrArray = NULL;
+    jint *   themapArray  = NULL;
+    char **  mName        = NULL;
+    int      relax        = 0;
+    int      retVal       = 0;
 
     UNUSED(clss);
 
@@ -743,11 +742,11 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi
     if (memb_addr)
         PIN_LONG_ARRAY(ENVONLY, memb_addr, theaddrArray, &isCopy, "H5Pget_fapl_multi: memb_addr not pinned");
     if (memb_name)
-        if (NULL == (mName = (char **) HDcalloc(H5FD_MEM_NTYPES, sizeof(*mName))))
+        if (NULL == (mName = (char **)HDcalloc(H5FD_MEM_NTYPES, sizeof(*mName))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_multi: memory allocation failed");
 
-    if ((status = H5Pget_fapl_multi((hid_t)tid, (H5FD_mem_t *)themapArray, (hid_t *)thefaplArray,
-            mName, (haddr_t *)theaddrArray, (hbool_t *)&relax)) < 0)
+    if ((status = H5Pget_fapl_multi((hid_t)tid, (H5FD_mem_t *)themapArray, (hid_t *)thefaplArray, mName,
+                                    (haddr_t *)theaddrArray, (hbool_t *)&relax)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (memb_name && mName) {
@@ -755,10 +754,12 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi
             if (mName[i]) {
                 if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, mName[i]))) {
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-                    H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_multi: out of memory - unable to construct string from UTF characters");
+                    H5_OUT_OF_MEMORY_ERROR(
+                        ENVONLY,
+                        "H5Pget_fapl_multi: out of memory - unable to construct string from UTF characters");
                 }
 
-                ENVPTR->SetObjectArrayElement(ENVONLY, memb_name, (jsize) i, (jobject)str);
+                ENVPTR->SetObjectArrayElement(ENVONLY, memb_name, (jsize)i, (jobject)str);
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
                 ENVPTR->DeleteLocalRef(ENVONLY, str);
@@ -794,17 +795,16 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5FD_ros3_fapl_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id)
 {
 #ifdef H5_HAVE_ROS3_VFD
     H5FD_ros3_fapl_t fa;
     jvalue           args[3];
-    jstring          j_aws   = NULL;
-    jstring          j_id    = NULL;
-    jstring          j_key   = NULL;
+    jstring          j_aws = NULL;
+    jstring          j_id  = NULL;
+    jstring          j_key = NULL;
 #endif /* H5_HAVE_ROS3_VFD */
-    jobject          ret_obj = NULL;
+    jobject ret_obj = NULL;
 
     UNUSED(clss);
 
@@ -832,7 +832,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3
     }
     args[2].l = j_key;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5FD_ros3_fapl_t", "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5FD_ros3_fapl_t",
+                     "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V", args, ret_obj);
 #else
     UNUSED(fapl_id);
 
@@ -849,15 +850,14 @@ done:
  * Signature: (JLhdf/hdf5lib/structs/H5FD_ros3_fapl_t;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3
-    (JNIEnv *env, jclass clss, jlong fapl_id, jobject fapl_config)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id, jobject fapl_config)
 {
 #ifdef H5_HAVE_ROS3_VFD
-    H5FD_ros3_fapl_t  instance;
-    const char       *str = NULL;
-    jfieldID          fid;
-    jstring           j_str;
-    jclass            cls;
+    H5FD_ros3_fapl_t instance;
+    const char *     str = NULL;
+    jfieldID         fid;
+    jstring          j_str;
+    jclass           cls;
 #endif /* H5_HAVE_ROS3_VFD */
 
     UNUSED(clss);
@@ -928,7 +928,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3
     else
         HDmemset(instance.secret_key, 0, H5FD_ROS3_MAX_SECRET_KEY_LEN + 1);
 
-    if (instance.aws_region[0] != '\0' && instance.secret_id[0] !='\0' && instance.secret_key[0] !='\0')
+    if (instance.aws_region[0] != '\0' && instance.secret_id[0] != '\0' && instance.secret_key[0] != '\0')
         instance.authenticate = TRUE;
 
     if (H5Pset_fapl_ros3((hid_t)fapl_id, &instance) < 0)
@@ -954,11 +954,11 @@ done:
  * Signature: (JLjava/lang/String;JLjava/lang/String;J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1split
-    (JNIEnv *env, jclass clss, jlong fapl_id, jstring metaext, jlong meta_pl_id, jstring rawext, jlong raw_pl_id)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1split(JNIEnv *env, jclass clss, jlong fapl_id, jstring metaext,
+                                        jlong meta_pl_id, jstring rawext, jlong raw_pl_id)
 {
-    const char *mstr = NULL;
-    const char *rstr = NULL;
+    const char *mstr   = NULL;
+    const char *rstr   = NULL;
     herr_t      retVal = FAIL;
 
     UNUSED(clss);
@@ -987,14 +987,13 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1sec2
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1sec2(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pset_fapl_sec2((hid_t) fapl_id)) < 0)
+    if ((retVal = H5Pset_fapl_sec2((hid_t)fapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1007,14 +1006,13 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1stdio
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1stdio(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pset_fapl_stdio((hid_t) fapl_id)) < 0)
+    if ((retVal = H5Pset_fapl_stdio((hid_t)fapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1027,15 +1025,14 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1windows
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pset_1fapl_1windows(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
 #ifdef H5_HAVE_WINDOWS
-    if ((retVal = H5Pset_fapl_windows((hid_t) fapl_id)) < 0)
+    if ((retVal = H5Pset_fapl_windows((hid_t)fapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1068,8 +1065,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1meta_1block_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1meta_1block_1size(JNIEnv *env, jclass clss, jlong plist, jlong size)
 {
     long sz = (long)size;
 
@@ -1088,8 +1084,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1meta_1block_1size
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1meta_1block_1size(JNIEnv *env, jclass clss, jlong plist)
 {
     hsize_t s = 0;
 
@@ -1116,8 +1111,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sieve_1buf_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1sieve_1buf_1size(JNIEnv *env, jclass clss, jlong plist, jlong size)
 {
     size_t sz = (size_t)size;
 
@@ -1136,8 +1130,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sieve_1buf_1size
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1sieve_1buf_1size(JNIEnv *env, jclass clss, jlong plist)
 {
     size_t s = 0;
 
@@ -1156,11 +1149,10 @@ done:
  * Signature: (JJJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1alignment
-    (JNIEnv *env, jclass clss, jlong plist, jlong threshold, jlong alignment)
+Java_hdf_hdf5lib_H5_H5Pset_1alignment(JNIEnv *env, jclass clss, jlong plist, jlong threshold, jlong alignment)
 {
-    long   thr = (long)threshold;
-    long   align = (long)alignment;
+    long   thr    = (long)threshold;
+    long   align  = (long)alignment;
     herr_t retVal = FAIL;
 
     UNUSED(clss);
@@ -1178,15 +1170,14 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1alignment
-    (JNIEnv *env, jclass clss, jlong plist, jlongArray alignment)
+Java_hdf_hdf5lib_H5_H5Pget_1alignment(JNIEnv *env, jclass clss, jlong plist, jlongArray alignment)
 {
-    jboolean  isCopy;
-    hsize_t   t = 0;
-    hsize_t   a = 0;
-    jsize     arrLen;
-    jlong    *theArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t  t = 0;
+    hsize_t  a = 0;
+    jsize    arrLen;
+    jlong *  theArray = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -1221,16 +1212,15 @@ done:
  * Signature: (JIJJD)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1cache
-    (JNIEnv *env, jclass clss, jlong plist, jint mdc_nelmts, jlong rdcc_nelmts,
-  jlong rdcc_nbytes, jdouble rdcc_w0)
+Java_hdf_hdf5lib_H5_H5Pset_1cache(JNIEnv *env, jclass clss, jlong plist, jint mdc_nelmts, jlong rdcc_nelmts,
+                                  jlong rdcc_nbytes, jdouble rdcc_w0)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pset_cache((hid_t)plist, (int)mdc_nelmts, (size_t)rdcc_nelmts,
-            (size_t)rdcc_nbytes, (double) rdcc_w0)) < 0)
+    if ((retVal = H5Pset_cache((hid_t)plist, (int)mdc_nelmts, (size_t)rdcc_nelmts, (size_t)rdcc_nbytes,
+                               (double)rdcc_w0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1243,15 +1233,14 @@ done:
  * Signature: (J[I[J[J[D)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1cache
-    (JNIEnv *env, jclass clss, jlong plist, jintArray mdc_nelmts,
-        jlongArray rdcc_nelmts, jlongArray rdcc_nbytes, jdoubleArray rdcc_w0)
+Java_hdf_hdf5lib_H5_H5Pget_1cache(JNIEnv *env, jclass clss, jlong plist, jintArray mdc_nelmts,
+                                  jlongArray rdcc_nelmts, jlongArray rdcc_nbytes, jdoubleArray rdcc_w0)
 {
-    jboolean  isCopy;
-    jdouble  *w0Array = NULL;
-    jlong    *rdcc_nelmtsArray = NULL;
-    jlong    *nbytesArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jdouble *w0Array          = NULL;
+    jlong *  rdcc_nelmtsArray = NULL;
+    jlong *  nbytesArray      = NULL;
+    herr_t   status           = FAIL;
 
     UNUSED(clss);
     UNUSED(mdc_nelmts);
@@ -1259,23 +1248,25 @@ Java_hdf_hdf5lib_H5_H5Pget_1cache
     if (NULL != rdcc_w0)
         PIN_DOUBLE_ARRAY(ENVONLY, rdcc_w0, w0Array, &isCopy, "H5Pget_cache: rdcc_w0 array not pinned");
     if (NULL != rdcc_nelmts)
-        PIN_LONG_ARRAY(ENVONLY, rdcc_nelmts, rdcc_nelmtsArray, &isCopy, "H5Pget_cache: rdcc_nelmts array not pinned");
+        PIN_LONG_ARRAY(ENVONLY, rdcc_nelmts, rdcc_nelmtsArray, &isCopy,
+                       "H5Pget_cache: rdcc_nelmts array not pinned");
     if (NULL != rdcc_nbytes)
-        PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy, "H5Pget_cache: nbytesArray array not pinned");
+        PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy,
+                       "H5Pget_cache: nbytesArray array not pinned");
 
     {
         /* direct cast (size_t *)variable fails on 32-bit environment */
         long long rdcc_nelmts_temp = *rdcc_nelmtsArray;
-        long long nbytes_temp = *nbytesArray;
-        size_t    rdcc_nelmts_t = (size_t) rdcc_nelmts_temp;
-        size_t    nbytes_t = (size_t) nbytes_temp;
+        long long nbytes_temp      = *nbytesArray;
+        size_t    rdcc_nelmts_t    = (size_t)rdcc_nelmts_temp;
+        size_t    nbytes_t         = (size_t)nbytes_temp;
 
-        if ((status = H5Pget_cache((hid_t)plist, (int *)NULL, &rdcc_nelmts_t,
-                &nbytes_t, (double *)w0Array)) < 0)
+        if ((status = H5Pget_cache((hid_t)plist, (int *)NULL, &rdcc_nelmts_t, &nbytes_t, (double *)w0Array)) <
+            0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         *rdcc_nelmtsArray = (jlong)rdcc_nelmts_t;
-        *nbytesArray = (jlong)nbytes_t;
+        *nbytesArray      = (jlong)nbytes_t;
     } /* end direct cast special */
 
 done:
@@ -1295,8 +1286,7 @@ done:
  * Signature: (JI)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1file_1cache_1size
-    (JNIEnv *env, jclass clss, jlong plist, jint size)
+Java_hdf_hdf5lib_H5_H5Pset_1elink_1file_1cache_1size(JNIEnv *env, jclass clss, jlong plist, jint size)
 {
     unsigned sz = (unsigned)size;
 
@@ -1315,8 +1305,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1file_1cache_1size
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1elink_1file_1cache_1size(JNIEnv *env, jclass clss, jlong plist)
 {
     unsigned s = 0;
 
@@ -1335,11 +1324,10 @@ done:
  * Signature: (JZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close
-    (JNIEnv *env, jclass clss, jlong fapl_id, jboolean evict_on_close)
+Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close(JNIEnv *env, jclass clss, jlong fapl_id, jboolean evict_on_close)
 {
     hbool_t evict_on_close_val = FALSE;
-    herr_t  retVal = FAIL;
+    herr_t  retVal             = FAIL;
 
     UNUSED(clss);
 
@@ -1358,11 +1346,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     hbool_t  evict_on_close_val = FALSE;
-    jboolean bval = JNI_FALSE;
+    jboolean bval               = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -1381,15 +1368,15 @@ done:
  * Signature: (JZZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1locking
-    (JNIEnv *env, jclass clss, jlong fapl_id, jboolean use_file_locking, jboolean ignore_when_disabled)
+Java_hdf_hdf5lib_H5_H5Pset_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id, jboolean use_file_locking,
+                                          jboolean ignore_when_disabled)
 {
-    hbool_t use_file_locking_val = TRUE;
+    hbool_t use_file_locking_val     = TRUE;
     hbool_t ignore_when_disabled_val = TRUE;
 
     UNUSED(clss);
 
-    use_file_locking_val = (use_file_locking == JNI_TRUE) ? TRUE : FALSE;
+    use_file_locking_val     = (use_file_locking == JNI_TRUE) ? TRUE : FALSE;
     ignore_when_disabled_val = (ignore_when_disabled == JNI_TRUE) ? TRUE : FALSE;
 
     if (H5Pset_file_locking((hid_t)fapl_id, use_file_locking_val, ignore_when_disabled_val) < 0)
@@ -1405,12 +1392,11 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id)
 {
-    hbool_t     use_file_locking_val    = TRUE;
-    hbool_t     unused                  = TRUE;
-    jboolean    bval                    = JNI_FALSE;
+    hbool_t  use_file_locking_val = TRUE;
+    hbool_t  unused               = TRUE;
+    jboolean bval                 = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -1429,12 +1415,11 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id)
 {
-    hbool_t     ignore_when_disabled_val    = TRUE;
-    hbool_t     unused                      = TRUE;
-    jboolean    bval                        = JNI_FALSE;
+    hbool_t  ignore_when_disabled_val = TRUE;
+    hbool_t  unused                   = TRUE;
+    jboolean bval                     = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -1453,8 +1438,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
-    (JNIEnv *env, jclass clss, jlong plist_id, jlong attempts)
+Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts(JNIEnv *env, jclass clss, jlong plist_id, jlong attempts)
 {
     UNUSED(clss);
 
@@ -1474,8 +1458,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts
-    (JNIEnv *env, jclass clss, jlong plist_id)
+Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts(JNIEnv *env, jclass clss, jlong plist_id)
 {
     unsigned attempts = 0;
 
@@ -1485,7 +1468,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) attempts;
+    return (jlong)attempts;
 } /* end Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts */
 
 /*
@@ -1494,18 +1477,17 @@ done:
  * Signature: (JLhdf/hdf5lib/structs/H5AC_cache_config_t;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config
-    (JNIEnv *env, jclass clss, jlong plist, jobject cache_config)
+Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config(JNIEnv *env, jclass clss, jlong plist, jobject cache_config)
 {
-    H5AC_cache_config_t  cacheinfo;
-    const char          *str = NULL;
-    jfieldID             fid;
-    jstring              j_str;
-    jclass               cls;
-    jint                 flash_incr_mode;
-    jint                 incr_mode;
-    jint                 decr_mode;
-    herr_t               status = FAIL;
+    H5AC_cache_config_t cacheinfo;
+    const char *        str = NULL;
+    jfieldID            fid;
+    jstring             j_str;
+    jclass              cls;
+    jint                flash_incr_mode;
+    jint                incr_mode;
+    jint                decr_mode;
+    herr_t              status = FAIL;
 
     UNUSED(clss);
 
@@ -1603,7 +1585,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config
 
     incr_mode = ENVPTR->GetIntField(ENVONLY, cache_config, fid); /*(enum H5C_cache_incr_mode) */
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-    cacheinfo.incr_mode = (enum H5C_cache_incr_mode) incr_mode;
+    cacheinfo.incr_mode = (enum H5C_cache_incr_mode)incr_mode;
 
     if (NULL == (fid = ENVPTR->GetFieldID(ENVONLY, cls, "lower_hr_threshold", "D")))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -1634,7 +1616,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config
 
     flash_incr_mode = ENVPTR->GetIntField(ENVONLY, cache_config, fid); /*(enum H5C_cache_flash_incr_mode) */
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-    cacheinfo.flash_incr_mode = (enum H5C_cache_flash_incr_mode) flash_incr_mode;
+    cacheinfo.flash_incr_mode = (enum H5C_cache_flash_incr_mode)flash_incr_mode;
 
     if (NULL == (fid = ENVPTR->GetFieldID(ENVONLY, cls, "flash_multiple", "D")))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -1653,7 +1635,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config
 
     decr_mode = ENVPTR->GetIntField(ENVONLY, cache_config, fid); /*(enum H5C_cache_decr_mode) */
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-    cacheinfo.decr_mode = (enum H5C_cache_decr_mode) decr_mode;
+    cacheinfo.decr_mode = (enum H5C_cache_decr_mode)decr_mode;
 
     if (NULL == (fid = ENVPTR->GetFieldID(ENVONLY, cls, "upper_hr_threshold", "D")))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -1723,13 +1705,12 @@ done:
  * Signature: (J)Lhdf/hdf5lib/structs/H5AC_cache_config_t;
  */
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config(JNIEnv *env, jclass clss, jlong plist)
 {
     H5AC_cache_config_t cacheinfo;
     jstring             j_str = NULL;
     jvalue              args[30];
-    herr_t              status = FAIL;
+    herr_t              status  = FAIL;
     jobject             ret_obj = NULL;
 
     UNUSED(clss);
@@ -1747,15 +1728,16 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config
 
     if (NULL == (j_str = ENVPTR->NewStringUTF(ENVONLY, cacheinfo.trace_file_name))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_mdc_config: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_mdc_config: out of memory - unable to construct string from UTF characters");
     }
 
-    args[4].l = j_str;
-    args[5].z = cacheinfo.evictions_enabled;
-    args[6].z = cacheinfo.set_initial_size;
-    args[7].j = (jlong)cacheinfo.initial_size;
-    args[8].d = cacheinfo.min_clean_fraction;
-    args[9].j = (jlong)cacheinfo.max_size;
+    args[4].l  = j_str;
+    args[5].z  = cacheinfo.evictions_enabled;
+    args[6].z  = cacheinfo.set_initial_size;
+    args[7].j  = (jlong)cacheinfo.initial_size;
+    args[8].d  = cacheinfo.min_clean_fraction;
+    args[9].j  = (jlong)cacheinfo.max_size;
     args[10].j = (jlong)cacheinfo.min_size;
     args[11].j = cacheinfo.epoch_length;
     args[12].i = cacheinfo.incr_mode;
@@ -1777,7 +1759,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config
     args[28].j = (jlong)cacheinfo.dirty_bytes_threshold;
     args[29].i = cacheinfo.metadata_write_strategy;
 
-    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5AC_cache_config_t", "(IZZZLjava/lang/String;ZZJDJJJIDDZJIDDIDDZJIZDJI)V", args, ret_obj);
+    CALL_CONSTRUCTOR(ENVONLY, "hdf/hdf5lib/structs/H5AC_cache_config_t",
+                     "(IZZZLjava/lang/String;ZZJDJJJIDDZJIDDIDDZJIZDJI)V", args, ret_obj);
 
 done:
     return ret_obj;
@@ -1797,8 +1780,8 @@ done:
  * Signature: (JZLjava/lang/String;Z)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options
-    (JNIEnv *env, jclass clss, jlong fapl_id, jboolean is_enabled, jstring location, jboolean start_on_access)
+Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fapl_id, jboolean is_enabled,
+                                              jstring location, jboolean start_on_access)
 {
     const char *locStr = NULL;
     herr_t      retVal = FAIL;
@@ -1810,7 +1793,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options
 
     PIN_JAVA_STRING(ENVONLY, location, locStr, NULL, "H5Pset_mdc_log_options: location string not pinned");
 
-    if ((retVal = H5Pset_mdc_log_options((hid_t)fapl_id, (hbool_t)is_enabled, locStr, (hbool_t)start_on_access)) < 0)
+    if ((retVal = H5Pset_mdc_log_options((hid_t)fapl_id, (hbool_t)is_enabled, locStr,
+                                         (hbool_t)start_on_access)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1824,18 +1808,18 @@ done:
  * Signature: (J[Z)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
-    (JNIEnv *env, jclass clss, jlong fapl_id, jbooleanArray mdc_log_options)
+Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fapl_id,
+                                              jbooleanArray mdc_log_options)
 {
-    jboolean   isCopy;
-    jboolean  *mdc_log_options_ptr = NULL;
-    hbool_t    is_enabled;
-    hbool_t    start_on_access;
-    ssize_t    status = -1;
-    size_t     location_size;
-    jsize      arrLen;
-    char      *lname = NULL;
-    jstring    str = NULL;
+    jboolean  isCopy;
+    jboolean *mdc_log_options_ptr = NULL;
+    hbool_t   is_enabled;
+    hbool_t   start_on_access;
+    ssize_t   status = -1;
+    size_t    location_size;
+    jsize     arrLen;
+    char *    lname = NULL;
+    jstring   str   = NULL;
 
     UNUSED(clss);
 
@@ -1849,7 +1833,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
     if (arrLen < 2)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_mdc_log_options: length of mdc_log_options < 2");
 
-    PIN_BOOL_ARRAY(ENVONLY, mdc_log_options, mdc_log_options_ptr, &isCopy, "H5Pget_mdc_log_options: mdc_log_options array not pinned");
+    PIN_BOOL_ARRAY(ENVONLY, mdc_log_options, mdc_log_options_ptr, &isCopy,
+                   "H5Pget_mdc_log_options: mdc_log_options array not pinned");
 
     /* get the length of the filename */
     if (H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, NULL, &location_size, &start_on_access) < 0)
@@ -1859,16 +1844,19 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_mdc_log_options: location_size is 0");
 
     location_size++; /* add extra space for the null terminator */
-    if (NULL == (lname = (char *) HDmalloc(sizeof(char) * location_size)))
+    if (NULL == (lname = (char *)HDmalloc(sizeof(char) * location_size)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_mdc_log_options: memory allocation failed");
 
-    if ((status = H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, lname, &location_size, &start_on_access)) < 0)
+    if ((status = H5Pget_mdc_log_options((hid_t)fapl_id, &is_enabled, lname, &location_size,
+                                         &start_on_access)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     lname[location_size - 1] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, lname))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_mdc_log_options: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY,
+            "H5Pget_mdc_log_options: out of memory - unable to construct string from UTF characters");
     }
 
     mdc_log_options_ptr[0] = (jboolean)is_enabled;
@@ -1905,11 +1893,10 @@ done:
  * Signature: (JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1gc_1references
-    (JNIEnv *env, jclass clss, jlong fapl_id, jboolean gc_ref)
+Java_hdf_hdf5lib_H5_H5Pset_1gc_1references(JNIEnv *env, jclass clss, jlong fapl_id, jboolean gc_ref)
 {
     unsigned gc_ref_val = 0;
-    herr_t   retVal = FAIL;
+    herr_t   retVal     = FAIL;
 
     UNUSED(clss);
 
@@ -1928,11 +1915,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1gc_1references
-    (JNIEnv *env, jclass clss, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1gc_1references(JNIEnv *env, jclass clss, jlong fapl_id)
 {
     unsigned gc_ref_val = 0;
-    jboolean bval = JNI_FALSE;
+    jboolean bval       = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -1951,10 +1937,9 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1small_1data_1block_1size
-    (JNIEnv *env, jclass clss, jlong plist, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1small_1data_1block_1size(JNIEnv *env, jclass clss, jlong plist, jlong size)
 {
-    long   sz = (long)size;
+    long   sz     = (long)size;
     herr_t retVal = FAIL;
 
     UNUSED(clss);
@@ -1972,8 +1957,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1small_1data_1block_1size
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1small_1data_1block_1size(JNIEnv *env, jclass clss, jlong plist)
 {
     hsize_t s = 0;
 
@@ -1992,8 +1976,7 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1libver_1bounds
-    (JNIEnv *env, jclass clss, jlong fapl_id, jint low, jint high)
+Java_hdf_hdf5lib_H5_H5Pset_1libver_1bounds(JNIEnv *env, jclass clss, jlong fapl_id, jint low, jint high)
 {
     herr_t retVal = FAIL;
 
@@ -2012,12 +1995,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds
-    (JNIEnv *env, jclass clss, jlong fapl_id, jintArray libver)
+Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds(JNIEnv *env, jclass clss, jlong fapl_id, jintArray libver)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -2026,7 +2008,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds
 
     PIN_INT_ARRAY(ENVONLY, libver, theArray, &isCopy, "H5Pget_libver_bounds: input not pinned");
 
-    if ((retVal = H5Pget_libver_bounds((hid_t)fapl_id, (H5F_libver_t *)&(theArray[0]), (H5F_libver_t *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_libver_bounds((hid_t)fapl_id, (H5F_libver_t *)&(theArray[0]),
+                                       (H5F_libver_t *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5pFAPLImp.h b/java/src/jni/h5pFAPLImp.h
index b9b4556..780ebc4 100644
--- a/java/src/jni/h5pFAPLImp.h
+++ b/java/src/jni/h5pFAPLImp.h
@@ -29,9 +29,7 @@ extern "C" {
  * Method:    H5Pget_driver
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1driver
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1driver(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pget_driver_info
@@ -42,36 +40,29 @@ Java_hdf_hdf5lib_H5_H5Pget_1driver
  * Method:    H5Pset_fclose_degree
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fclose_1degree
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fclose_1degree(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fclose_degree
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fclose_1degree
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fclose_1degree(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_core
  * Signature: (JJZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1core
-(JNIEnv *, jclass, jlong, jlong, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1core(JNIEnv *, jclass, jlong, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fapl_core
  * Signature: (J[J[Z)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core
-(JNIEnv *, jclass, jlong, jlongArray, jbooleanArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core(JNIEnv *, jclass, jlong, jlongArray,
+                                                              jbooleanArray);
 
 /*
  * TODO: H5Pset_core_write_tracking
@@ -86,81 +77,64 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core
  * Method:    H5Pset_fapl_direct
  * Signature: (JJJJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1direct
-(JNIEnv *, jclass, jlong, jlong, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1direct(JNIEnv *, jclass, jlong, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fapl_direct
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct
-(JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1direct(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_family
  * Signature: (JJJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1family
-(JNIEnv *, jclass, jlong, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1family(JNIEnv *, jclass, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fapl_family
  * Signature: (J[J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family
-(JNIEnv *, jclass, jlong, jlongArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1family(JNIEnv *, jclass, jlong, jlongArray,
+                                                                jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_family_offset
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1family_1offset
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1family_1offset(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_family_offset
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1family_1offset
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1family_1offset(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fapl_hdfs
  * Signature: (J)Lhdf/hdf5lib/structs/H5FD_hdfs_fapl_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1hdfs(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_hdfs
  * Signature: (JLhdf/hdf5lib/structs/H5FD_hdfs_fapl_t;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs
-(JNIEnv *, jclass, jlong, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1hdfs(JNIEnv *, jclass, jlong, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_log
  * Signature: (JLjava/lang/String;JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1log
-(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1log(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
 
 /*
  * TODO: H5Pset_fapl_mpio
@@ -183,18 +157,16 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1log
  * Method:    H5Pset_fapl_multi
  * Signature: (J[I[J[Ljava/lang/String;[JZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi
-(JNIEnv *, jclass, jlong, jintArray, jlongArray, jobjectArray, jlongArray, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *, jclass, jlong, jintArray, jlongArray,
+                                                               jobjectArray, jlongArray, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_fapl_multi
  * Signature: (J[I[J[Ljava/lang/String;[J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi
-(JNIEnv *, jclass, jlong, jintArray, jlongArray, jobjectArray, jlongArray);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi(JNIEnv *, jclass, jlong, jintArray,
+                                                                   jlongArray, jobjectArray, jlongArray);
 
 /*
  * TODO: H5Pset_multi_type
@@ -209,54 +181,43 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi
  * Method:    H5Pget_fapl_ros3
  * Signature: (J)Lhdf/hdf5lib/structs/H5FD_ros3_fapl_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Pget_1fapl_1ros3(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_ros3
  * Signature: (JLhdf/hdf5lib/structs/H5FD_ros3_fapl_t;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3
-(JNIEnv *, jclass, jlong, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *, jclass, jlong, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_split
  * Signature: (JLjava/lang/String;JLjava/lang/String;J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1split
-(JNIEnv *, jclass, jlong, jstring, jlong, jstring, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1split(JNIEnv *, jclass, jlong, jstring, jlong,
+                                                               jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_sec2
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1sec2
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1sec2(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_stdio
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1stdio
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1stdio(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_fapl_windows
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1fapl_1windows
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1fapl_1windows(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pset_file_image
@@ -279,18 +240,14 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1windows
  * Method:    H5Pset_meta_block_size
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1meta_1block_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1meta_1block_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_meta_block_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1meta_1block_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1meta_1block_1size(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pset_page_buffer_size
@@ -305,153 +262,126 @@ Java_hdf_hdf5lib_H5_H5Pget_1meta_1block_1size
  * Method:    H5Pset_sieve_buf_size
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sieve_1buf_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1sieve_1buf_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_sieve_buf_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sieve_1buf_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1sieve_1buf_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_alignment
  * Signature: (JJJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1alignment
-(JNIEnv *, jclass, jlong, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1alignment(JNIEnv *, jclass, jlong, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_alignment
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1alignment
-(JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1alignment(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_cache
  * Signature: (JIJJD)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1cache
-(JNIEnv *, jclass, jlong, jint, jlong, jlong, jdouble);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1cache(JNIEnv *, jclass, jlong, jint, jlong, jlong,
+                                                         jdouble);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_cache
  * Signature: (J[I[J[J[D)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1cache
-(JNIEnv *, jclass, jlong, jintArray, jlongArray, jlongArray, jdoubleArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1cache(JNIEnv *, jclass, jlong, jintArray, jlongArray,
+                                                         jlongArray, jdoubleArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_elink_file_cache_size
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1file_1cache_1size
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1elink_1file_1cache_1size(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_elink_file_cache_size
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1file_1cache_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1elink_1file_1cache_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_evict_on_close
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close
-(JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_evict_on_close
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_file_locking
  * Signature: (JZZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1locking
-(JNIEnv *env, jclass clss, jlong fapl_id, jboolean use_file_locking, jboolean ignore_when_disabled);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id,
+                                                                 jboolean use_file_locking,
+                                                                 jboolean ignore_when_disabled);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_use_file_locking
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking
-(JNIEnv *env, jclass clss, jlong fapl_id);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking(JNIEnv *env, jclass clss,
+                                                                          jlong fapl_id);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_ignore_disabled_file_locking
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking
-(JNIEnv *env, jclass clss, jlong fapl_id);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking(JNIEnv *env,
+                                                                                       jclass  clss,
+                                                                                       jlong   fapl_id);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_metadata_read_attempts
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1metadata_1read_1attempts(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_metadata_read_attempts
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1metadata_1read_1attempts(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_mdc_config
  * Signature: (JLhdf/hdf5lib/structs/H5AC_cache_config_t;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config
-(JNIEnv *, jclass, jlong, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1mdc_1config(JNIEnv *, jclass, jlong, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_mdc_config
  * Signature: (J)Lhdf/hdf5lib/structs/H5AC_cache_config_t;
  */
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pset_mdc_image_config
@@ -466,18 +396,16 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1config
  * Method:    H5Pset_mdc_log_options
  * Signature: (JZLjava/lang/String;Z)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options
-(JNIEnv *, jclass, jlong, jboolean, jstring, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options(JNIEnv *, jclass, jlong, jboolean,
+                                                                     jstring, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_mdc_log_options
  * Signature: (J[Z)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
-(JNIEnv *, jclass, jlong, jbooleanArray);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options(JNIEnv *, jclass, jlong,
+                                                                        jbooleanArray);
 
 /*
  * TODO: H5Pset_all_coll_metadata_ops
@@ -500,54 +428,42 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options
  * Method:    H5Pset_gc_references
  * Signature: (JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1gc_1references
-(JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1gc_1references(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_gc_references
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1gc_1references
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1gc_1references(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_small_data_block_size
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1small_1data_1block_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1small_1data_1block_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_small_data_block_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1small_1data_1block_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1small_1data_1block_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_libver_bounds
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1libver_1bounds
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1libver_1bounds(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_libver_bounds
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1libver_1bounds(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * TODO: H5Pset_object_flush_cb
diff --git a/java/src/jni/h5pFCPLImp.c b/java/src/jni/h5pFCPLImp.c
index 2160496..fcb590e 100644
--- a/java/src/jni/h5pFCPLImp.c
+++ b/java/src/jni/h5pFCPLImp.c
@@ -37,10 +37,9 @@ extern "C" {
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1userblock
-    (JNIEnv *env, jclass clss, jlong plist, jlong size)
+Java_hdf_hdf5lib_H5_H5Pset_1userblock(JNIEnv *env, jclass clss, jlong plist, jlong size)
 {
-    long   sz = (long) size;
+    long   sz     = (long)size;
     herr_t retVal = FAIL;
 
     UNUSED(clss);
@@ -58,13 +57,12 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1userblock
-    (JNIEnv *env, jclass clss, jlong plist, jlongArray size)
+Java_hdf_hdf5lib_H5_H5Pget_1userblock(JNIEnv *env, jclass clss, jlong plist, jlongArray size)
 {
-    jboolean  isCopy;
-    hsize_t   s;
-    jlong    *theArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t  s;
+    jlong *  theArray = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -91,8 +89,7 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sizes
-    (JNIEnv *env, jclass clss, jlong plist, jint sizeof_addr, jint sizeof_size)
+Java_hdf_hdf5lib_H5_H5Pset_1sizes(JNIEnv *env, jclass clss, jlong plist, jint sizeof_addr, jint sizeof_size)
 {
     herr_t retVal = FAIL;
 
@@ -111,15 +108,14 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sizes
-    (JNIEnv *env, jclass clss, jlong plist, jlongArray size)
+Java_hdf_hdf5lib_H5_H5Pget_1sizes(JNIEnv *env, jclass clss, jlong plist, jlongArray size)
 {
-    jboolean  isCopy;
-    jlong    *theArray = NULL;
-    jsize     arrLen;
-    size_t    ss;
-    size_t    sa;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jlong *  theArray = NULL;
+    jsize    arrLen;
+    size_t   ss;
+    size_t   sa;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -154,8 +150,7 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sym_1k
-    (JNIEnv *env, jclass clss, jlong plist, jint ik, jint lk)
+Java_hdf_hdf5lib_H5_H5Pset_1sym_1k(JNIEnv *env, jclass clss, jlong plist, jint ik, jint lk)
 {
     herr_t retVal = FAIL;
 
@@ -174,13 +169,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sym_1k
-    (JNIEnv *env, jclass clss, jlong plist, jintArray size)
+Java_hdf_hdf5lib_H5_H5Pget_1sym_1k(JNIEnv *env, jclass clss, jlong plist, jintArray size)
 {
-    jboolean  isCopy;
-    jsize     arrLen;
-    jint     *theArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jsize    arrLen;
+    jint *   theArray = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -212,8 +206,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1istore_1k
-    (JNIEnv *env, jclass clss, jlong plist, jint ik)
+Java_hdf_hdf5lib_H5_H5Pset_1istore_1k(JNIEnv *env, jclass clss, jlong plist, jint ik)
 {
     herr_t retVal = FAIL;
 
@@ -232,12 +225,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1istore_1k
-    (JNIEnv *env, jclass clss, jlong plist, jintArray ik)
+Java_hdf_hdf5lib_H5_H5Pget_1istore_1k(JNIEnv *env, jclass clss, jlong plist, jintArray ik)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   status   = FAIL;
 
     UNUSED(clss);
 
@@ -262,8 +254,7 @@ done:
  * Signature: (JJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1page_1size
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jlong fsp_size)
+Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1page_1size(JNIEnv *env, jclass clss, jlong fcpl_id, jlong fsp_size)
 {
     UNUSED(clss);
 
@@ -280,8 +271,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1page_1size
-    (JNIEnv *env, jclass clss, jlong fcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1page_1size(JNIEnv *env, jclass clss, jlong fcpl_id)
 {
     hsize_t fsp_size = 0;
 
@@ -300,12 +290,13 @@ done:
  * Signature: (JIZJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1strategy
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jint strategy, jboolean persist, jlong threshold)
+Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1strategy(JNIEnv *env, jclass clss, jlong fcpl_id, jint strategy,
+                                                  jboolean persist, jlong threshold)
 {
     UNUSED(clss);
 
-    if (H5Pset_file_space_strategy((hid_t)fcpl_id, (H5F_fspace_strategy_t)strategy, (hbool_t)persist, (hsize_t)threshold) < 0)
+    if (H5Pset_file_space_strategy((hid_t)fcpl_id, (H5F_fspace_strategy_t)strategy, (hbool_t)persist,
+                                   (hsize_t)threshold) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -318,23 +309,25 @@ done:
  * Signature: (J[Z[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jbooleanArray persist, jlongArray threshold)
+Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy(JNIEnv *env, jclass clss, jlong fcpl_id,
+                                                  jbooleanArray persist, jlongArray threshold)
 {
-    H5F_fspace_strategy_t  thestrategy = H5F_FSPACE_STRATEGY_FSM_AGGR; /* Library default */
-    jboolean               isCopy;
-    jboolean              *persistArray = NULL;
-    jlong                 *thresholdArray = NULL;
-    herr_t                 status = FAIL;
+    H5F_fspace_strategy_t thestrategy = H5F_FSPACE_STRATEGY_FSM_AGGR; /* Library default */
+    jboolean              isCopy;
+    jboolean *            persistArray   = NULL;
+    jlong *               thresholdArray = NULL;
+    herr_t                status         = FAIL;
 
     UNUSED(clss);
 
     if (persist)
         PIN_BOOL_ARRAY(ENVONLY, persist, persistArray, &isCopy, "H5Pget_file_space: persist not pinned");
     if (threshold)
-        PIN_LONG_ARRAY(ENVONLY, threshold, thresholdArray, &isCopy, "H5Pget_file_space: threshold not pinned");
+        PIN_LONG_ARRAY(ENVONLY, threshold, thresholdArray, &isCopy,
+                       "H5Pget_file_space: threshold not pinned");
 
-    if ((status = H5Pget_file_space_strategy((hid_t)fcpl_id, &thestrategy, (hbool_t *)persistArray, (hsize_t *)thresholdArray)) < 0)
+    if ((status = H5Pget_file_space_strategy((hid_t)fcpl_id, &thestrategy, (hbool_t *)persistArray,
+                                             (hsize_t *)thresholdArray)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -352,11 +345,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1persist
-    (JNIEnv *env, jclass clss, jlong fcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1persist(JNIEnv *env, jclass clss, jlong fcpl_id)
 {
     hbool_t persist = FALSE;
-    herr_t  status = FAIL;
+    herr_t  status  = FAIL;
 
     UNUSED(clss);
 
@@ -373,11 +365,10 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1threshold
-    (JNIEnv *env, jclass clss, jlong fcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1threshold(JNIEnv *env, jclass clss, jlong fcpl_id)
 {
     hsize_t threshold = 0;
-    herr_t  status = FAIL;
+    herr_t  status    = FAIL;
 
     UNUSED(clss);
 
@@ -394,15 +385,16 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1nindexes
-    (JNIEnv *env, jclass clss, jlong plist_id, jint nindexes)
+Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1nindexes(JNIEnv *env, jclass clss, jlong plist_id, jint nindexes)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
     if (nindexes > H5O_SHMESG_MAX_NINDEXES)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_nindexes: number of indexes is greater than H5O_SHMESG_MAX_NINDEXES");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY,
+            "H5Pset_shared_mesg_nindexes: number of indexes is greater than H5O_SHMESG_MAX_NINDEXES");
 
     if ((retVal = H5Pset_shared_mesg_nindexes((hid_t)plist_id, (unsigned)nindexes)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -417,8 +409,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1nindexes
-    (JNIEnv *env, jclass clss, jlong fcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1nindexes(JNIEnv *env, jclass clss, jlong fcpl_id)
 {
     unsigned nindexes;
 
@@ -437,9 +428,8 @@ done:
  * Signature: (JIII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jint index_num,
-        jint mesg_type_flags, jint min_mesg_size)
+Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index(JNIEnv *env, jclass clss, jlong fcpl_id, jint index_num,
+                                                jint mesg_type_flags, jint min_mesg_size)
 {
     unsigned nindexes; /* Number of SOHM indexes */
     herr_t   retVal = FAIL;
@@ -447,7 +437,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index
     UNUSED(clss);
 
     /* Check arguments */
-    if ((unsigned) mesg_type_flags > H5O_SHMESG_ALL_FLAG)
+    if ((unsigned)mesg_type_flags > H5O_SHMESG_ALL_FLAG)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_index: unrecognized flags in mesg_type_flags");
 
     /* Read the current number of indexes */
@@ -455,10 +445,11 @@ Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Range check */
-    if ((unsigned) index_num >= nindexes)
+    if ((unsigned)index_num >= nindexes)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_index: index_num is too large; no such index");
 
-    if ((retVal = H5Pset_shared_mesg_index((hid_t)fcpl_id, (unsigned)index_num, (unsigned) mesg_type_flags, (unsigned) min_mesg_size)) < 0)
+    if ((retVal = H5Pset_shared_mesg_index((hid_t)fcpl_id, (unsigned)index_num, (unsigned)mesg_type_flags,
+                                           (unsigned)min_mesg_size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -471,13 +462,13 @@ done:
  * Signature: (JI[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jint index_num, jintArray mesg_info)
+Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index(JNIEnv *env, jclass clss, jlong fcpl_id, jint index_num,
+                                                jintArray mesg_info)
 {
-    jboolean  isCopy;
-    unsigned  nindexes; /* Number of SOHM indexes */
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    unsigned nindexes; /* Number of SOHM indexes */
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -489,12 +480,13 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Range check */
-    if ((unsigned) index_num >= nindexes)
+    if ((unsigned)index_num >= nindexes)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pget_shared_mesg_index: index_num is too large; no such index");
 
     PIN_INT_ARRAY(ENVONLY, mesg_info, theArray, &isCopy, "H5Pget_shared_mesg_index: input not pinned");
 
-    if ((retVal = H5Pget_shared_mesg_index((hid_t)fcpl_id, (unsigned)index_num, (unsigned *)&(theArray[0]), (unsigned *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_shared_mesg_index((hid_t)fcpl_id, (unsigned)index_num, (unsigned *)&(theArray[0]),
+                                           (unsigned *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -510,8 +502,8 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1phase_1change
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jint max_list, jint min_btree)
+Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1phase_1change(JNIEnv *env, jclass clss, jlong fcpl_id,
+                                                        jint max_list, jint min_btree)
 {
     herr_t retVal = FAIL;
 
@@ -524,13 +516,20 @@ Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1phase_1change
      */
 
     if (max_list + 1 < min_btree)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_phase_change: minimum B-tree value is greater than maximum list value");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY,
+            "H5Pset_shared_mesg_phase_change: minimum B-tree value is greater than maximum list value");
     if (max_list > H5O_SHMESG_MAX_LIST_SIZE)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_phase_change: max list value is larger than H5O_SHMESG_MAX_LIST_SIZE");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY,
+            "H5Pset_shared_mesg_phase_change: max list value is larger than H5O_SHMESG_MAX_LIST_SIZE");
     if (min_btree > H5O_SHMESG_MAX_LIST_SIZE)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_shared_mesg_phase_change: min btree value is larger than H5O_SHMESG_MAX_LIST_SIZE");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY,
+            "H5Pset_shared_mesg_phase_change: min btree value is larger than H5O_SHMESG_MAX_LIST_SIZE");
 
-    if ((retVal = H5Pset_shared_mesg_phase_change((hid_t)fcpl_id, (unsigned)max_list, (unsigned)min_btree)) < 0)
+    if ((retVal = H5Pset_shared_mesg_phase_change((hid_t)fcpl_id, (unsigned)max_list, (unsigned)min_btree)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -543,12 +542,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change
-    (JNIEnv *env, jclass clss, jlong fcpl_id, jintArray size)
+Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change(JNIEnv *env, jclass clss, jlong fcpl_id,
+                                                        jintArray size)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -557,7 +556,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change
 
     PIN_INT_ARRAY(ENVONLY, size, theArray, &isCopy, "H5Pget_shared_mesg_phase_change: input not pinned");
 
-    if ((retVal = H5Pget_shared_mesg_phase_change((hid_t)fcpl_id, (unsigned *)&(theArray[0]), (unsigned *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_shared_mesg_phase_change((hid_t)fcpl_id, (unsigned *)&(theArray[0]),
+                                                  (unsigned *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5pFCPLImp.h b/java/src/jni/h5pFCPLImp.h
index 57fcae8..924e325 100644
--- a/java/src/jni/h5pFCPLImp.h
+++ b/java/src/jni/h5pFCPLImp.h
@@ -25,180 +25,147 @@ extern "C" {
  * Method:    H5Pset_userblock
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1userblock
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1userblock(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_userblock
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1userblock
-(JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1userblock(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_sizes
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sizes
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1sizes(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_sizes
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sizes
-(JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1sizes(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_sym_k
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1sym_1k
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1sym_1k(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_sym_k
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1sym_1k
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1sym_1k(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_istore_k
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1istore_1k
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1istore_1k(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_istore_k
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1istore_1k
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1istore_1k(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_file_space_page_size
  * Signature: (JJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1page_1size
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1page_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_file_space_page_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1page_1size
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1page_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_file_space_strategy
  * Signature: (JIZJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1strategy
-(JNIEnv *, jclass, jlong, jint, jboolean, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1strategy(JNIEnv *, jclass, jlong, jint,
+                                                                         jboolean, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_file_space_strategy
  * Signature: (J[Z[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy
-(JNIEnv *, jclass, jlong, jbooleanArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy(JNIEnv *, jclass, jlong,
+                                                                         jbooleanArray, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_file_space_strategy_persist
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1persist
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1persist(JNIEnv *, jclass,
+                                                                                      jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_file_space_strategy_threshold
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1threshold
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1threshold(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_shared_mesg_nindexes
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1nindexes
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1nindexes(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_shared_mesg_nindexes
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1nindexes
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1nindexes(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_shared_mesg_index
  * Signature: (JIII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index
-(JNIEnv *, jclass, jlong, jint, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1index(JNIEnv *, jclass, jlong, jint, jint,
+                                                                       jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_shared_mesg_index
  * Signature: (JI[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index
-(JNIEnv *, jclass, jlong, jint, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1index(JNIEnv *, jclass, jlong, jint,
+                                                                       jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_shared_mesg_phase_change
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1phase_1change
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1shared_1mesg_1phase_1change(JNIEnv *, jclass, jlong, jint,
+                                                                               jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_shared_mesg_phase_change
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1shared_1mesg_1phase_1change(JNIEnv *, jclass, jlong,
+                                                                               jintArray);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pGCPLImp.c b/java/src/jni/h5pGCPLImp.c
index 2ba1c7d..67af902 100644
--- a/java/src/jni/h5pGCPLImp.c
+++ b/java/src/jni/h5pGCPLImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1local_1heap_1size_1hint
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jlong size_hint)
+Java_hdf_hdf5lib_H5_H5Pset_1local_1heap_1size_1hint(JNIEnv *env, jclass clss, jlong gcpl_id, jlong size_hint)
 {
     herr_t retVal = FAIL;
 
@@ -57,8 +56,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1local_1heap_1size_1hint
-    (JNIEnv *env, jclass clss, jlong gcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1local_1heap_1size_1hint(JNIEnv *env, jclass clss, jlong gcpl_id)
 {
     size_t size_hint = 0;
 
@@ -77,8 +75,8 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1link_1creation_1order
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jint crt_order_flags)
+Java_hdf_hdf5lib_H5_H5Pset_1link_1creation_1order(JNIEnv *env, jclass clss, jlong gcpl_id,
+                                                  jint crt_order_flags)
 {
     herr_t retVal = FAIL;
 
@@ -97,8 +95,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1link_1creation_1order
-    (JNIEnv *env, jclass clss, jlong gcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1link_1creation_1order(JNIEnv *env, jclass clss, jlong gcpl_id)
 {
     unsigned crt_order_flags;
 
@@ -117,8 +114,8 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1est_1link_1info
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jint est_num_entries, jint est_name_len)
+Java_hdf_hdf5lib_H5_H5Pset_1est_1link_1info(JNIEnv *env, jclass clss, jlong gcpl_id, jint est_num_entries,
+                                            jint est_name_len)
 {
     herr_t retVal = FAIL;
 
@@ -126,9 +123,11 @@ Java_hdf_hdf5lib_H5_H5Pset_1est_1link_1info
 
     /* Range check values */
     if ((est_num_entries > 65535) || (est_name_len > 65535))
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_est_link_info: est. name length or number of entries must be < 65536");
+        H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                              "H5Pset_est_link_info: est. name length or number of entries must be < 65536");
 
-    if ((retVal = H5Pset_est_link_info((hid_t)gcpl_id, (unsigned)est_num_entries, (unsigned)est_name_len)) < 0)
+    if ((retVal = H5Pset_est_link_info((hid_t)gcpl_id, (unsigned)est_num_entries, (unsigned)est_name_len)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -141,12 +140,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jintArray link_info)
+Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray link_info)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -155,7 +153,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info
 
     PIN_INT_ARRAY(ENVONLY, link_info, theArray, &isCopy, "H5Pget_est_link_info: input not pinned");
 
-    if ((retVal = H5Pget_est_link_info((hid_t)gcpl_id, (unsigned *)&(theArray[0]), (unsigned *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_est_link_info((hid_t)gcpl_id, (unsigned *)&(theArray[0]),
+                                       (unsigned *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -171,15 +170,16 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1link_1phase_1change
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jint max_compact, jint min_dense)
+Java_hdf_hdf5lib_H5_H5Pset_1link_1phase_1change(JNIEnv *env, jclass clss, jlong gcpl_id, jint max_compact,
+                                                jint min_dense)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
     if (max_compact < min_dense)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_link_phase_change: max compact value must be >= min dense value");
+        H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                              "H5Pset_link_phase_change: max compact value must be >= min dense value");
     if (max_compact > 65535)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_link_phase_change: max compact value must be < 65536");
     if (min_dense > 65535)
@@ -198,12 +198,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change
-    (JNIEnv *env, jclass clss, jlong gcpl_id, jintArray links)
+Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change(JNIEnv *env, jclass clss, jlong gcpl_id, jintArray links)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -212,7 +211,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change
 
     PIN_INT_ARRAY(ENVONLY, links, theArray, &isCopy, "H5Pget_link_phase_change: input not pinned");
 
-    if ((retVal = H5Pget_link_phase_change((hid_t)gcpl_id, (unsigned *)&(theArray[0]), (unsigned *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_link_phase_change((hid_t)gcpl_id, (unsigned *)&(theArray[0]),
+                                           (unsigned *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
diff --git a/java/src/jni/h5pGCPLImp.h b/java/src/jni/h5pGCPLImp.h
index 9c32063..920e799 100644
--- a/java/src/jni/h5pGCPLImp.h
+++ b/java/src/jni/h5pGCPLImp.h
@@ -25,72 +25,56 @@ extern "C" {
  * Method:    H5Pset_local_heap_size_hint
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1local_1heap_1size_1hint
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1local_1heap_1size_1hint(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_local_heap_size_hint
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1local_1heap_1size_1hint
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1local_1heap_1size_1hint(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_link_creation_order
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1link_1creation_1order
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1link_1creation_1order(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_link_creation_order
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1link_1creation_1order
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1link_1creation_1order(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_est_link_info
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1est_1link_1info
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1est_1link_1info(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_est_link_info
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1est_1link_1info(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_link_phase_change
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1link_1phase_1change
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1link_1phase_1change(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_link_phase_change
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1link_1phase_1change(JNIEnv *, jclass, jlong, jintArray);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c
index 9e5b004..4ab359a 100644
--- a/java/src/jni/h5pImp.c
+++ b/java/src/jni/h5pImp.c
@@ -54,7 +54,7 @@ static herr_t H5P_cls_close_cb(hid_t prop_id, void *close_data);
 static herr_t H5P_prp_create_cb(const char *name, size_t size, void *value);
 static herr_t H5P_prp_copy_cb(const char *name, size_t size, void *value);
 static herr_t H5P_prp_close_cb(const char *name, size_t size, void *value);
-static int H5P_prp_compare_cb(void *value1, void *value2, size_t size);
+static int    H5P_prp_compare_cb(void *value1, void *value2, size_t size);
 static herr_t H5P_prp_get_cb(hid_t prop_id, const char *name, size_t size, void *value);
 static herr_t H5P_prp_set_cb(hid_t prop_id, const char *name, size_t size, void *value);
 static herr_t H5P_prp_delete_cb(hid_t prop_id, const char *name, size_t size, void *value);
@@ -67,14 +67,13 @@ static herr_t H5P_iterate_cb(hid_t prop_id, const char *name, void *cb_data);
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate
-    (JNIEnv *env, jclass clss, jlong type)
+Java_hdf_hdf5lib_H5__1H5Pcreate(JNIEnv *env, jclass clss, jlong type)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pcreate((hid_t) type)) < 0)
+    if ((retVal = H5Pcreate((hid_t)type)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -87,14 +86,13 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5_H5Pget_1class(JNIEnv *env, jclass clss, jlong plist)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pget_class((hid_t) plist)) < 0)
+    if ((retVal = H5Pget_class((hid_t)plist)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     /*
@@ -112,14 +110,13 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcopy
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5__1H5Pcopy(JNIEnv *env, jclass clss, jlong plist)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Pcopy((hid_t) plist)) < 0)
+    if ((retVal = H5Pcopy((hid_t)plist)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -132,15 +129,14 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Pclose
-    (JNIEnv *env, jclass clss, jlong plist)
+Java_hdf_hdf5lib_H5__1H5Pclose(JNIEnv *env, jclass clss, jlong plist)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
     if (plist >= 0)
-        if ((retVal = H5Pclose((hid_t) plist)) < 0)
+        if ((retVal = H5Pclose((hid_t)plist)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -158,29 +154,32 @@ done:
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pcreate_class
- * Signature: (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
+ * Signature:
+ * (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate_1class
-    (JNIEnv *env, jclass clss, jlong parent_class, jstring name, jobject create_op,
-        jobject create_data, jobject copy_op, jobject copy_data, jobject close_op, jobject close_data)
+Java_hdf_hdf5lib_H5__1H5Pcreate_1class(JNIEnv *env, jclass clss, jlong parent_class, jstring name,
+                                       jobject create_op, jobject create_data, jobject copy_op,
+                                       jobject copy_data, jobject close_op, jobject close_data)
 {
-    const char *cstr = NULL;
+    const char *cstr     = NULL;
     hid_t       class_id = H5I_INVALID_HID;
 
     UNUSED(clss);
 
     create_callback = create_op;
-    close_callback = close_op;
-    copy_callback = copy_op;
+    close_callback  = close_op;
+    copy_callback   = copy_op;
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "_H5Pcreate_class: class name is NULL");
 
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "_H5Pcreate_class: class name not pinned");
 
-    if ((class_id = H5Pcreate_class((hid_t)parent_class, cstr, (H5P_cls_create_func_t)H5P_cls_create_cb, (void *) create_data,
-            (H5P_cls_copy_func_t)H5P_cls_copy_cb, (void *) copy_data, (H5P_cls_close_func_t)H5P_cls_close_cb, (void *) close_data)) < 0)
+    if ((class_id =
+             H5Pcreate_class((hid_t)parent_class, cstr, (H5P_cls_create_func_t)H5P_cls_create_cb,
+                             (void *)create_data, (H5P_cls_copy_func_t)H5P_cls_copy_cb, (void *)copy_data,
+                             (H5P_cls_close_func_t)H5P_cls_close_cb, (void *)close_data)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -193,13 +192,13 @@ done:
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pcreate_class_nocb
- * Signature: (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
+ * Signature:
+ * (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb
-    (JNIEnv *env, jclass clss, jlong parent_class, jstring name)
+Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb(JNIEnv *env, jclass clss, jlong parent_class, jstring name)
 {
-    const char *cstr = NULL;
+    const char *cstr     = NULL;
     hid_t       class_id = H5I_INVALID_HID;
 
     UNUSED(clss);
@@ -209,7 +208,7 @@ Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb
 
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "_H5Pcreate_class_nocb: class name not pinned");
 
-    if ((class_id = H5Pcreate_class((hid_t)parent_class, cstr,  NULL, NULL, NULL, NULL, NULL, NULL)) < 0)
+    if ((class_id = H5Pcreate_class((hid_t)parent_class, cstr, NULL, NULL, NULL, NULL, NULL, NULL)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -222,39 +221,43 @@ done:
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pregister2
- * Signature: (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+ * Signature:
+ * (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pregister2
-    (JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
-        jbyteArray def_value, jobject prp_create, jobject prp_set, jobject prp_get, jobject prp_delete,
-        jobject prp_copy, jobject prp_cmp, jobject prp_close)
+Java_hdf_hdf5lib_H5_H5Pregister2(JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
+                                 jbyteArray def_value, jobject prp_create, jobject prp_set, jobject prp_get,
+                                 jobject prp_delete, jobject prp_copy, jobject prp_cmp, jobject prp_close)
 {
     const char *cstr = NULL;
     jboolean    isCopy;
-    herr_t      status = FAIL;
-    jbyte      *propValBuf = NULL;
+    herr_t      status     = FAIL;
+    jbyte *     propValBuf = NULL;
 
     UNUSED(clss);
 
-    copy_callback = prp_copy;
-    close_callback = prp_close;
-    create_callback = prp_create;
+    copy_callback    = prp_copy;
+    close_callback   = prp_close;
+    create_callback  = prp_create;
     compare_callback = prp_cmp;
-    set_callback = prp_set;
-    get_callback = prp_get;
-    delete_callback = prp_delete;
+    set_callback     = prp_set;
+    get_callback     = prp_get;
+    delete_callback  = prp_delete;
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pregister2: property name is NULL");
 
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pregister2: property name not pinned");
 
-    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pregister2: default property value buffer not pinned");
+    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy,
+                   "H5Pregister2: default property value buffer not pinned");
 
-    if ((status = H5Pregister2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf, (H5P_prp_create_func_t)H5P_prp_create_cb,
-            (H5P_prp_set_func_t)H5P_prp_set_cb, (H5P_prp_get_func_t)H5P_prp_get_cb, (H5P_prp_delete_func_t)H5P_prp_delete_cb,
-            (H5P_prp_copy_func_t)H5P_prp_copy_cb, (H5P_prp_compare_func_t)H5P_prp_compare_cb, (H5P_prp_close_func_t)H5P_prp_close_cb)) < 0)
+    if ((status =
+             H5Pregister2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf,
+                          (H5P_prp_create_func_t)H5P_prp_create_cb, (H5P_prp_set_func_t)H5P_prp_set_cb,
+                          (H5P_prp_get_func_t)H5P_prp_get_cb, (H5P_prp_delete_func_t)H5P_prp_delete_cb,
+                          (H5P_prp_copy_func_t)H5P_prp_copy_cb, (H5P_prp_compare_func_t)H5P_prp_compare_cb,
+                          (H5P_prp_close_func_t)H5P_prp_close_cb)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -270,13 +273,13 @@ done:
  * Signature: (JLjava/lang/String;J[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pregister2_1nocb
-    (JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size, jbyteArray def_value)
+Java_hdf_hdf5lib_H5_H5Pregister2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
+                                       jbyteArray def_value)
 {
     const char *cstr = NULL;
     jboolean    isCopy;
-    herr_t      status = FAIL;
-    jbyte      *propValBuf = NULL;
+    herr_t      status     = FAIL;
+    jbyte *     propValBuf = NULL;
 
     UNUSED(clss);
 
@@ -285,9 +288,11 @@ Java_hdf_hdf5lib_H5_H5Pregister2_1nocb
 
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pregister2_nocb: property name not pinned");
 
-    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pregister2_nocb: default property value buffer not pinned");
+    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy,
+                   "H5Pregister2_nocb: default property value buffer not pinned");
 
-    if ((status = H5Pregister2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf, NULL, NULL, NULL, NULL, NULL, NULL, NULL)) < 0)
+    if ((status = H5Pregister2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf, NULL, NULL, NULL,
+                               NULL, NULL, NULL, NULL)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -300,27 +305,27 @@ done:
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pinsert2
- * Signature: (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+ * Signature:
+ * (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pinsert2
-    (JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
-        jbyteArray def_value, jobject prp_set, jobject prp_get, jobject prp_delete,
-        jobject prp_copy, jobject prp_cmp, jobject prp_close)
+Java_hdf_hdf5lib_H5_H5Pinsert2(JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
+                               jbyteArray def_value, jobject prp_set, jobject prp_get, jobject prp_delete,
+                               jobject prp_copy, jobject prp_cmp, jobject prp_close)
 {
     const char *cstr = NULL;
     jboolean    isCopy;
-    herr_t      status = FAIL;
-    jbyte      *propValBuf = NULL;
+    herr_t      status     = FAIL;
+    jbyte *     propValBuf = NULL;
 
     UNUSED(clss);
 
-    copy_callback = prp_copy;
-    close_callback = prp_close;
+    copy_callback    = prp_copy;
+    close_callback   = prp_close;
     compare_callback = prp_cmp;
-    set_callback = prp_set;
-    get_callback = prp_get;
-    delete_callback = prp_delete;
+    set_callback     = prp_set;
+    get_callback     = prp_get;
+    delete_callback  = prp_delete;
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Pinsert2: property name is NULL");
@@ -330,8 +335,10 @@ Java_hdf_hdf5lib_H5_H5Pinsert2
     PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pinsert2: property value buffer not pinned");
 
     if ((status = H5Pinsert2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf,
-            (H5P_prp_set_func_t)H5P_prp_set_cb, (H5P_prp_get_func_t)H5P_prp_get_cb, (H5P_prp_delete_func_t)H5P_prp_delete_cb,
-            (H5P_prp_copy_func_t)H5P_prp_copy_cb, (H5P_prp_compare_func_t)H5P_prp_compare_cb, (H5P_prp_close_func_t)H5P_prp_close_cb)) < 0)
+                             (H5P_prp_set_func_t)H5P_prp_set_cb, (H5P_prp_get_func_t)H5P_prp_get_cb,
+                             (H5P_prp_delete_func_t)H5P_prp_delete_cb, (H5P_prp_copy_func_t)H5P_prp_copy_cb,
+                             (H5P_prp_compare_func_t)H5P_prp_compare_cb,
+                             (H5P_prp_close_func_t)H5P_prp_close_cb)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -347,13 +354,13 @@ done:
  * Signature: (JLjava/lang/String;J[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb
-    (JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size, jbyteArray def_value)
+Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb(JNIEnv *env, jclass clss, jlong cls_id, jstring name, jlong prp_size,
+                                     jbyteArray def_value)
 {
     const char *cstr = NULL;
     jboolean    isCopy;
-    herr_t      status = FAIL;
-    jbyte      *propValBuf = NULL;
+    herr_t      status     = FAIL;
+    jbyte *     propValBuf = NULL;
 
     UNUSED(clss);
 
@@ -362,9 +369,11 @@ Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb
 
     PIN_JAVA_STRING(ENVONLY, name, cstr, NULL, "H5Pinsert2_nocb: property name not pinned");
 
-    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy, "H5Pinsert2_nocb: property value buffer not pinned");
+    PIN_BYTE_ARRAY(ENVONLY, def_value, propValBuf, &isCopy,
+                   "H5Pinsert2_nocb: property value buffer not pinned");
 
-    if ((status = H5Pinsert2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf, NULL, NULL, NULL, NULL, NULL, NULL)) < 0)
+    if ((status = H5Pinsert2((hid_t)cls_id, cstr, (size_t)prp_size, (void *)propValBuf, NULL, NULL, NULL,
+                             NULL, NULL, NULL)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -380,10 +389,9 @@ done:
  * Signature: (JLjava/lang/String;I)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pset
-    (JNIEnv *env, jclass clss, jlong plid, jstring name, jint val)
+Java_hdf_hdf5lib_H5_H5Pset(JNIEnv *env, jclass clss, jlong plid, jstring name, jint val)
 {
-    const char *cstr = NULL;
+    const char *cstr   = NULL;
     hid_t       retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
@@ -409,8 +417,7 @@ done:
  * Signature: (JLjava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pexist
-    (JNIEnv *env, jclass clss, jlong plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Pexist(JNIEnv *env, jclass clss, jlong plid, jstring name)
 {
     const char *cstr = NULL;
     htri_t      bval = JNI_FALSE;
@@ -440,11 +447,10 @@ done:
  * Signature: (JLjava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1size
-    (JNIEnv *env, jclass clss, jlong plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Pget_1size(JNIEnv *env, jclass clss, jlong plid, jstring name)
 {
-    const char *cstr = NULL;
-    size_t      size = 0;
+    const char *cstr   = NULL;
+    size_t      size   = 0;
     herr_t      status = FAIL;
 
     UNUSED(clss);
@@ -461,7 +467,7 @@ done:
     if (cstr)
         UNPIN_JAVA_STRING(ENVONLY, name, cstr);
 
-    return (jlong) size;
+    return (jlong)size;
 } /* end Java_hdf_hdf5lib_H5_H5Pget_1size */
 
 /*
@@ -470,8 +476,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nprops
-    (JNIEnv *env, jclass clss, jlong plid)
+Java_hdf_hdf5lib_H5_H5Pget_1nprops(JNIEnv *env, jclass clss, jlong plid)
 {
     size_t nprops = 0;
 
@@ -490,11 +495,10 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class_1name
-    (JNIEnv *env, jclass clss, jlong plid)
+Java_hdf_hdf5lib_H5_H5Pget_1class_1name(JNIEnv *env, jclass clss, jlong plid)
 {
-    char    *c_str = NULL;
-    jstring  j_str = NULL;
+    char *  c_str = NULL;
+    jstring j_str = NULL;
 
     UNUSED(clss);
 
@@ -503,7 +507,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1class_1name
 
     if (NULL == (j_str = ENVPTR->NewStringUTF(ENVONLY, c_str))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_class_name: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_class_name: out of memory - unable to construct string from UTF characters");
     }
 
 done:
@@ -519,8 +524,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class_1parent
-    (JNIEnv *env, jclass clss, jlong plid)
+Java_hdf_hdf5lib_H5_H5Pget_1class_1parent(JNIEnv *env, jclass clss, jlong plid)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -539,8 +543,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pisa_1class
-    (JNIEnv *env, jclass clss, jlong plid, jlong pcls)
+Java_hdf_hdf5lib_H5_H5Pisa_1class(JNIEnv *env, jclass clss, jlong plid, jlong pcls)
 {
     htri_t retVal = FAIL;
 
@@ -559,8 +562,7 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget
-    (JNIEnv *env, jclass clss, jlong plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Pget(JNIEnv *env, jclass clss, jlong plid, jstring name)
 {
     const char *cstr = NULL;
     jint        val;
@@ -589,8 +591,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pequal
-    (JNIEnv *env, jclass clss, jlong plid1, jlong plid2)
+Java_hdf_hdf5lib_H5_H5Pequal(JNIEnv *env, jclass clss, jlong plid1, jlong plid2)
 {
     htri_t retVal = FAIL;
 
@@ -609,13 +610,13 @@ done:
  * Signature: (J[ILjava/lang/Object;Ljava/lang/Object;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Piterate
-    (JNIEnv *env, jclass clss, jlong prop_id, jintArray idx, jobject callback_op, jobject op_data)
+Java_hdf_hdf5lib_H5_H5Piterate(JNIEnv *env, jclass clss, jlong prop_id, jintArray idx, jobject callback_op,
+                               jobject op_data)
 {
-    cb_wrapper  wrapper = { callback_op, op_data };
-    jboolean    isCopy;
-    jint       *theArray = NULL;
-    herr_t      status = FAIL;
+    cb_wrapper wrapper = {callback_op, op_data};
+    jboolean   isCopy;
+    jint *     theArray = NULL;
+    herr_t     status   = FAIL;
 
     UNUSED(clss);
 
@@ -634,7 +635,8 @@ Java_hdf_hdf5lib_H5_H5Piterate
     else {
         PIN_INT_ARRAY(ENVONLY, idx, theArray, &isCopy, "H5Piterate: idx not pinned");
 
-        if ((status = H5Piterate((hid_t)prop_id, (int *)&theArray[0], (H5P_iterate_t)H5P_iterate_cb, (void *)&wrapper)) < 0)
+        if ((status = H5Piterate((hid_t)prop_id, (int *)&theArray[0], (H5P_iterate_t)H5P_iterate_cb,
+                                 (void *)&wrapper)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
     }
 
@@ -651,10 +653,9 @@ done:
  * Signature: (JJLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pcopy_1prop
-    (JNIEnv *env, jclass clss, jlong dst_plid, jlong src_plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Pcopy_1prop(JNIEnv *env, jclass clss, jlong dst_plid, jlong src_plid, jstring name)
 {
-    const char *cstr = NULL;
+    const char *cstr   = NULL;
     herr_t      retVal = FAIL;
 
     UNUSED(clss);
@@ -680,10 +681,9 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Premove
-    (JNIEnv *env, jclass clss, jlong plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Premove(JNIEnv *env, jclass clss, jlong plid, jstring name)
 {
-    const char *cstr = NULL;
+    const char *cstr   = NULL;
     herr_t      retVal = FAIL;
 
     UNUSED(clss);
@@ -709,10 +709,9 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Punregister
-    (JNIEnv *env, jclass clss, jlong plid, jstring name)
+Java_hdf_hdf5lib_H5_H5Punregister(JNIEnv *env, jclass clss, jlong plid, jstring name)
 {
-    const char *cstr = NULL;
+    const char *cstr   = NULL;
     herr_t      retVal = FAIL;
 
     UNUSED(clss);
@@ -738,8 +737,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Pclose_1class
-    (JNIEnv *env, jclass clss, jlong plid)
+Java_hdf_hdf5lib_H5__1H5Pclose_1class(JNIEnv *env, jclass clss, jlong plid)
 {
     herr_t retVal = FAIL;
 
@@ -753,13 +751,12 @@ done:
 } /* end Java_hdf_hdf5lib_H5__1H5Pclose_1class */
 
 static herr_t
-H5P_cls_create_cb
-    (hid_t prop_id, void *create_data)
+H5P_cls_create_cb(hid_t prop_id, void *create_data)
 {
-    jmethodID  mid;
-    JNIEnv    *cbenv = NULL;
-    jclass     cls;
-    jint       status = -1;
+    jmethodID mid;
+    JNIEnv *  cbenv = NULL;
+    jclass    cls;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -769,7 +766,8 @@ H5P_cls_create_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, create_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "(JLhdf/hdf5lib/callbacks/H5P_cls_create_func_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "(JLhdf/hdf5lib/callbacks/H5P_cls_create_func_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     status = CBENVPTR->CallIntMethod(CBENVONLY, create_callback, mid, prop_id, create_data);
@@ -783,13 +781,12 @@ done:
 } /* end H5P_cls_create_cb */
 
 static herr_t
-H5P_cls_copy_cb
-    (hid_t new_prop_id, hid_t old_prop_id, void *copy_data)
+H5P_cls_copy_cb(hid_t new_prop_id, hid_t old_prop_id, void *copy_data)
 {
-    jmethodID  mid;
-    JNIEnv    *cbenv = NULL;
-    jclass     cls;
-    jint       status = -1;
+    jmethodID mid;
+    JNIEnv *  cbenv = NULL;
+    jclass    cls;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -799,7 +796,8 @@ H5P_cls_copy_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, copy_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "(JJLhdf/hdf5lib/callbacks/H5P_cls_copy_func_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "(JJLhdf/hdf5lib/callbacks/H5P_cls_copy_func_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     status = CBENVPTR->CallIntMethod(CBENVONLY, copy_callback, mid, new_prop_id, old_prop_id, copy_data);
@@ -813,13 +811,12 @@ done:
 } /* end H5P_cls_copy_cb */
 
 static herr_t
-H5P_cls_close_cb
-    (hid_t prop_id, void *close_data)
+H5P_cls_close_cb(hid_t prop_id, void *close_data)
 {
-    jmethodID  mid;
-    JNIEnv    *cbenv = NULL;
-    jclass     cls;
-    jint       status = -1;
+    jmethodID mid;
+    JNIEnv *  cbenv = NULL;
+    jclass    cls;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -829,7 +826,8 @@ H5P_cls_close_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, close_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "(JLhdf/hdf5lib/callbacks/H5P_cls_close_func_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "(JLhdf/hdf5lib/callbacks/H5P_cls_close_func_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     status = CBENVPTR->CallIntMethod(CBENVONLY, close_callback, mid, prop_id, close_data);
@@ -843,14 +841,13 @@ done:
 } /* end H5P_cls_close_cb */
 
 static herr_t
-H5P_prp_create_cb
-    (const char *name, size_t size, void *value)
+H5P_prp_create_cb(const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -877,14 +874,13 @@ done:
 } /* end H5P_prp_create_cb */
 
 static herr_t
-H5P_prp_set_cb
-    (hid_t prop_id, const char *name, size_t size, void *value)
+H5P_prp_set_cb(hid_t prop_id, const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -911,14 +907,13 @@ done:
 } /* end H5P_prp_set_cb */
 
 static herr_t
-H5P_prp_get_cb
-    (hid_t prop_id, const char *name, size_t size, void *value)
+H5P_prp_get_cb(hid_t prop_id, const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -945,14 +940,13 @@ done:
 } /* end H5P_prp_get_cb */
 
 static herr_t
-H5P_prp_delete_cb
-    (hid_t prop_id, const char *name, size_t size, void *value)
+H5P_prp_delete_cb(hid_t prop_id, const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -979,14 +973,13 @@ done:
 } /* end H5P_prp_delete_cb */
 
 static herr_t
-H5P_prp_copy_cb
-    (const char *name, size_t size, void *value)
+H5P_prp_copy_cb(const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -1013,13 +1006,12 @@ done:
 } /* end H5P_prp_copy_cb */
 
 static int
-H5P_prp_compare_cb
-    (void *value1, void *value2, size_t size)
+H5P_prp_compare_cb(void *value1, void *value2, size_t size)
 {
-    jmethodID  mid;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -1043,14 +1035,13 @@ done:
 } /* end H5P_prp_compare_cb */
 
 static herr_t
-H5P_prp_close_cb
-    (const char *name, size_t size, void *value)
+H5P_prp_close_cb(const char *name, size_t size, void *value)
 {
-    jmethodID  mid;
-    jstring    str;
-    jclass     cls;
-    JNIEnv    *cbenv = NULL;
-    jint       status = -1;
+    jmethodID mid;
+    jstring   str;
+    jclass    cls;
+    JNIEnv *  cbenv  = NULL;
+    jint      status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
@@ -1077,19 +1068,18 @@ done:
 } /* end H5P_prp_close_cb */
 
 static herr_t
-H5P_iterate_cb
-    (hid_t prop_id, const char *name, void *cb_data)
+H5P_iterate_cb(hid_t prop_id, const char *name, void *cb_data)
 {
-    cb_wrapper *wrapper = (cb_wrapper *) cb_data;
+    cb_wrapper *wrapper = (cb_wrapper *)cb_data;
     jmethodID   mid;
     jobject     visit_callback = wrapper->visit_callback;
     jstring     str;
     jclass      cls;
-    JNIEnv     *cbenv = NULL;
-    void       *op_data = (void *) wrapper->op_data;
-    jint        status = -1;
+    JNIEnv *    cbenv   = NULL;
+    void *      op_data = (void *)wrapper->op_data;
+    jint        status  = -1;
 
-    if (JVMPTR->AttachCurrentThread(JVMPAR, (void**)&cbenv, NULL) < 0) {
+    if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
         H5_JNI_FATAL_ERROR(CBENVONLY, "H5P_iterate_cb: failed to attach current thread to JVM");
     }
@@ -1097,7 +1087,8 @@ H5P_iterate_cb
     if (NULL == (cls = CBENVPTR->GetObjectClass(CBENVONLY, visit_callback)))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
-    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback", "(JLjava/lang/String;Lhdf/hdf5lib/callbacks/H5P_iterate_t;)I")))
+    if (NULL == (mid = CBENVPTR->GetMethodID(CBENVONLY, cls, "callback",
+                                             "(JLjava/lang/String;Lhdf/hdf5lib/callbacks/H5P_iterate_t;)I")))
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
 
     if (NULL == (str = CBENVPTR->NewStringUTF(CBENVONLY, name)))
diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h
index 8318be4..b35bf94 100644
--- a/java/src/jni/h5pImp.h
+++ b/java/src/jni/h5pImp.h
@@ -27,36 +27,28 @@ extern "C" {
  * Method:    H5Pcreate
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Pcreate(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_class
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1class(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pcopy
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcopy
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Pcopy(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Pclose
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Pclose(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pencode
@@ -69,182 +61,151 @@ Java_hdf_hdf5lib_H5__1H5Pclose
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pcreate_class
- * Signature: (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
+ * Signature:
+ * (JLjava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate_1class
-  (JNIEnv*, jclass, jlong, jstring, jobject, jobject, jobject, jobject, jobject, jobject);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Pcreate_1class(JNIEnv *, jclass, jlong, jstring, jobject,
+                                                               jobject, jobject, jobject, jobject, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pcreate_class_nocb
  * Signature: (JLjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb
-  (JNIEnv*, jclass, jlong, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Pcreate_1class_1nocb(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pregister2
- * Signature: (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+ * Signature:
+ * (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pregister2
-  (JNIEnv*, jclass, jlong, jstring, jlong, jbyteArray, jobject, jobject, jobject, jobject, jobject, jobject, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pregister2(JNIEnv *, jclass, jlong, jstring, jlong, jbyteArray,
+                                                        jobject, jobject, jobject, jobject, jobject, jobject,
+                                                        jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pregister2_nocb
  * Signature: (JLjava/lang/String;J[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pregister2_1nocb
-  (JNIEnv*, jclass, jlong, jstring, jlong, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pregister2_1nocb(JNIEnv *, jclass, jlong, jstring, jlong,
+                                                              jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pinsert2
- * Signature: (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
+ * Signature:
+ * (JLjava/lang/String;J[BLjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pinsert2
-  (JNIEnv*, jclass, jlong, jstring, jlong, jbyteArray, jobject, jobject, jobject, jobject, jobject, jobject);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pinsert2(JNIEnv *, jclass, jlong, jstring, jlong, jbyteArray,
+                                                      jobject, jobject, jobject, jobject, jobject, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pinsert2_nocb
  * Signature: (JLjava/lang/String;J[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb
-  (JNIEnv*, jclass, jlong, jstring, jlong, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pinsert2_1nocb(JNIEnv *, jclass, jlong, jstring, jlong,
+                                                            jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset
  * Signature: (JLjava/lang/String;I)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pset
-(JNIEnv *, jclass, jlong, jstring, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pset(JNIEnv *, jclass, jlong, jstring, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pexist
  * Signature: (JLjava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pexist
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pexist(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_size
  * Signature: (JLjava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1size
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1size(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_nprops
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nprops
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1nprops(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_class_name
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class_1name
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Pget_1class_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_class_parent
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1class_1parent
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1class_1parent(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pisa_class
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pisa_1class
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pisa_1class(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pequal
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pequal
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pequal(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Piterate
  * Signature: (J[ILjava/lang/Object;Ljava/lang/Object;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Piterate
-  (JNIEnv*, jclass, jlong, jintArray, jobject, jobject);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Piterate(JNIEnv *, jclass, jlong, jintArray, jobject, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pcopy_prop
  * Signature: (JJLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pcopy_1prop
-(JNIEnv *, jclass, jlong, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pcopy_1prop(JNIEnv *, jclass, jlong, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Premove
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Premove
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Premove(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Punregister
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Punregister
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Punregister(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pclose_class
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Pclose_1class
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Pclose_1class(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pLAPLImp.c b/java/src/jni/h5pLAPLImp.c
index 754bece..01b2bb1 100644
--- a/java/src/jni/h5pLAPLImp.c
+++ b/java/src/jni/h5pLAPLImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1nlinks
-    (JNIEnv *env, jclass clss, jlong lapl_id, jlong nlinks)
+Java_hdf_hdf5lib_H5_H5Pset_1nlinks(JNIEnv *env, jclass clss, jlong lapl_id, jlong nlinks)
 {
     herr_t retVal = FAIL;
 
@@ -60,8 +59,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nlinks
-    (JNIEnv *env, jclass clss, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1nlinks(JNIEnv *env, jclass clss, jlong lapl_id)
 {
     size_t nlinks = 0;
 
@@ -71,7 +69,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1nlinks
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) nlinks;
+    return (jlong)nlinks;
 } /* end Java_hdf_hdf5lib_H5_H5Pget_1nlinks */
 
 /*
@@ -88,11 +86,10 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1prefix
-    (JNIEnv *env, jclass clss, jlong lapl_id, jstring prefix)
+Java_hdf_hdf5lib_H5_H5Pset_1elink_1prefix(JNIEnv *env, jclass clss, jlong lapl_id, jstring prefix)
 {
     const char *linkPrefix = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal     = FAIL;
 
     UNUSED(clss);
 
@@ -117,13 +114,12 @@ done:
  * Signature: (J[Ljava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix
-    (JNIEnv *env, jclass clss, jlong lapl_id, jobjectArray prefix)
+Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix(JNIEnv *env, jclass clss, jlong lapl_id, jobjectArray prefix)
 {
-    ssize_t  prefix_size = -1;
-    size_t   size = 0;
-    char    *pre = NULL;
-    jstring  str = NULL;
+    ssize_t prefix_size = -1;
+    size_t  size        = 0;
+    char *  pre         = NULL;
+    jstring str         = NULL;
 
     UNUSED(clss);
 
@@ -133,16 +129,17 @@ Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix
     if ((prefix_size = H5Pget_elink_prefix((hid_t)lapl_id, (char *)NULL, size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (pre = (char *) HDmalloc(sizeof(char) * (size_t) prefix_size + 1)))
+    if (NULL == (pre = (char *)HDmalloc(sizeof(char) * (size_t)prefix_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_elink_prefix: memory allocation failed");
 
-    if (H5Pget_elink_prefix((hid_t)lapl_id, (char *)pre, (size_t) prefix_size + 1) < 0)
+    if (H5Pget_elink_prefix((hid_t)lapl_id, (char *)pre, (size_t)prefix_size + 1) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     pre[prefix_size] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, pre))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_elink_prefix: out of memory - unable to construct string from UTF characters");
+        H5_OUT_OF_MEMORY_ERROR(
+            ENVONLY, "H5Pget_elink_prefix: out of memory - unable to construct string from UTF characters");
     }
 
     ENVPTR->SetObjectArrayElement(ENVONLY, prefix, 0, str);
@@ -161,8 +158,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1fapl
-    (JNIEnv *env, jclass clss, jlong lapl_id, jlong fapl_id)
+Java_hdf_hdf5lib_H5_H5Pset_1elink_1fapl(JNIEnv *env, jclass clss, jlong lapl_id, jlong fapl_id)
 {
     herr_t retVal = FAIL;
 
@@ -181,8 +177,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pget_1elink_1fapl
-    (JNIEnv *env, jclass clss, jlong lapl_id)
+Java_hdf_hdf5lib_H5__1H5Pget_1elink_1fapl(JNIEnv *env, jclass clss, jlong lapl_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -201,8 +196,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags
-    (JNIEnv *env, jclass clss, jlong lapl_id, jint flags)
+Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags(JNIEnv *env, jclass clss, jlong lapl_id, jint flags)
 {
     herr_t retVal = FAIL;
 
@@ -212,7 +206,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jint) retVal;
+    return (jint)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags */
 
 /*
@@ -221,8 +215,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1acc_1flags
-    (JNIEnv *env, jclass clss, jlong lapl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1elink_1acc_1flags(JNIEnv *env, jclass clss, jlong lapl_id)
 {
     unsigned flags;
 
diff --git a/java/src/jni/h5pLAPLImp.h b/java/src/jni/h5pLAPLImp.h
index 8efcfb5..c08e0c9 100644
--- a/java/src/jni/h5pLAPLImp.h
+++ b/java/src/jni/h5pLAPLImp.h
@@ -25,18 +25,14 @@ extern "C" {
  * Method:    H5Pset_nlinks
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1nlinks
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1nlinks(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_nlinks
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1nlinks
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1nlinks(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Pset_elink_cb
@@ -51,54 +47,42 @@ Java_hdf_hdf5lib_H5_H5Pget_1nlinks
  * Method:    H5Pset_elink_prefix
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1prefix
-(JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1elink_1prefix(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_elink_prefix
  * Signature: (J[Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix
-(JNIEnv *, jclass, jlong, jobjectArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pget_1elink_1prefix(JNIEnv *, jclass, jlong, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_elink_fapl
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1fapl
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1elink_1fapl(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Pget_elink_fapl
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Pget_1elink_1fapl
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Pget_1elink_1fapl(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_elink_acc_flags
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1elink_1acc_1flags(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_elink_acc_flags
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1elink_1acc_1flags
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1elink_1acc_1flags(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pOCPLImp.c b/java/src/jni/h5pOCPLImp.c
index 241842e..68fe471 100644
--- a/java/src/jni/h5pOCPLImp.c
+++ b/java/src/jni/h5pOCPLImp.c
@@ -37,8 +37,8 @@ extern "C" {
  * Signature: (JZ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1create_1intermediate_1group
-    (JNIEnv *env, jclass clss, jlong lcpl_id, jboolean crt_intermed_group)
+Java_hdf_hdf5lib_H5_H5Pset_1create_1intermediate_1group(JNIEnv *env, jclass clss, jlong lcpl_id,
+                                                        jboolean crt_intermed_group)
 {
     herr_t retVal = FAIL;
 
@@ -57,8 +57,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1create_1intermediate_1group
-    (JNIEnv *env, jclass clss, jlong lcpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1create_1intermediate_1group(JNIEnv *env, jclass clss, jlong lcpl_id)
 {
     unsigned crt_intermed_group = 0;
 
@@ -77,8 +76,7 @@ done:
  * Signature: (JZ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1obj_1track_1times
-    (JNIEnv *env, jclass clss, jlong objplid, jboolean track_times)
+Java_hdf_hdf5lib_H5_H5Pset_1obj_1track_1times(JNIEnv *env, jclass clss, jlong objplid, jboolean track_times)
 {
     hbool_t track = FALSE;
 
@@ -99,11 +97,10 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times
-    (JNIEnv *env, jclass clss, jlong objplid)
+Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times(JNIEnv *env, jclass clss, jlong objplid)
 {
     hbool_t  track_times = FALSE;
-    jboolean retVal = JNI_FALSE;
+    jboolean retVal      = JNI_FALSE;
 
     UNUSED(clss);
 
@@ -122,8 +119,8 @@ done:
  * Signature: (JII)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1attr_1phase_1change
-    (JNIEnv *env, jclass clss, jlong ocpl_id, jint max_compact, jint min_dense)
+Java_hdf_hdf5lib_H5_H5Pset_1attr_1phase_1change(JNIEnv *env, jclass clss, jlong ocpl_id, jint max_compact,
+                                                jint min_dense)
 {
     herr_t retVal = FAIL;
 
@@ -142,12 +139,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change
-    (JNIEnv *env, jclass clss, jlong ocpl_id, jintArray attributes)
+Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change(JNIEnv *env, jclass clss, jlong ocpl_id, jintArray attributes)
 {
-    jboolean  isCopy;
-    jint     *theArray = NULL;
-    herr_t    retVal = FAIL;
+    jboolean isCopy;
+    jint *   theArray = NULL;
+    herr_t   retVal   = FAIL;
 
     UNUSED(clss);
 
@@ -156,7 +152,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change
 
     PIN_INT_ARRAY(ENVONLY, attributes, theArray, &isCopy, "H5Pget_attr_phase_change: input not pinned");
 
-    if ((retVal = H5Pget_attr_phase_change((hid_t)ocpl_id, (unsigned *)&(theArray[0]), (unsigned *)&(theArray[1]))) < 0)
+    if ((retVal = H5Pget_attr_phase_change((hid_t)ocpl_id, (unsigned *)&(theArray[0]),
+                                           (unsigned *)&(theArray[1]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -172,8 +169,8 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1attr_1creation_1order
-    (JNIEnv *env, jclass clss, jlong ocpl_id, jint crt_order_flags)
+Java_hdf_hdf5lib_H5_H5Pset_1attr_1creation_1order(JNIEnv *env, jclass clss, jlong ocpl_id,
+                                                  jint crt_order_flags)
 {
     herr_t retVal = FAIL;
 
@@ -192,8 +189,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1attr_1creation_1order
-    (JNIEnv *env, jclass clss, jlong ocpl_id)
+Java_hdf_hdf5lib_H5_H5Pget_1attr_1creation_1order(JNIEnv *env, jclass clss, jlong ocpl_id)
 {
     unsigned crt_order_flags = 0;
 
diff --git a/java/src/jni/h5pOCPLImp.h b/java/src/jni/h5pOCPLImp.h
index fe01f06..ad45ab9 100644
--- a/java/src/jni/h5pOCPLImp.h
+++ b/java/src/jni/h5pOCPLImp.h
@@ -25,72 +25,57 @@ extern "C" {
  * Method:    H5Pset_create_intermediate_group
  * Signature: (JZ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1create_1intermediate_1group
-(JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1create_1intermediate_1group(JNIEnv *, jclass, jlong,
+                                                                               jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_create_intermediate_group
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1create_1intermediate_1group
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1create_1intermediate_1group(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_obj_track_times
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1obj_1track_1times
-(JNIEnv *, jclass, jlong, jboolean);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1obj_1track_1times(JNIEnv *, jclass, jlong, jboolean);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_obj_track_times
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_attr_phase_change
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1attr_1phase_1change
-(JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1attr_1phase_1change(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_attr_phase_change
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change
-(JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1attr_1phase_1change(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pset_attr_creation_order
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1attr_1creation_1order
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pset_1attr_1creation_1order(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_attr_creation_order
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1attr_1creation_1order
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1attr_1creation_1order(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5pOCpyPLImp.c b/java/src/jni/h5pOCpyPLImp.c
index 9481f91..81664ce 100644
--- a/java/src/jni/h5pOCpyPLImp.c
+++ b/java/src/jni/h5pOCpyPLImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (JI)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1copy_1object
-    (JNIEnv *env, jclass clss, jlong ocp_plist_id, jint copy_options)
+Java_hdf_hdf5lib_H5_H5Pset_1copy_1object(JNIEnv *env, jclass clss, jlong ocp_plist_id, jint copy_options)
 {
     herr_t retVal = FAIL;
 
@@ -57,8 +56,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1copy_1object
-    (JNIEnv *env, jclass clss, jlong ocp_plist_id)
+Java_hdf_hdf5lib_H5_H5Pget_1copy_1object(JNIEnv *env, jclass clss, jlong ocp_plist_id)
 {
     unsigned copy_options = 0;
 
diff --git a/java/src/jni/h5pOCpyPLImp.h b/java/src/jni/h5pOCpyPLImp.h
index f1dca58..662fba1 100644
--- a/java/src/jni/h5pOCpyPLImp.h
+++ b/java/src/jni/h5pOCpyPLImp.h
@@ -25,18 +25,14 @@ extern "C" {
  * Method:    H5Pset_copy_object
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1copy_1object
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1copy_1object(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_copy_object
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1copy_1object
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1copy_1object(JNIEnv *, jclass, jlong);
 
 /*
  * TODO: H5Padd_merge_committed_dtype_path
diff --git a/java/src/jni/h5pStrCPLImp.c b/java/src/jni/h5pStrCPLImp.c
index e69847d..aceeb0b 100644
--- a/java/src/jni/h5pStrCPLImp.c
+++ b/java/src/jni/h5pStrCPLImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (JI)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1char_1encoding
-    (JNIEnv *env, jclass clss, jlong acpl, jint encoding)
+Java_hdf_hdf5lib_H5_H5Pset_1char_1encoding(JNIEnv *env, jclass clss, jlong acpl, jint encoding)
 {
     UNUSED(clss);
 
@@ -55,8 +54,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1char_1encoding
-    (JNIEnv *env, jclass clss, jlong acpl)
+Java_hdf_hdf5lib_H5_H5Pget_1char_1encoding(JNIEnv *env, jclass clss, jlong acpl)
 {
     H5T_cset_t encoding = H5T_CSET_ERROR;
 
diff --git a/java/src/jni/h5pStrCPLImp.h b/java/src/jni/h5pStrCPLImp.h
index 6e140d3..1e89314 100644
--- a/java/src/jni/h5pStrCPLImp.h
+++ b/java/src/jni/h5pStrCPLImp.h
@@ -25,18 +25,14 @@ extern "C" {
  * Method:    H5Pset_char_encoding
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Pset_1char_1encoding
-(JNIEnv *, jclass, jlong, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Pset_1char_1encoding(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Pget_char_encoding
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1char_1encoding
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Pget_1char_1encoding(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c
index ce42842..4d2743a 100644
--- a/java/src/jni/h5plImp.c
+++ b/java/src/jni/h5plImp.c
@@ -37,8 +37,7 @@ extern "C" {
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLset_1loading_1state
-    (JNIEnv *env, jclass clss, jint plugin_flags)
+Java_hdf_hdf5lib_H5_H5PLset_1loading_1state(JNIEnv *env, jclass clss, jint plugin_flags)
 {
     UNUSED(clss);
 
@@ -55,8 +54,7 @@ done:
  * Signature: (V)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5PLget_1loading_1state
-    (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5PLget_1loading_1state(JNIEnv *env, jclass clss)
 {
     unsigned int plugin_type = 0;
 
@@ -75,11 +73,10 @@ done:
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLappend
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path)
+Java_hdf_hdf5lib_H5_H5PLappend(JNIEnv *env, jclass clss, jobjectArray plugin_path)
 {
     const char *newPath = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal  = FAIL;
 
     UNUSED(clss);
 
@@ -101,11 +98,10 @@ done:
  * Signature: (Ljava/lang/String;)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLprepend
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path)
+Java_hdf_hdf5lib_H5_H5PLprepend(JNIEnv *env, jclass clss, jobjectArray plugin_path)
 {
     const char *newPath = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal  = FAIL;
 
     UNUSED(clss);
 
@@ -128,11 +124,10 @@ done:
  * Signature: (Ljava/lang/String;I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLreplace
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
+Java_hdf_hdf5lib_H5_H5PLreplace(JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
 {
     const char *newPath = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal  = FAIL;
 
     UNUSED(clss);
 
@@ -144,7 +139,7 @@ Java_hdf_hdf5lib_H5_H5PLreplace
 
     PIN_JAVA_STRING(ENVONLY, plugin_path, newPath, NULL, "H5PLreplace: new path not pinned");
 
-    if ((retVal = H5PLreplace(newPath, (unsigned) idx)) < 0)
+    if ((retVal = H5PLreplace(newPath, (unsigned)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -158,11 +153,10 @@ done:
  * Signature: (Ljava/lang/String;I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLinsert
-  (JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
+Java_hdf_hdf5lib_H5_H5PLinsert(JNIEnv *env, jclass clss, jobjectArray plugin_path, jint idx)
 {
     const char *newPath = NULL;
-    herr_t      retVal = FAIL;
+    herr_t      retVal  = FAIL;
 
     UNUSED(clss);
 
@@ -174,7 +168,7 @@ Java_hdf_hdf5lib_H5_H5PLinsert
 
     PIN_JAVA_STRING(ENVONLY, plugin_path, newPath, NULL, "H5PLinsert: new path not pinned");
 
-    if ((retVal = H5PLinsert(newPath, (unsigned) idx)) < 0)
+    if ((retVal = H5PLinsert(newPath, (unsigned)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -188,15 +182,14 @@ done:
  * Signature: (I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLremove
-  (JNIEnv *env, jclass clss, jint idx)
+Java_hdf_hdf5lib_H5_H5PLremove(JNIEnv *env, jclass clss, jint idx)
 {
     UNUSED(clss);
 
     if (idx < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLremove: index < 0");
 
-    if (H5PLremove((unsigned) idx) < 0)
+    if (H5PLremove((unsigned)idx) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -209,12 +202,11 @@ done:
  * Signature: (I)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5PLget
-  (JNIEnv *env, jclass clss, jint idx)
+Java_hdf_hdf5lib_H5_H5PLget(JNIEnv *env, jclass clss, jint idx)
 {
-    jstring  str = NULL;
-    ssize_t  buf_size;
-    char    *aName = NULL;
+    jstring str = NULL;
+    ssize_t buf_size;
+    char *  aName = NULL;
 
     UNUSED(clss);
 
@@ -222,13 +214,13 @@ Java_hdf_hdf5lib_H5_H5PLget
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5PLget: index < 0");
 
     /* Get the length of the name */
-    if ((buf_size = H5PLget((unsigned) idx, NULL, 0)) < 0)
+    if ((buf_size = H5PLget((unsigned)idx, NULL, 0)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (aName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+    if (NULL == (aName = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5PLget: failed to allocate plugin name buffer");
 
-    if ((H5PLget((unsigned) idx, aName, (size_t)buf_size + 1)) < 0)
+    if ((H5PLget((unsigned)idx, aName, (size_t)buf_size + 1)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     aName[buf_size] = '\0';
 
@@ -248,8 +240,7 @@ done:
  * Signature: (V)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5PLsize
-  (JNIEnv *env, jclass clss)
+Java_hdf_hdf5lib_H5_H5PLsize(JNIEnv *env, jclass clss)
 {
     unsigned int listsize = 0;
 
diff --git a/java/src/jni/h5plImp.h b/java/src/jni/h5plImp.h
index 5336621..82b0699 100644
--- a/java/src/jni/h5plImp.h
+++ b/java/src/jni/h5plImp.h
@@ -26,81 +26,63 @@ extern "C" {
  * Method:    H5PLset_loading_state
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLset_1loading_1state
-  (JNIEnv *, jclass, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLset_1loading_1state(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLget_loading_state
  * Signature: (V)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5PLget_1loading_1state
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5PLget_1loading_1state(JNIEnv *, jclass);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLappend
  * Signature: (Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLappend
-  (JNIEnv *, jclass, jobjectArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLappend(JNIEnv *, jclass, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLprepend
  * Signature: (Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLprepend
-  (JNIEnv *, jclass, jobjectArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLprepend(JNIEnv *, jclass, jobjectArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLreplace
  * Signature: (Ljava/lang/String;I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLreplace
-  (JNIEnv *, jclass, jobjectArray, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLreplace(JNIEnv *, jclass, jobjectArray, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLinsert
  * Signature: (Ljava/lang/String;I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLinsert
-  (JNIEnv *, jclass, jobjectArray, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLinsert(JNIEnv *, jclass, jobjectArray, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLremove
  * Signature: (I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5PLremove
-  (JNIEnv *, jclass, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5PLremove(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLget
  * Signature: (I)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5PLget
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5PLget(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5PLsize
  * Signature: (V)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5PLsize
-  (JNIEnv *, jclass);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5PLsize(JNIEnv *, jclass);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index e24fc2a..abdd8a1 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -26,7 +26,6 @@ extern "C" {
 #include "h5jni.h"
 #include "h5rImp.h"
 
-
 /* H5R: HDF5 1.12 Reference API Functions */
 
 /*
@@ -35,13 +34,12 @@ extern "C" {
  * Signature: (JLjava/lang/String;)[B
  */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1object
-  (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong aid)
+Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong aid)
 {
     const char *refName = NULL;
-    jbyteArray  ref = NULL;
-    jbyte      *refBuf = NULL;
-    herr_t      status = FAIL;
+    jbyteArray  ref     = NULL;
+    jbyte *     refBuf  = NULL;
+    herr_t      status  = FAIL;
 
     UNUSED(clss);
 
@@ -71,20 +69,19 @@ done:
     return ref;
 } /* end Java_hdf_hdf5lib_H5_H5Rcreate_1object */
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rcreate_region
  * Signature: (JLjava/lang/String;J)[B
  */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1region
-  (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong space_id, jlong aid)
+Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong space_id,
+                                      jlong aid)
 {
     const char *refName = NULL;
-    jbyteArray  ref = NULL;
-    jbyte      *refBuf = NULL;
-    herr_t      status = FAIL;
+    jbyteArray  ref     = NULL;
+    jbyte *     refBuf  = NULL;
+    herr_t      status  = FAIL;
 
     UNUSED(clss);
 
@@ -96,7 +93,8 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1region
     if (NULL == (refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_region: failed to allocate reference buffer");
 
-    if ((status = H5Rcreate_region((hid_t)loc_id, refName, space_id, (hid_t)aid, (const H5R_ref_t *)refBuf)) < 0)
+    if ((status = H5Rcreate_region((hid_t)loc_id, refName, space_id, (hid_t)aid, (const H5R_ref_t *)refBuf)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
@@ -120,14 +118,14 @@ done:
  * Signature: (JLjava/lang/String;Ljava/lang/String;)[B
  */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1attr
-  (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jstring attr_name, jlong aid)
+Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jstring attr_name,
+                                    jlong aid)
 {
-    const char *refName = NULL;
+    const char *refName  = NULL;
     const char *attrName = NULL;
-    jbyteArray  ref = NULL;
-    jbyte      *refBuf = NULL;
-    herr_t      status = FAIL;
+    jbyteArray  ref      = NULL;
+    jbyte *     refBuf   = NULL;
+    herr_t      status   = FAIL;
 
     UNUSED(clss);
 
@@ -143,7 +141,8 @@ Java_hdf_hdf5lib_H5_H5Rcreate_1attr
     if (NULL == (refBuf = HDcalloc(1, H5R_REF_BUF_SIZE)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rcreate_attr: failed to allocate reference buffer");
 
-    if ((status = H5Rcreate_attr((hid_t)loc_id, refName, attrName, (hid_t)aid, (const H5R_ref_t *)refBuf)) < 0)
+    if ((status = H5Rcreate_attr((hid_t)loc_id, refName, attrName, (hid_t)aid, (const H5R_ref_t *)refBuf)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (NULL == (ref = ENVPTR->NewByteArray(ENVONLY, (jsize)H5R_REF_BUF_SIZE)))
@@ -169,13 +168,12 @@ done:
  * Signature: ([B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Rdestroy
-  (JNIEnv *env, jclass clss, jbyteArray ref)
+Java_hdf_hdf5lib_H5_H5Rdestroy(JNIEnv *env, jclass clss, jbyteArray ref)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jsize       refBufLen;
-    herr_t      status = FAIL;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -203,13 +201,12 @@ done:
  * Signature: ([B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1type
-  (JNIEnv *env, jclass clss, jbyteArray ref)
+Java_hdf_hdf5lib_H5_H5Rget_1type(JNIEnv *env, jclass clss, jbyteArray ref)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jsize       refBufLen;
-    H5R_type_t  ref_type = -1;
+    jboolean   isCopy;
+    jbyte *    refBuf = NULL;
+    jsize      refBufLen;
+    H5R_type_t ref_type = -1;
 
     UNUSED(clss);
 
@@ -239,15 +236,14 @@ done:
  * Signature: ([B[B)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Requal
-  (JNIEnv *env, jclass clss, jbyteArray ref1, jbyteArray ref2)
+Java_hdf_hdf5lib_H5_H5Requal(JNIEnv *env, jclass clss, jbyteArray ref1, jbyteArray ref2)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf1 = NULL;
-    jbyte      *refBuf2 = NULL;
-    jsize       refBufLen;
-    htri_t      bval = JNI_FALSE;
-    herr_t      status = FAIL;
+    jboolean isCopy;
+    jbyte *  refBuf1 = NULL;
+    jbyte *  refBuf2 = NULL;
+    jsize    refBufLen;
+    htri_t   bval   = JNI_FALSE;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -292,15 +288,14 @@ done:
  * Signature: ([B)[B
  */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcopy
-  (JNIEnv *env, jclass clss, jbyteArray src_ref)
+Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *env, jclass clss, jbyteArray src_ref)
 {
-    jboolean    isCopy;
-    jbyte      *src_refBuf = NULL;
-    jsize       refBufLen;
-    jbyteArray  dst_ref = NULL;
-    jbyte      *dst_refBuf = NULL;
-    herr_t      status = FAIL;
+    jboolean   isCopy;
+    jbyte *    src_refBuf = NULL;
+    jsize      refBufLen;
+    jbyteArray dst_ref    = NULL;
+    jbyte *    dst_refBuf = NULL;
+    herr_t     status     = FAIL;
 
     UNUSED(clss);
 
@@ -341,13 +336,12 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1object
-  (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
+Java_hdf_hdf5lib_H5_H5Ropen_1object(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jsize       refBufLen;
-    hid_t     retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -377,13 +371,12 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1region
-  (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
+Java_hdf_hdf5lib_H5_H5Ropen_1region(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong oapl_id)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jsize       refBufLen;
-    hid_t       retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -413,13 +406,12 @@ done:
  * Signature: ([BJJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1attr
-  (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id)
+Java_hdf_hdf5lib_H5_H5Ropen_1attr(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id, jlong aapl_id)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jsize       refBufLen;
-    hid_t       retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -449,13 +441,12 @@ done:
  * Signature: ([BJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3
-  (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id)
+Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id)
 {
-    H5O_type_t  object_info = -1;
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    int         retVal = -1;
+    H5O_type_t object_info = -1;
+    jboolean   isCopy;
+    jbyte *    refBuf = NULL;
+    int        retVal = -1;
 
     UNUSED(clss);
 
@@ -483,15 +474,14 @@ done:
  * Signature: ([B)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1file_1name
-  (JNIEnv *env, jclass clss, jbyteArray ref)
+Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *env, jclass clss, jbyteArray ref)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jstring     str = NULL;
-    ssize_t     buf_size;
-    ssize_t     check_size = -1;
-    char       *namePtr = NULL;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jstring  str    = NULL;
+    ssize_t  buf_size;
+    ssize_t  check_size = -1;
+    char *   namePtr    = NULL;
 
     UNUSED(clss);
 
@@ -529,15 +519,14 @@ done:
  * Signature: ([BJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1name
-  (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id)
+Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jstring     str = NULL;
-    ssize_t     buf_size;
-    ssize_t     check_size = -1;
-    char       *namePtr = NULL;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jstring  str    = NULL;
+    ssize_t  buf_size;
+    ssize_t  check_size = -1;
+    char *   namePtr    = NULL;
 
     UNUSED(clss);
 
@@ -553,7 +542,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1name
     if (NULL == (namePtr = HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_obj_name: malloc failed");
 
-    if ((check_size = H5Rget_obj_name((const H5R_ref_t *)refBuf, (hid_t)rapl_id, namePtr, (size_t)buf_size + 1)) < 0)
+    if ((check_size =
+             H5Rget_obj_name((const H5R_ref_t *)refBuf, (hid_t)rapl_id, namePtr, (size_t)buf_size + 1)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
     namePtr[buf_size] = '\0';
 
@@ -575,15 +565,14 @@ done:
  * Signature: ([B)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1attr_1name
-  (JNIEnv *env, jclass clss, jbyteArray ref)
+Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *env, jclass clss, jbyteArray ref)
 {
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    jstring     str = NULL;
-    ssize_t     buf_size;
-    ssize_t     check_size = -1;
-    char       *namePtr = NULL;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jstring  str    = NULL;
+    ssize_t  buf_size;
+    ssize_t  check_size = -1;
+    char *   namePtr    = NULL;
 
     UNUSED(clss);
 
@@ -623,12 +612,12 @@ done:
  * Signature: ([BJLjava/lang/String;IJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate
-    (JNIEnv *env, jclass clss, jbyteArray ref, jlong loc_id, jstring name, jint ref_type, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Rcreate(JNIEnv *env, jclass clss, jbyteArray ref, jlong loc_id, jstring name,
+                              jint ref_type, jlong space_id)
 {
     const char *refName = NULL;
     jboolean    isCopy;
-    jbyte      *refBuf = NULL;
+    jbyte *     refBuf = NULL;
     jsize       refBufLen;
     herr_t      status = FAIL;
 
@@ -647,7 +636,8 @@ Java_hdf_hdf5lib_H5_H5Rcreate
     if ((H5R_OBJECT == ref_type) && (refBufLen != H5R_OBJ_REF_BUF_SIZE))
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rcreate: reference input array length != H5R_OBJ_REF_BUF_SIZE");
     else if ((H5R_DATASET_REGION == ref_type) && (refBufLen != H5R_DSET_REG_REF_BUF_SIZE))
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rcreate: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
+        H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                              "H5Rcreate: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
     else if ((H5R_OBJECT != ref_type) && (H5R_DATASET_REGION != ref_type))
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rcreate: unknown reference type");
 
@@ -673,13 +663,13 @@ done:
  * Signature: (JJI[B)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Rdereference
-    (JNIEnv *env, jclass clss, jlong dataset, jlong access_list, jint ref_type, jbyteArray ref)
+Java_hdf_hdf5lib_H5__1H5Rdereference(JNIEnv *env, jclass clss, jlong dataset, jlong access_list,
+                                     jint ref_type, jbyteArray ref)
 {
-    jboolean  isCopy;
-    jbyte    *refBuf = NULL;
-    jsize     refBufLen;
-    hid_t     retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -692,9 +682,11 @@ Java_hdf_hdf5lib_H5__1H5Rdereference
     }
 
     if ((H5R_OBJECT == ref_type) && (refBufLen != H5R_OBJ_REF_BUF_SIZE))
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rdereference: reference input array length != H5R_OBJ_REF_BUF_SIZE");
+        H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                              "H5Rdereference: reference input array length != H5R_OBJ_REF_BUF_SIZE");
     else if ((H5R_DATASET_REGION == ref_type) && (refBufLen != H5R_DSET_REG_REF_BUF_SIZE))
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rdereference: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY, "H5Rdereference: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
     else if ((H5R_OBJECT != ref_type) && (H5R_DATASET_REGION != ref_type))
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rdereference: unknown reference type");
 
@@ -716,13 +708,12 @@ done:
  * Signature: (JI[B)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Rget_1region
-    (JNIEnv *env, jclass clss, jlong dataset, jint ref_type, jbyteArray ref)
+Java_hdf_hdf5lib_H5__1H5Rget_1region(JNIEnv *env, jclass clss, jlong dataset, jint ref_type, jbyteArray ref)
 {
-    jboolean  isCopy;
-    jbyte    *refBuf = NULL;
-    jsize     refBufLen;
-    hid_t     retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  refBuf = NULL;
+    jsize    refBufLen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -737,7 +728,8 @@ Java_hdf_hdf5lib_H5__1H5Rget_1region
     }
 
     if (refBufLen != H5R_DSET_REG_REF_BUF_SIZE)
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rget_region: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY, "H5Rget_region: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
 
     PIN_BYTE_ARRAY(ENVONLY, ref, refBuf, &isCopy, "H5Rget_region: reference buffer not pinned");
 
@@ -757,13 +749,12 @@ done:
  * Signature: (JI[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type
-    (JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref)
+Java_hdf_hdf5lib_H5_H5Rget_1obj_1type(JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref)
 {
-    H5O_type_t  object_info;
-    jboolean    isCopy;
-    jbyte      *refBuf = NULL;
-    int         retVal = -1;
+    H5O_type_t object_info;
+    jboolean   isCopy;
+    jbyte *    refBuf = NULL;
+    int        retVal = -1;
 
     UNUSED(clss);
 
@@ -791,14 +782,14 @@ done:
  * Signature: (JI[B[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2
-    (JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref, jintArray ref_obj)
+Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2(JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref,
+                                       jintArray ref_obj)
 {
-    jboolean  isCopy, isCopy2;
-    jbyte    *refBuf = NULL;
-    jint     *ref_objP = NULL;
-    jint      status = -1;
-    int       retVal = -1;
+    jboolean isCopy, isCopy2;
+    jbyte *  refBuf   = NULL;
+    jint *   ref_objP = NULL;
+    jint     status   = -1;
+    int      retVal   = -1;
 
     UNUSED(clss);
 
@@ -831,15 +822,15 @@ done:
  * Signature: (JI[B[Ljava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1name
-    (JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref, jobjectArray name, jlong size)
+Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *env, jclass clss, jlong loc_id, jint ref_type, jbyteArray ref,
+                                 jobjectArray name, jlong size)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jsize     refBufLen;
-    jbyte    *refBuf = NULL;
-    char     *aName = NULL;
-    jlong     ret_val = -1;
+    jboolean isCopy;
+    jstring  str;
+    jsize    refBufLen;
+    jbyte *  refBuf  = NULL;
+    char *   aName   = NULL;
+    jlong    ret_val = -1;
 
     UNUSED(clss);
 
@@ -856,7 +847,8 @@ Java_hdf_hdf5lib_H5_H5Rget_1name
     if ((H5R_OBJECT == ref_type) && (refBufLen != H5R_OBJ_REF_BUF_SIZE))
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rget_name: reference input array length != H5R_OBJ_REF_BUF_SIZE");
     else if ((H5R_DATASET_REGION == ref_type) && (refBufLen != H5R_DSET_REG_REF_BUF_SIZE))
-        H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rget_name: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
+        H5_BAD_ARGUMENT_ERROR(
+            ENVONLY, "H5Rget_name: region reference input array length != H5R_DSET_REG_REF_BUF_SIZE");
     else if ((H5R_OBJECT != ref_type) && (H5R_DATASET_REGION != ref_type))
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Rget_name: unknown reference type");
 
@@ -865,14 +857,15 @@ Java_hdf_hdf5lib_H5_H5Rget_1name
     if (NULL == (aName = HDmalloc(sizeof(char) * (size_t)size + 1)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Rget_name: failed to allocate referenced object name buffer");
 
-    if ((ret_val = (jlong)H5Rget_name((hid_t)loc_id, (H5R_type_t)ref_type, refBuf, aName, (size_t)size + 1)) < 0)
+    if ((ret_val = (jlong)H5Rget_name((hid_t)loc_id, (H5R_type_t)ref_type, refBuf, aName, (size_t)size + 1)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
     aName[(size_t)size] = '\0';
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, aName)))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-    ENVPTR->SetObjectArrayElement(ENVONLY, name, (jsize) 0, str);
+    ENVPTR->SetObjectArrayElement(ENVONLY, name, (jsize)0, str);
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
 done:
@@ -884,7 +877,6 @@ done:
     return ret_val;
 } /* end Java_hdf_hdf5lib_H5_H5Rget_1name */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5rImp.h b/java/src/jni/h5rImp.h
index 3bdb266..d0c5e3b 100644
--- a/java/src/jni/h5rImp.h
+++ b/java/src/jni/h5rImp.h
@@ -28,126 +28,100 @@ extern "C" {
  * Method:    H5Rcreate_object
  * Signature: (JLjava/lang/String;)[B
  */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1object
-  (JNIEnv *, jclass, jlong, jstring, jlong);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1object(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rcreate_region
  * Signature: (JLjava/lang/String;J)[B
  */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1region
-  (JNIEnv *, jclass, jlong, jstring, jlong, jlong);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1region(JNIEnv *, jclass, jlong, jstring, jlong,
+                                                                   jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rcreate_attr
  * Signature: (JLjava/lang/String;Ljava/lang/String;)[B
  */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate_1attr
-  (JNIEnv *, jclass, jlong, jstring, jstring, jlong);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcreate_1attr(JNIEnv *, jclass, jlong, jstring, jstring,
+                                                                 jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rdestroy
  * Signature: ([B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Rdestroy
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Rdestroy(JNIEnv *, jclass, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_type
  * Signature: ([B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1type
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1type(JNIEnv *, jclass, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Requal
  * Signature: ([B[B)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Requal
-  (JNIEnv *, jclass, jbyteArray, jbyteArray);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Requal(JNIEnv *, jclass, jbyteArray, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rcopy
  * Signature: ([B)[B
  */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Rcopy
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Rcopy(JNIEnv *, jclass, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ropen_object
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1object
-  (JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1object(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ropen_region
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1region
-  (JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1region(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Ropen_attr
  * Signature: ([BJJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Ropen_1attr
-  (JNIEnv *, jclass, jbyteArray, jlong, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Ropen_1attr(JNIEnv *, jclass, jbyteArray, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_obj_type3
  * Signature: ([BJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3
-  (JNIEnv *, jclass, jbyteArray, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3(JNIEnv *, jclass, jbyteArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_file_name
  * Signature: ([B)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1file_1name
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1file_1name(JNIEnv *, jclass, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_obj_name
  * Signature: ([BJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1name
-  (JNIEnv *, jclass, jbyteArray, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1name(JNIEnv *, jclass, jbyteArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_attr_name
  * Signature: ([B)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1attr_1name
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Rget_1attr_1name(JNIEnv *, jclass, jbyteArray);
 
 /* H5R: HDF5 1.8 Reference API Functions */
 
@@ -156,54 +130,46 @@ Java_hdf_hdf5lib_H5_H5Rget_1attr_1name
  * Method:    H5Rcreate
  * Signature: ([BJLjava/lang/String;IJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rcreate
-  (JNIEnv *, jclass, jbyteArray, jlong, jstring, jint, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rcreate(JNIEnv *, jclass, jbyteArray, jlong, jstring, jint,
+                                                     jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Rdereference
  * Signature: (JJI[B)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Rdereference
-  (JNIEnv *, jclass, jlong, jlong, jint, jbyteArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Rdereference(JNIEnv *, jclass, jlong, jlong, jint,
+                                                             jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_region
  * Signature: (JI[B)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Rget_1region
-  (JNIEnv *, jclass, jlong, jint, jbyteArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Rget_1region(JNIEnv *, jclass, jlong, jint, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5G_obj_t H5Rget_obj_type
  * Signature: (JI[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type
-  (JNIEnv *, jclass, jlong, jint, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1type(JNIEnv *, jclass, jlong, jint, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    int H5Rget_obj_type2
  * Signature: (JI[B[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2
-  (JNIEnv *, jclass, jlong, jint, jbyteArray, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2(JNIEnv *, jclass, jlong, jint, jbyteArray,
+                                                              jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Rget_name
  * Signature: (JI[B[Ljava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Rget_1name
-  (JNIEnv *, jclass, jlong, jint, jbyteArray, jobjectArray, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Rget_1name(JNIEnv *, jclass, jlong, jint, jbyteArray,
+                                                         jobjectArray, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index 3498392..2a9cff5 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -37,14 +37,13 @@ extern "C" {
  * Signature: (I)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Screate
-    (JNIEnv *env, jclass clss, jint type)
+Java_hdf_hdf5lib_H5__1H5Screate(JNIEnv *env, jclass clss, jint type)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Screate((H5S_class_t) type)) < 0)
+    if ((retVal = H5Screate((H5S_class_t)type)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -57,18 +56,18 @@ done:
  * Signature: (I[J[J)G
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Screate_1simple
-    (JNIEnv *env, jclass clss, jint rank, jlongArray dims, jlongArray maxdims)
+Java_hdf_hdf5lib_H5__1H5Screate_1simple(JNIEnv *env, jclass clss, jint rank, jlongArray dims,
+                                        jlongArray maxdims)
 {
-    jboolean  isCopy;
-    hsize_t  *sa = NULL;
-    hsize_t  *msa = NULL;
-    hsize_t  *lp = NULL;
-    jlong    *dimsP = NULL, *maxdimsP = NULL;
-    jlong    *jlp = NULL;
-    jsize     drank = 0, mrank = 0;
-    int       i;
-    hid_t     retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    hsize_t *sa    = NULL;
+    hsize_t *msa   = NULL;
+    hsize_t *lp    = NULL;
+    jlong *  dimsP = NULL, *maxdimsP = NULL;
+    jlong *  jlp   = NULL;
+    jsize    drank = 0, mrank = 0;
+    int      i;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -97,29 +96,29 @@ Java_hdf_hdf5lib_H5__1H5Screate_1simple
 
     PIN_LONG_ARRAY(ENVONLY, dims, dimsP, &isCopy, "H5Screate_simple: dims not pinned");
 
-    if (NULL == (sa = lp = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+    if (NULL == (sa = lp = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Screate_simple: failed to allocate dims buffer");
 
-    jlp = (jlong *) dimsP;
+    jlp = (jlong *)dimsP;
     for (i = 0; i < rank; i++) {
-        *lp = (hsize_t) *jlp;
+        *lp = (hsize_t)*jlp;
         lp++;
         jlp++;
     } /* end for */
 
     if (NULL == maxdims) {
         maxdimsP = NULL;
-        msa = (hsize_t *)maxdimsP;
+        msa      = (hsize_t *)maxdimsP;
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, maxdims, maxdimsP, &isCopy, "H5Screate_simple: maxdims not pinned");
 
-        if (NULL == (msa = lp = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+        if (NULL == (msa = lp = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Screate_simple: failed to allocate maxdims buffer");
 
-        jlp = (jlong *) maxdimsP;
+        jlp = (jlong *)maxdimsP;
         for (i = 0; i < mrank; i++) {
-            *lp = (hsize_t) *jlp;
+            *lp = (hsize_t)*jlp;
             lp++;
             jlp++;
         } /* end for */
@@ -147,8 +146,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Scopy
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5__1H5Scopy(JNIEnv *env, jclass clss, jlong space_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -177,12 +175,12 @@ done:
  * Signature: (JII[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1elements
-    (JNIEnv *env, jclass clss, jlong space_id, jint op, jint num_elemn, jlongArray coords)
+Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id, jint op, jint num_elemn,
+                                        jlongArray coords)
 {
     jboolean  isCopy;
     hssize_t *sa = NULL;
-    jlong    *P = NULL;
+    jlong *   P  = NULL;
     jint      i;
     int       rank;
     herr_t    status = FAIL;
@@ -194,7 +192,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements
 
     PIN_LONG_ARRAY(ENVONLY, coords, P, &isCopy, "H5Sselect_elements: coords not pinned");
 
-    if (NULL == (sa = (hssize_t *) HDmalloc( (size_t)num_elemn * 2 * sizeof(hssize_t))))
+    if (NULL == (sa = (hssize_t *)HDmalloc((size_t)num_elemn * 2 * sizeof(hssize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_elements: failed to allocate coordinate buffer");
 
     for (i = 0; i < (num_elemn * 2); i++) {
@@ -220,18 +218,18 @@ done:
  * Signature: (JII[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1elements
-    (JNIEnv *env, jclass clss, jlong space_id, jint op, jint num_elemn, jbyteArray coords)
+Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *env, jclass clss, jlong space_id, jint op, jint num_elemn,
+                                        jbyteArray coords)
 {
-    jboolean  isCopy;
-    hsize_t  *lp = NULL;
-    hsize_t  *llp = NULL;
-    jlong    *jlp = NULL;
-    jbyte    *P = NULL;
-    jsize     size;
-    int       ii;
-    int       nlongs;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *lp  = NULL;
+    hsize_t *llp = NULL;
+    jlong *  jlp = NULL;
+    jbyte *  P   = NULL;
+    jsize    size;
+    int      ii;
+    int      nlongs;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -247,18 +245,19 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements
 
     nlongs = (int)((size_t)size / sizeof(jlong));
 
-    if (NULL == (lp = (hsize_t *) HDmalloc((size_t)nlongs * sizeof(hsize_t))))
+    if (NULL == (lp = (hsize_t *)HDmalloc((size_t)nlongs * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_elements: failed to allocate coordinate buffer");
 
-    jlp = (jlong *) P;
+    jlp = (jlong *)P;
     llp = lp;
     for (ii = 0; ii < nlongs; ii++) {
-        *lp = (hsize_t) *jlp;
+        *lp = (hsize_t)*jlp;
         lp++;
         jlp++;
     } /* end for */
 
-    if ((status = H5Sselect_elements(space_id, (H5S_seloper_t)op, (size_t)num_elemn, (const hsize_t *)llp)) < 0)
+    if ((status = H5Sselect_elements(space_id, (H5S_seloper_t)op, (size_t)num_elemn, (const hsize_t *)llp)) <
+        0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -276,8 +275,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1all
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sselect_1all(JNIEnv *env, jclass clss, jlong space_id)
 {
     herr_t retVal = FAIL;
 
@@ -287,7 +285,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1all
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jint) retVal;
+    return (jint)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sselect_1all */
 
 /*
@@ -296,8 +294,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1none
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sselect_1none(JNIEnv *env, jclass clss, jlong space_id)
 {
     herr_t retVal = FAIL;
 
@@ -307,7 +304,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1none
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jint) retVal;
+    return (jint)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sselect_1none */
 
 /*
@@ -316,8 +313,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1valid
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sselect_1valid(JNIEnv *env, jclass clss, jlong space_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -338,8 +334,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints(JNIEnv *env, jclass clss, jlong space_id)
 {
     hssize_t retVal = -1;
 
@@ -349,7 +344,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) retVal;
+    return (jlong)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints */
 
 /*
@@ -358,8 +353,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints(JNIEnv *env, jclass clss, jlong space_id)
 {
     hssize_t retVal = -1;
 
@@ -369,7 +363,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jlong) retVal;
+    return (jlong)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints */
 
 /*
@@ -378,8 +372,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1type
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1type(JNIEnv *env, jclass clss, jlong space_id)
 {
     int retVal = -1;
 
@@ -389,7 +382,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1type
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jint) retVal;
+    return (jint)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sget_1select_1type */
 
 /*
@@ -398,8 +391,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims(JNIEnv *env, jclass clss, jlong space_id)
 {
     int retVal = -1;
 
@@ -409,7 +401,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
-    return (jint) retVal;
+    return (jint)retVal;
 } /* end Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims */
 
 /*
@@ -418,23 +410,23 @@ done:
  * Signature: (J[J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims
-    (JNIEnv *env, jclass clss, jlong space_id, jlongArray dims, jlongArray maxdims)
+Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims(JNIEnv *env, jclass clss, jlong space_id, jlongArray dims,
+                                                 jlongArray maxdims)
 {
-    jboolean  isCopy;
-    hsize_t  *sa = NULL;
-    hsize_t  *msa = NULL;
-    jlong    *dimsP = NULL, *maxdimsP = NULL;
-    int       i;
-    int       rank = -1;
-    int       mrank;
-    int       status = -1;
+    jboolean isCopy;
+    hsize_t *sa    = NULL;
+    hsize_t *msa   = NULL;
+    jlong *  dimsP = NULL, *maxdimsP = NULL;
+    int      i;
+    int      rank = -1;
+    int      mrank;
+    int      status = -1;
 
     UNUSED(clss);
 
     if (NULL == dims) {
         dimsP = NULL;
-        sa = (hsize_t *) dimsP;
+        sa    = (hsize_t *)dimsP;
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, dims, dimsP, &isCopy, "H5Sget_simple_extent_dims: dims not pinned");
@@ -444,18 +436,18 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_simple_extent_dims: dims array length < 0");
         }
 
-        if (NULL == (sa = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+        if (NULL == (sa = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_simple_extent_dims: failed to allocate dimension buffer");
     }
 
     if (NULL == maxdims) {
         maxdimsP = NULL;
-        msa = (hsize_t *) maxdimsP;
+        msa      = (hsize_t *)maxdimsP;
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, maxdims, maxdimsP, &isCopy, "H5Sget_simple_extent_dims: maxdims not pinned");
 
-        if ((mrank = (int) ENVPTR->GetArrayLength(ENVONLY, maxdims)) < 0) {
+        if ((mrank = (int)ENVPTR->GetArrayLength(ENVONLY, maxdims)) < 0) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_simple_extent_dims: maxdims array length < 0");
         }
@@ -465,8 +457,9 @@ Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims
         else if (mrank != rank)
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_simple_extent_dims: maxdims rank not same as dims");
 
-        if (NULL == (msa = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_simple_extent_dims: failed to allocate maximum dimension buffer");
+        if (NULL == (msa = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "H5Sget_simple_extent_dims: failed to allocate maximum dimension buffer");
     }
 
     if ((status = H5Sget_simple_extent_dims(space_id, (hsize_t *)sa, (hsize_t *)msa)) < 0)
@@ -503,8 +496,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1type
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1type(JNIEnv *env, jclass clss, jlong space_id)
 {
     H5S_class_t retVal = H5S_NO_CLASS;
 
@@ -526,18 +518,18 @@ done:
  * Signature: (JI[J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple
-    (JNIEnv *env, jclass clss, jlong space_id, jint rank, jlongArray dims, jlongArray maxdims)
+Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple(JNIEnv *env, jclass clss, jlong space_id, jint rank,
+                                           jlongArray dims, jlongArray maxdims)
 {
-    jboolean  isCopy;
-    hsize_t  *sa = NULL;
-    hsize_t  *msa = NULL;
-    hsize_t  *lp = NULL;
-    jlong    *dimsP = NULL, *maxdimsP = NULL;
-    jlong    *jlp = NULL;
-    jsize     drank, mrank;
-    int       i;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *sa    = NULL;
+    hsize_t *msa   = NULL;
+    hsize_t *lp    = NULL;
+    jlong *  dimsP = NULL, *maxdimsP = NULL;
+    jlong *  jlp = NULL;
+    jsize    drank, mrank;
+    int      i;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -564,35 +556,36 @@ Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple
 
     PIN_LONG_ARRAY(ENVONLY, dims, dimsP, &isCopy, "H5Sset_extent_simple: dims not pinned");
 
-    if (NULL == (sa = lp = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+    if (NULL == (sa = lp = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sset_extent_simple: failed to allocate dimension buffer");
 
-    jlp = (jlong *) dimsP;
+    jlp = (jlong *)dimsP;
     for (i = 0; i < rank; i++) {
-        *lp = (hsize_t) *jlp;
+        *lp = (hsize_t)*jlp;
         lp++;
         jlp++;
     } /* end for */
 
     if (NULL == maxdims) {
         maxdimsP = NULL;
-        msa = (hsize_t *) maxdimsP;
+        msa      = (hsize_t *)maxdimsP;
     }
     else {
         PIN_LONG_ARRAY(ENVONLY, maxdims, maxdimsP, &isCopy, "H5Sset_extent_simple: maxdims not pinned");
 
-        if (NULL == (msa = lp = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sset_extent_simple: failed to allocate maximum dimension buffer");
+        if (NULL == (msa = lp = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "H5Sset_extent_simple: failed to allocate maximum dimension buffer");
 
-        jlp = (jlong *) maxdimsP;
+        jlp = (jlong *)maxdimsP;
         for (i = 0; i < rank; i++) {
-            *lp = (hsize_t) *jlp;
+            *lp = (hsize_t)*jlp;
             lp++;
             jlp++;
         } /* end for */
     }
 
-    if ((status = H5Sset_extent_simple(space_id, rank, (hsize_t *) sa, (hsize_t *) msa)) < 0)
+    if ((status = H5Sset_extent_simple(space_id, rank, (hsize_t *)sa, (hsize_t *)msa)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -614,8 +607,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sis_1simple
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sis_1simple(JNIEnv *env, jclass clss, jlong space_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -636,16 +628,15 @@ done:
  * Signature: (J[B)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Soffset_1simple
-    (JNIEnv *env, jclass clss, jlong space_id, jbyteArray offset)
+Java_hdf_hdf5lib_H5_H5Soffset_1simple(JNIEnv *env, jclass clss, jlong space_id, jbyteArray offset)
 {
     jboolean  isCopy;
     hssize_t *sa = NULL;
     hssize_t *lp = NULL;
     size_t    rank;
     jsize     i;
-    jbyte    *P = NULL;
-    jlong    *jlp = NULL;
+    jbyte *   P      = NULL;
+    jlong *   jlp    = NULL;
     herr_t    status = FAIL;
 
     UNUSED(clss);
@@ -658,21 +649,21 @@ Java_hdf_hdf5lib_H5_H5Soffset_1simple
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Soffset_simple: offset array length < 0");
         }
 
-        rank = (size_t) i / sizeof(jlong);
+        rank = (size_t)i / sizeof(jlong);
 
-        if (NULL == (sa = lp = (hssize_t *) HDmalloc((size_t)rank * sizeof(hssize_t))))
+        if (NULL == (sa = lp = (hssize_t *)HDmalloc((size_t)rank * sizeof(hssize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Soffset_simple: failed to allocate offset buffer");
 
-        jlp = (jlong *) P;
-        for (i = 0; (size_t) i < rank; i++) {
-            *lp = (hssize_t) *jlp;
+        jlp = (jlong *)P;
+        for (i = 0; (size_t)i < rank; i++) {
+            *lp = (hssize_t)*jlp;
             lp++;
             jlp++;
         } /* end for */
     }
     else {
-        P = NULL;
-        sa = (hssize_t *) P;
+        P  = NULL;
+        sa = (hssize_t *)P;
     }
 
     if ((status = H5Soffset_simple(space_id, sa)) < 0)
@@ -693,8 +684,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sextent_1copy
-    (JNIEnv *env, jclass clss, jlong space_id, jlong src_id)
+Java_hdf_hdf5lib_H5_H5Sextent_1copy(JNIEnv *env, jclass clss, jlong space_id, jlong src_id)
 {
     herr_t retVal = FAIL;
 
@@ -713,8 +703,7 @@ done:
  * Signature: (JJ)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sextent_1equal
-    (JNIEnv *env, jclass clss, jlong space_id, jlong src_id)
+Java_hdf_hdf5lib_H5_H5Sextent_1equal(JNIEnv *env, jclass clss, jlong space_id, jlong src_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -735,8 +724,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sset_1extent_1none
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5_H5Sset_1extent_1none(JNIEnv *env, jclass clss, jlong space_id)
 {
     herr_t retVal = FAIL;
 
@@ -755,17 +743,17 @@ done:
  * Signature: (JI[J[J[J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
-    (JNIEnv *env, jclass clss, jlong space_id, jint op, jlongArray start, jlongArray stride, jlongArray count, jlongArray block)
+Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab(JNIEnv *env, jclass clss, jlong space_id, jint op, jlongArray start,
+                                         jlongArray stride, jlongArray count, jlongArray block)
 {
-    jboolean  isCopy;
-    hsize_t  *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL;
-    hsize_t  *lp = NULL;
-    jlong    *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL;
-    jlong    *jlp = NULL;
-    jsize     start_rank, stride_rank, count_rank, block_rank;
-    int       i;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL;
+    hsize_t *lp     = NULL;
+    jlong *  startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL;
+    jlong *  jlp = NULL;
+    jsize    start_rank, stride_rank, count_rank, block_rank;
+    int      i;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -788,31 +776,31 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
 
     PIN_LONG_ARRAY(ENVONLY, start, startP, &isCopy, "H5Sselect_hyperslab: start not pinned");
 
-    if (NULL == (strt = lp = (hsize_t *) HDmalloc((size_t)start_rank * sizeof(hsize_t))))
+    if (NULL == (strt = lp = (hsize_t *)HDmalloc((size_t)start_rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_hyperslab: failed to allocate start buffer");
 
-    jlp = (jlong *) startP;
+    jlp = (jlong *)startP;
     for (i = 0; i < start_rank; i++) {
-        *lp = (hsize_t) *jlp;
+        *lp = (hsize_t)*jlp;
         lp++;
         jlp++;
     } /* end if */
 
     PIN_LONG_ARRAY(ENVONLY, count, countP, &isCopy, "H5Sselect_hyperslab: count not pinned");
 
-    if (NULL == (cnt = lp = (hsize_t *) HDmalloc((size_t)count_rank * sizeof(hsize_t))))
+    if (NULL == (cnt = lp = (hsize_t *)HDmalloc((size_t)count_rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_hyperslab: failed to allocate count buffer");
 
-    jlp = (jlong *) countP;
+    jlp = (jlong *)countP;
     for (i = 0; i < count_rank; i++) {
-        *lp = (hsize_t) *jlp;
+        *lp = (hsize_t)*jlp;
         lp++;
         jlp++;
     } /* end if */
 
     if (NULL == stride) {
         strideP = NULL;
-        strd = (hsize_t *) strideP;
+        strd    = (hsize_t *)strideP;
     }
     else {
         if ((stride_rank = ENVPTR->GetArrayLength(ENVONLY, stride)) < 0) {
@@ -825,12 +813,12 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
 
         PIN_LONG_ARRAY(ENVONLY, stride, strideP, &isCopy, "H5Sselect_hyperslab: stride not pinned");
 
-        if (NULL == (strd = lp = (hsize_t *) HDmalloc((size_t)stride_rank * sizeof(hsize_t))))
+        if (NULL == (strd = lp = (hsize_t *)HDmalloc((size_t)stride_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_hyperslab: failed to allocate stride buffer");
 
-        jlp = (jlong *) strideP;
+        jlp = (jlong *)strideP;
         for (i = 0; i < stride_rank; i++) {
-            *lp = (hsize_t) *jlp;
+            *lp = (hsize_t)*jlp;
             lp++;
             jlp++;
         } /* end if */
@@ -838,7 +826,7 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
 
     if (NULL == block) {
         blockP = NULL;
-        blk = (hsize_t *) blockP;
+        blk    = (hsize_t *)blockP;
     }
     else {
         if ((block_rank = ENVPTR->GetArrayLength(ENVONLY, block)) < 0) {
@@ -851,19 +839,19 @@ Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
 
         PIN_LONG_ARRAY(ENVONLY, block, blockP, &isCopy, "H5Sselect_hyperslab: block not pinned");
 
-        if (NULL == (blk = lp = (hsize_t *) HDmalloc((size_t)block_rank * sizeof(hsize_t))))
+        if (NULL == (blk = lp = (hsize_t *)HDmalloc((size_t)block_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sselect_hyperslab: failed to allocate block buffer");
 
-        jlp = (jlong *) blockP;
+        jlp = (jlong *)blockP;
         for (i = 0; i < block_rank; i++) {
-            *lp = (hsize_t) *jlp;
+            *lp = (hsize_t)*jlp;
             lp++;
             jlp++;
         } /* end for */
     }
 
-    if ((status = H5Sselect_hyperslab(space_id, (H5S_seloper_t) op, (const hsize_t *) strt, (const hsize_t *) strd,
-                (const hsize_t *) cnt, (const hsize_t *) blk)) < 0)
+    if ((status = H5Sselect_hyperslab(space_id, (H5S_seloper_t)op, (const hsize_t *)strt,
+                                      (const hsize_t *)strd, (const hsize_t *)cnt, (const hsize_t *)blk)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -893,8 +881,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Sclose
-    (JNIEnv *env, jclass clss, jlong space_id)
+Java_hdf_hdf5lib_H5__1H5Sclose(JNIEnv *env, jclass clss, jlong space_id)
 {
     herr_t retVal = FAIL;
 
@@ -913,14 +900,13 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1nblocks
-    (JNIEnv *env, jclass clss, jlong spaceid)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1nblocks(JNIEnv *env, jclass clss, jlong spaceid)
 {
     hssize_t retVal = -1;
 
     UNUSED(clss);
 
-    if ((retVal = H5Sget_select_hyper_nblocks((hid_t) spaceid)) < 0)
+    if ((retVal = H5Sget_select_hyper_nblocks((hid_t)spaceid)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -933,14 +919,13 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1npoints
-    (JNIEnv *env, jclass clss, jlong spaceid)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1npoints(JNIEnv *env, jclass clss, jlong spaceid)
 {
     hssize_t retVal = -1;
 
     UNUSED(clss);
 
-    if ((retVal = H5Sget_select_elem_npoints((hid_t) spaceid)) < 0)
+    if ((retVal = H5Sget_select_elem_npoints((hid_t)spaceid)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -953,16 +938,16 @@ done:
  * Signature: (JJJ[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist
-    (JNIEnv *env, jclass clss, jlong spaceid, jlong startblock, jlong numblocks, jlongArray buf)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist(JNIEnv *env, jclass clss, jlong spaceid,
+                                                     jlong startblock, jlong numblocks, jlongArray buf)
 {
-    jboolean  isCopy;
-    hsize_t  *ba = NULL;
-    size_t    i, buf_size;
-    jlong    *bufP = NULL;
-    jsize     buflen;
-    int       rank;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *ba = NULL;
+    size_t   i, buf_size;
+    jlong *  bufP = NULL;
+    jsize    buflen;
+    int      rank;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -987,15 +972,17 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist
 
     PIN_LONG_ARRAY(ENVONLY, buf, bufP, &isCopy, "H5Sget_select_hyper_blocklist: buffer not pinned");
 
-    buf_size = (size_t) numblocks * (size_t) 2 * (size_t) rank * sizeof(hsize_t);
-    if (NULL == (ba = (hsize_t *) HDmalloc(buf_size)))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_select_hyper_blocklist: failed to allocate block list buffer");
+    buf_size = (size_t)numblocks * (size_t)2 * (size_t)rank * sizeof(hsize_t);
+    if (NULL == (ba = (hsize_t *)HDmalloc(buf_size)))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5Sget_select_hyper_blocklist: failed to allocate block list buffer");
 
-    if ((status = H5Sget_select_hyper_blocklist((hid_t)spaceid, (hsize_t) startblock, (hsize_t) numblocks, (hsize_t *)ba)) < 0)
+    if ((status = H5Sget_select_hyper_blocklist((hid_t)spaceid, (hsize_t)startblock, (hsize_t)numblocks,
+                                                (hsize_t *)ba)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0; i < (buf_size / sizeof(hsize_t)); i++) {
-        bufP[i] = (jlong) ba[i];
+        bufP[i] = (jlong)ba[i];
     } /* end for */
 
 done:
@@ -1013,15 +1000,15 @@ done:
  * Signature: (JJJ[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist
-    (JNIEnv *env, jclass clss, jlong spaceid, jlong startpoint, jlong numpoints, jlongArray buf)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist(JNIEnv *env, jclass clss, jlong spaceid, jlong startpoint,
+                                                    jlong numpoints, jlongArray buf)
 {
-    jboolean  isCopy;
-    hsize_t  *ba = NULL;
-    jlong    *bufP = NULL;
-    jsize     buflen;
-    int       i, rank;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *ba   = NULL;
+    jlong *  bufP = NULL;
+    jsize    buflen;
+    int      i, rank;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1044,14 +1031,15 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist
 
     PIN_LONG_ARRAY(ENVONLY, buf, bufP, &isCopy, "H5Sget_select_elem_pointlist: buffer not pinned");
 
-    if (NULL == (ba = (hsize_t *) HDmalloc(((size_t)numpoints * (size_t)rank) * sizeof(hsize_t))))
+    if (NULL == (ba = (hsize_t *)HDmalloc(((size_t)numpoints * (size_t)rank) * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_select_elem_pointlist: failed to allocate point list buffer");
 
-    if ((status = H5Sget_select_elem_pointlist((hid_t)spaceid, (hsize_t)startpoint, (hsize_t)numpoints, (hsize_t *)ba)) < 0)
+    if ((status = H5Sget_select_elem_pointlist((hid_t)spaceid, (hsize_t)startpoint, (hsize_t)numpoints,
+                                               (hsize_t *)ba)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0; i < (numpoints * rank); i++) {
-        bufP[i] = (jlong) ba[i];
+        bufP[i] = (jlong)ba[i];
     } /* end for */
 
 done:
@@ -1069,16 +1057,16 @@ done:
  * Signature: (J[J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds
-    (JNIEnv *env, jclass clss, jlong spaceid, jlongArray start, jlongArray end)
+Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds(JNIEnv *env, jclass clss, jlong spaceid, jlongArray start,
+                                           jlongArray end)
 {
-    jboolean  isCopy;
-    hsize_t  *strt = NULL;
-    hsize_t  *en = NULL;
-    size_t    i;
-    jlong    *startP = NULL, *endP = NULL;
-    jsize     rank;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *strt = NULL;
+    hsize_t *en   = NULL;
+    size_t   i;
+    jlong *  startP = NULL, *endP = NULL;
+    jsize    rank;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1094,20 +1082,20 @@ Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_select_bounds: start array length < 0");
     }
 
-    if (NULL == (strt = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+    if (NULL == (strt = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_select_bounds: failed to allocate start buffer");
 
     PIN_LONG_ARRAY(ENVONLY, end, endP, &isCopy, "H5Sget_select_bounds: end not pinned");
 
-    if (NULL == (en = (hsize_t *) HDmalloc((size_t)rank * sizeof(hsize_t))))
+    if (NULL == (en = (hsize_t *)HDmalloc((size_t)rank * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_select_bounds: failed to allocate end buffer");
 
-    if ((status = H5Sget_select_bounds((hid_t) spaceid, (hsize_t *) strt, (hsize_t *) en)) < 0)
+    if ((status = H5Sget_select_bounds((hid_t)spaceid, (hsize_t *)strt, (hsize_t *)en)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    for (i = 0; i < (size_t) rank; i++) {
-        startP[i] = (jlong) strt[i];
-        endP[i] = (jlong) en[i];
+    for (i = 0; i < (size_t)rank; i++) {
+        startP[i] = (jlong)strt[i];
+        endP[i]   = (jlong)en[i];
     } /* end for */
 
 done:
@@ -1129,12 +1117,11 @@ done:
  * Signature: (J)[B
  */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Sencode
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Sencode(JNIEnv *env, jclass clss, jlong obj_id)
 {
-    unsigned char *bufPtr = NULL;
-    size_t         buf_size = 0;
-    herr_t         status = FAIL;
+    unsigned char *bufPtr        = NULL;
+    size_t         buf_size      = 0;
+    herr_t         status        = FAIL;
     jbyteArray     returnedArray = NULL;
 
     UNUSED(clss);
@@ -1148,16 +1135,16 @@ Java_hdf_hdf5lib_H5_H5Sencode
     if (buf_size == 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sencode: buf_size = 0");
 
-    if (NULL == (bufPtr = (unsigned char *) HDcalloc((size_t) 1, buf_size)))
+    if (NULL == (bufPtr = (unsigned char *)HDcalloc((size_t)1, buf_size)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sencode: failed to allocate encoding buffer");
 
-    if ((status = H5Sencode2((hid_t) obj_id, bufPtr, &buf_size, H5P_DEFAULT)) < 0)
+    if ((status = H5Sencode2((hid_t)obj_id, bufPtr, &buf_size, H5P_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    if (NULL == (returnedArray = ENVPTR->NewByteArray(ENVONLY, (jsize) buf_size)))
+    if (NULL == (returnedArray = ENVPTR->NewByteArray(ENVONLY, (jsize)buf_size)))
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-    ENVPTR->SetByteArrayRegion(ENVONLY, returnedArray, 0, (jsize) buf_size, (jbyte *) bufPtr);
+    ENVPTR->SetByteArrayRegion(ENVONLY, returnedArray, 0, (jsize)buf_size, (jbyte *)bufPtr);
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
 done:
@@ -1173,12 +1160,11 @@ done:
  * Signature: ([B)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sdecode
-    (JNIEnv *env, jclass clss, jbyteArray buf)
+Java_hdf_hdf5lib_H5_H5Sdecode(JNIEnv *env, jclass clss, jbyteArray buf)
 {
-    jboolean  isCopy;
-    jbyte    *bufP = NULL;
-    hid_t     sid = H5I_INVALID_HID;
+    jboolean isCopy;
+    jbyte *  bufP = NULL;
+    hid_t    sid  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1203,8 +1189,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab
-    (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab(JNIEnv *env, jclass clss, jlong obj_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -1225,15 +1210,15 @@ done:
  * Signature: (J[J[J[J[J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
-    (JNIEnv *env, jclass clss, jlong space_id, jlongArray start, jlongArray stride, jlongArray count, jlongArray block)
+Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab(JNIEnv *env, jclass clss, jlong space_id, jlongArray start,
+                                               jlongArray stride, jlongArray count, jlongArray block)
 {
-    jboolean  isCopy;
-    hsize_t  *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL;
-    jlong    *startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL;
-    jsize     start_rank = -1, stride_rank = -1, count_rank = -1, block_rank = -1;
-    int       i, rank = -1;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    hsize_t *strt = NULL, *strd = NULL, *cnt = NULL, *blk = NULL;
+    jlong *  startP = NULL, *strideP = NULL, *countP = NULL, *blockP = NULL;
+    jsize    start_rank = -1, stride_rank = -1, count_rank = -1, block_rank = -1;
+    int      i, rank = -1;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1245,7 +1230,7 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
 
     if (NULL == start) {
         startP = NULL;
-        strt = (hsize_t *) startP;
+        strt   = (hsize_t *)startP;
     }
     else {
         if ((start_rank = ENVPTR->GetArrayLength(ENVONLY, start)) < 0) {
@@ -1254,17 +1239,18 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
         }
 
         if (start_rank != rank)
-            H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_regular_hyperslab: start rank doesn't match dataspace rank!");
+            H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                                  "H5Sget_regular_hyperslab: start rank doesn't match dataspace rank!");
 
         PIN_LONG_ARRAY(ENVONLY, start, startP, &isCopy, "H5Sget_regular_hyperslab: start not pinned");
 
-        if (NULL == (strt = (hsize_t *) HDmalloc((size_t)start_rank * sizeof(hsize_t))))
+        if (NULL == (strt = (hsize_t *)HDmalloc((size_t)start_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_regular_hyperslab: failed to allocate start buffer");
     }
 
     if (NULL == stride) {
         strideP = NULL;
-        strd = (hsize_t *) strideP;
+        strd    = (hsize_t *)strideP;
     }
     else {
         if ((stride_rank = ENVPTR->GetArrayLength(ENVONLY, stride)) < 0) {
@@ -1273,17 +1259,18 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
         }
 
         if (stride_rank != rank)
-            H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_regular_hyperslab: stride rank doesn't match dataspace rank!");
+            H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                                  "H5Sget_regular_hyperslab: stride rank doesn't match dataspace rank!");
 
         PIN_LONG_ARRAY(ENVONLY, stride, strideP, &isCopy, "H5Sget_regular_hyperslab: stride not pinned");
 
-        if (NULL == (strd = (hsize_t *) HDmalloc((size_t)stride_rank * sizeof(hsize_t))))
+        if (NULL == (strd = (hsize_t *)HDmalloc((size_t)stride_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_regular_hyperslab: failed to allocate stride buffer");
     }
 
     if (NULL == count) {
         countP = NULL;
-        cnt = (hsize_t *) countP;
+        cnt    = (hsize_t *)countP;
     }
     else {
         if ((count_rank = ENVPTR->GetArrayLength(ENVONLY, count)) < 0) {
@@ -1292,17 +1279,18 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
         }
 
         if (count_rank != rank)
-            H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_regular_hyperslab: count rank doesn't match dataspace rank!");
+            H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                                  "H5Sget_regular_hyperslab: count rank doesn't match dataspace rank!");
 
         PIN_LONG_ARRAY(ENVONLY, count, countP, &isCopy, "H5Sget_regular_hyperslab: count not pinned");
 
-        if (NULL == (cnt = (hsize_t *) HDmalloc((size_t)count_rank * sizeof(hsize_t))))
+        if (NULL == (cnt = (hsize_t *)HDmalloc((size_t)count_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_regular_hyperslab: failed to allocate count buffer");
     }
 
     if (NULL == block) {
         blockP = NULL;
-        blk = (hsize_t *) blockP;
+        blk    = (hsize_t *)blockP;
     }
     else {
         if ((block_rank = ENVPTR->GetArrayLength(ENVONLY, block)) < 0) {
@@ -1311,22 +1299,24 @@ Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
         }
 
         if (block_rank != rank)
-            H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sget_regular_hyperslab: block rank doesn't match dataspace rank!");
+            H5_BAD_ARGUMENT_ERROR(ENVONLY,
+                                  "H5Sget_regular_hyperslab: block rank doesn't match dataspace rank!");
 
         PIN_LONG_ARRAY(ENVONLY, block, blockP, &isCopy, "H5Sget_regular_hyperslab: block not pinned");
 
-        if (NULL == (blk = (hsize_t *) HDmalloc((size_t)block_rank * sizeof(hsize_t))))
+        if (NULL == (blk = (hsize_t *)HDmalloc((size_t)block_rank * sizeof(hsize_t))))
             H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Sget_regular_hyperslab: failed to allocate block buffer");
     }
 
-    if ((status = H5Sget_regular_hyperslab(space_id, (hsize_t *) strt, (hsize_t *) strd, (hsize_t *) cnt, (hsize_t *) blk)) < 0)
+    if ((status = H5Sget_regular_hyperslab(space_id, (hsize_t *)strt, (hsize_t *)strd, (hsize_t *)cnt,
+                                           (hsize_t *)blk)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0; i < start_rank; i++) {
-        startP[i] = (jlong) strt[i];
-        countP[i] = (jlong) cnt[i];
-        strideP[i] = (jlong) strd[i];
-        blockP[i] = (jlong) blk[i];
+        startP[i]  = (jlong)strt[i];
+        countP[i]  = (jlong)cnt[i];
+        strideP[i] = (jlong)strd[i];
+        blockP[i]  = (jlong)blk[i];
     } /* end for */
 
 done:
diff --git a/java/src/jni/h5sImp.h b/java/src/jni/h5sImp.h
index cea2ebf..ee28b39 100644
--- a/java/src/jni/h5sImp.h
+++ b/java/src/jni/h5sImp.h
@@ -26,27 +26,22 @@ extern "C" {
  * Method:    _H5Screate
  * Signature: (I)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Screate
-(JNIEnv *, jclass, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Screate(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Screate_simple
  * Signature: (I[J[J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Screate_1simple
-(JNIEnv *, jclass, jint, jlongArray, jlongArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Screate_1simple(JNIEnv *, jclass, jint, jlongArray,
+                                                                jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Scopy
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Scopy
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Scopy(JNIEnv *, jclass, jlong);
 
 #ifdef notdef
 /* 10/28/99 -- added code to copy the array -- this is not used,
@@ -63,9 +58,8 @@ Java_hdf_hdf5lib_H5__1H5Scopy
  * Method:    H5Sselect_elements
  * Signature: (JII[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1elements
-(JNIEnv *, jclass, jlong, jint, jint, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *, jclass, jlong, jint, jint,
+                                                               jlongArray);
 #endif
 
 /*
@@ -73,242 +67,197 @@ Java_hdf_hdf5lib_H5_H5Sselect_1elements
  * Method:    H5Sselect_elements
  * Signature: (JII[B)I
  */
-JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1elements
-(JNIEnv *, jclass, jlong, jint, jint, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1elements(JNIEnv *, jclass, jlong, jint, jint,
+                                                               jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sselect_all
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1all
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1all(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sselect_none
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1none
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1none(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sselect_valid
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1valid
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1valid(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_simple_extent_npoints
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1npoints(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_npoints
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1npoints(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_type
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1type
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1type(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_simple_extent_ndims
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1ndims(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_simple_extent_dims
  * Signature: (J[J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims
-(JNIEnv *, jclass, jlong, jlongArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1dims(JNIEnv *, jclass, jlong, jlongArray,
+                                                                        jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_simple_extent_type
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1type
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1simple_1extent_1type(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sset_extent_simple
  * Signature: (JI[J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple
-(JNIEnv *, jclass, jlong, jint, jlongArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sset_1extent_1simple(JNIEnv *, jclass, jlong, jint, jlongArray,
+                                                                  jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sis_simple
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sis_1simple
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Sis_1simple(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Soffset_simple
  * Signature: (J[B)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Soffset_1simple
-(JNIEnv *, jclass, jlong, jbyteArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Soffset_1simple(JNIEnv *, jclass, jlong, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sextent_copy
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sextent_1copy
-(JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sextent_1copy(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sextent_equal
  * Signature: (JJ)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sextent_1equal
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Sextent_1equal(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sset_extent_none
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sset_1extent_1none
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sset_1extent_1none(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sselect_hyperslab
  * Signature: (JI[J[J[J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab
-(JNIEnv *, jclass, jlong, jint, jlongArray, jlongArray, jlongArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sselect_1hyperslab(JNIEnv *, jclass, jlong, jint, jlongArray,
+                                                                jlongArray, jlongArray, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Sclose
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Sclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_hyper_nblocks
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1nblocks
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1nblocks(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_elem_npoints
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1npoints
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1npoints(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_hyper_blocklist
  * Signature: (JJJ[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist
-(JNIEnv *, jclass, jlong, jlong, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1hyper_1blocklist(JNIEnv *, jclass, jlong, jlong,
+                                                                            jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_elem_pointlist
  * Signature: (JJJ[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist
-(JNIEnv *, jclass, jlong, jlong, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1elem_1pointlist(JNIEnv *, jclass, jlong, jlong,
+                                                                           jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_select_bounds
  * Signature: (J[J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds
-(JNIEnv *, jclass, jlong, jlongArray, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Sget_1select_1bounds(JNIEnv *, jclass, jlong, jlongArray,
+                                                                  jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sencode
  * Signature: (J)[B
  */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_H5_H5Sencode
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_H5_H5Sencode(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sdecode
  * Signature: ([B)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Sdecode
-  (JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Sdecode(JNIEnv *, jclass, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sis_regular_hyperslab
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Sget_regular_hyperslab
  * Signature: (J[J[J[J[J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab
-(JNIEnv *, jclass, jlong, jlongArray, jlongArray, jlongArray, jlongArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Sget_1regular_1hyperslab(JNIEnv *, jclass, jlong, jlongArray,
+                                                                      jlongArray, jlongArray, jlongArray);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c
index 1cbf1a5..e968ad2 100644
--- a/java/src/jni/h5tImp.c
+++ b/java/src/jni/h5tImp.c
@@ -40,11 +40,10 @@ extern "C" {
  * Signature: (JLjava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Topen2
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist)
+Java_hdf_hdf5lib_H5__1H5Topen2(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_plist)
 {
     const char *datatypeName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status       = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -69,8 +68,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tcommitted
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tcommitted(JNIEnv *env, jclass clss, jlong type_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -91,14 +89,13 @@ done:
  * Signature: (IJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tcreate
-    (JNIEnv *env, jclass clss, jint dclass, jlong size)
+Java_hdf_hdf5lib_H5__1H5Tcreate(JNIEnv *env, jclass clss, jint dclass, jlong size)
 {
     hid_t retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
-    if ((retVal = H5Tcreate((H5T_class_t )dclass, (size_t)size)) < 0)
+    if ((retVal = H5Tcreate((H5T_class_t)dclass, (size_t)size)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -111,8 +108,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tcopy
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5__1H5Tcopy(JNIEnv *env, jclass clss, jlong type_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -131,8 +127,7 @@ done:
  * Signature: (JJ)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tequal
-    (JNIEnv *env, jclass clss, jlong type_id1, jlong type_id2)
+Java_hdf_hdf5lib_H5_H5Tequal(JNIEnv *env, jclass clss, jlong type_id1, jlong type_id2)
 {
     htri_t bval = JNI_FALSE;
 
@@ -153,8 +148,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tlock
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tlock(JNIEnv *env, jclass clss, jlong type_id)
 {
     herr_t retVal = FAIL;
 
@@ -173,8 +167,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1class
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1class(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_class_t retVal = H5T_NO_CLASS;
 
@@ -193,8 +186,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1size
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1size(JNIEnv *env, jclass clss, jlong type_id)
 {
     size_t retVal = 0;
 
@@ -213,10 +205,9 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1size
-    (JNIEnv *env, jclass clss, jlong type_id, jlong size)
+Java_hdf_hdf5lib_H5_H5Tset_1size(JNIEnv *env, jclass clss, jlong type_id, jlong size)
 {
-    size_t tsize = (size_t)size;
+    size_t tsize  = (size_t)size;
     herr_t retVal = FAIL;
 
     UNUSED(clss);
@@ -234,8 +225,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1order
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1order(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_order_t retVal = H5T_ORDER_ERROR;
 
@@ -254,8 +244,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1order
-    (JNIEnv *env, jclass clss, jlong type_id, jint order)
+Java_hdf_hdf5lib_H5_H5Tset_1order(JNIEnv *env, jclass clss, jlong type_id, jint order)
 {
     herr_t retVal = FAIL;
 
@@ -274,8 +263,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1precision
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1precision(JNIEnv *env, jclass clss, jlong type_id)
 {
     size_t retVal = 0;
 
@@ -294,8 +282,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1precision_1long
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1precision_1long(JNIEnv *env, jclass clss, jlong type_id)
 {
     size_t retVal = 0;
 
@@ -314,8 +301,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1precision
-    (JNIEnv *env, jclass clss, jlong type_id, jlong precision)
+Java_hdf_hdf5lib_H5_H5Tset_1precision(JNIEnv *env, jclass clss, jlong type_id, jlong precision)
 {
     herr_t retVal = FAIL;
 
@@ -334,8 +320,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1offset
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1offset(JNIEnv *env, jclass clss, jlong type_id)
 {
     int retVal = -1;
 
@@ -354,8 +339,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1offset
-    (JNIEnv *env, jclass clss, jlong type_id, jlong offset)
+Java_hdf_hdf5lib_H5_H5Tset_1offset(JNIEnv *env, jclass clss, jlong type_id, jlong offset)
 {
     herr_t retVal = FAIL;
 
@@ -374,12 +358,11 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1pad
-    (JNIEnv *env, jclass clss, jlong type_id, jintArray pad)
+Java_hdf_hdf5lib_H5_H5Tget_1pad(JNIEnv *env, jclass clss, jlong type_id, jintArray pad)
 {
-    jboolean  isCopy;
-    jint     *P = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jint *   P      = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -404,8 +387,7 @@ done:
  * Signature: (JII)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1pad
-    (JNIEnv *env, jclass clss, jlong type_id, jint lsb, jint msb)
+Java_hdf_hdf5lib_H5_H5Tset_1pad(JNIEnv *env, jclass clss, jlong type_id, jint lsb, jint msb)
 {
     herr_t retVal = FAIL;
 
@@ -424,8 +406,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1sign
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1sign(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_sign_t retVal = H5T_SGN_ERROR;
 
@@ -444,8 +425,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1sign
-    (JNIEnv *env, jclass clss, jlong type_id, jint sign)
+Java_hdf_hdf5lib_H5_H5Tset_1sign(JNIEnv *env, jclass clss, jlong type_id, jint sign)
 {
     herr_t retVal = FAIL;
 
@@ -464,13 +444,12 @@ done:
  * Signature: (J[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1fields_1int
-    (JNIEnv *env, jclass clss, jlong type_id, jintArray fields)
+Java_hdf_hdf5lib_H5_H5Tget_1fields_1int(JNIEnv *env, jclass clss, jlong type_id, jintArray fields)
 {
-    jboolean  isCopy;
-    jsize     arrLen;
-    jint     *P = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jsize    arrLen;
+    jint *   P      = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -486,7 +465,8 @@ Java_hdf_hdf5lib_H5_H5Tget_1fields_1int
 
     PIN_INT_ARRAY(ENVONLY, fields, P, &isCopy, "H5Tget_fields_int: fields not pinned");
 
-    if ((status = H5Tget_fields((hid_t)type_id, (size_t *)&(P[0]), (size_t *)&(P[1]), (size_t *)&(P[2]), (size_t *)&(P[3]), (size_t *)&(P[4]))) < 0)
+    if ((status = H5Tget_fields((hid_t)type_id, (size_t *)&(P[0]), (size_t *)&(P[1]), (size_t *)&(P[2]),
+                                (size_t *)&(P[3]), (size_t *)&(P[4]))) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -502,13 +482,12 @@ done:
  * Signature: (J[J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1fields
-    (JNIEnv *env, jclass clss, jlong type_id, jlongArray fields)
+Java_hdf_hdf5lib_H5_H5Tget_1fields(JNIEnv *env, jclass clss, jlong type_id, jlongArray fields)
 {
-    jboolean  isCopy;
-    jlong    *fieldsArray = NULL;
-    jsize     arrLen;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jlong *  fieldsArray = NULL;
+    jsize    arrLen;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -525,21 +504,21 @@ Java_hdf_hdf5lib_H5_H5Tget_1fields
     PIN_LONG_ARRAY(ENVONLY, fields, fieldsArray, &isCopy, "H5Tget_fields: fields not pinned");
 
     { /* Direct cast (size_t *)variable fails on 32-bit environment */
-        size_t spos_t = 0;
-        size_t epos_t = 0;
-        size_t esize_t = 0;
-        size_t mpos_t = 0;
-        size_t msize_t = 0;
+        size_t    spos_t      = 0;
+        size_t    epos_t      = 0;
+        size_t    esize_t     = 0;
+        size_t    mpos_t      = 0;
+        size_t    msize_t     = 0;
         long long fields_temp = *(&fieldsArray[0]);
-        spos_t = (size_t)fields_temp;
-        fields_temp = *(&fieldsArray[1]);
-        epos_t = (size_t)fields_temp;
-        fields_temp = *(&fieldsArray[2]);
-        esize_t = (size_t)fields_temp;
-        fields_temp = *(&fieldsArray[3]);
-        mpos_t = (size_t)fields_temp;
-        fields_temp = *(&fieldsArray[4]);
-        msize_t = (size_t)fields_temp;
+        spos_t                = (size_t)fields_temp;
+        fields_temp           = *(&fieldsArray[1]);
+        epos_t                = (size_t)fields_temp;
+        fields_temp           = *(&fieldsArray[2]);
+        esize_t               = (size_t)fields_temp;
+        fields_temp           = *(&fieldsArray[3]);
+        mpos_t                = (size_t)fields_temp;
+        fields_temp           = *(&fieldsArray[4]);
+        msize_t               = (size_t)fields_temp;
 
         if ((status = H5Tget_fields((hid_t)type_id, &spos_t, &epos_t, &esize_t, &mpos_t, &msize_t)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
@@ -564,13 +543,13 @@ done:
  * Signature: (JJJJJJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1fields
-    (JNIEnv *env, jclass clss, jlong type_id, jlong spos, jlong epos,
-        jlong esize, jlong mpos, jlong msize)
+Java_hdf_hdf5lib_H5_H5Tset_1fields(JNIEnv *env, jclass clss, jlong type_id, jlong spos, jlong epos,
+                                   jlong esize, jlong mpos, jlong msize)
 {
     UNUSED(clss);
 
-    if (H5Tset_fields((hid_t)type_id, (size_t)spos, (size_t)epos, (size_t)esize, (size_t)mpos, (size_t)msize) < 0)
+    if (H5Tset_fields((hid_t)type_id, (size_t)spos, (size_t)epos, (size_t)esize, (size_t)mpos,
+                      (size_t)msize) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -583,14 +562,13 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1ebias
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1ebias(JNIEnv *env, jclass clss, jlong type_id)
 {
     size_t retVal = 0;
 
     UNUSED(clss);
 
-    if (!(retVal =  H5Tget_ebias((hid_t)type_id)))
+    if (!(retVal = H5Tget_ebias((hid_t)type_id)))
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -603,8 +581,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1ebias_1long
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1ebias_1long(JNIEnv *env, jclass clss, jlong type_id)
 {
     size_t retVal = 0;
 
@@ -623,8 +600,7 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1ebias
-    (JNIEnv *env, jclass clss, jlong type_id, jlong ebias)
+Java_hdf_hdf5lib_H5_H5Tset_1ebias(JNIEnv *env, jclass clss, jlong type_id, jlong ebias)
 {
     herr_t retVal = FAIL;
 
@@ -643,8 +619,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1norm
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1norm(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_norm_t retVal = H5T_NORM_ERROR;
 
@@ -663,14 +638,13 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1norm
-    (JNIEnv *env, jclass clss, jlong type_id, jint norm)
+Java_hdf_hdf5lib_H5_H5Tset_1norm(JNIEnv *env, jclass clss, jlong type_id, jint norm)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5Tset_norm((hid_t)type_id, (H5T_norm_t )norm)) < 0)
+    if ((retVal = H5Tset_norm((hid_t)type_id, (H5T_norm_t)norm)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -683,8 +657,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1inpad
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1inpad(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_pad_t retVal = H5T_PAD_ERROR;
 
@@ -703,14 +676,13 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1inpad
-    (JNIEnv *env, jclass clss, jlong type_id, jint inpad)
+Java_hdf_hdf5lib_H5_H5Tset_1inpad(JNIEnv *env, jclass clss, jlong type_id, jint inpad)
 {
     herr_t retVal = FAIL;
 
     UNUSED(clss);
 
-    if ((retVal = H5Tset_inpad((hid_t)type_id, (H5T_pad_t) inpad)) < 0)
+    if ((retVal = H5Tset_inpad((hid_t)type_id, (H5T_pad_t)inpad)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -723,8 +695,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1cset
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1cset(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_cset_t retVal = H5T_CSET_ERROR;
 
@@ -743,8 +714,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1cset
-    (JNIEnv *env, jclass clss, jlong type_id, jint cset)
+Java_hdf_hdf5lib_H5_H5Tset_1cset(JNIEnv *env, jclass clss, jlong type_id, jint cset)
 {
     herr_t retVal = FAIL;
 
@@ -763,8 +733,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1strpad
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1strpad(JNIEnv *env, jclass clss, jlong type_id)
 {
     H5T_str_t retVal = H5T_STR_ERROR;
 
@@ -783,8 +752,7 @@ done:
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1strpad
-    (JNIEnv *env, jclass clss, jlong type_id, jint strpad)
+Java_hdf_hdf5lib_H5_H5Tset_1strpad(JNIEnv *env, jclass clss, jlong type_id, jint strpad)
 {
     herr_t retVal = FAIL;
 
@@ -803,8 +771,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1nmembers
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1nmembers(JNIEnv *env, jclass clss, jlong type_id)
 {
     int retVal = -1;
 
@@ -823,11 +790,10 @@ done:
  * Signature: (JI)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1name
-    (JNIEnv *env, jclass clss, jlong type_id, jint field_idx)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1name(JNIEnv *env, jclass clss, jlong type_id, jint field_idx)
 {
-    char    *member_name = NULL;
-    jstring  str = NULL;
+    char *  member_name = NULL;
+    jstring str         = NULL;
 
     UNUSED(clss);
 
@@ -850,11 +816,10 @@ done:
  * Signature: (JLjava/lang/String)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1index
-    (JNIEnv *env, jclass clss, jlong type_id, jstring field_name)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1index(JNIEnv *env, jclass clss, jlong type_id, jstring field_name)
 {
     const char *datatypeName = NULL;
-    int         index = -1;
+    int         index        = -1;
 
     UNUSED(clss);
 
@@ -879,8 +844,7 @@ done:
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1member_1type
-    (JNIEnv *env, jclass clss, jlong type_id, jint field_idx)
+Java_hdf_hdf5lib_H5__1H5Tget_1member_1type(JNIEnv *env, jclass clss, jlong type_id, jint field_idx)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -899,8 +863,7 @@ done:
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1offset
-    (JNIEnv *env, jclass clss, jlong type_id, jint memno)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1offset(JNIEnv *env, jclass clss, jlong type_id, jint memno)
 {
     UNUSED(env);
     UNUSED(clss);
@@ -914,8 +877,7 @@ Java_hdf_hdf5lib_H5_H5Tget_1member_1offset
  * Signature: (JI)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1class
-    (JNIEnv *env, jclass clss, jlong type_id, jint memno)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1class(JNIEnv *env, jclass clss, jlong type_id, jint memno)
 {
     H5T_class_t retVal = H5T_NO_CLASS;
 
@@ -934,12 +896,12 @@ done:
  * Signature: (JLjava/lang/String;JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tinsert
-    (JNIEnv *env, jclass clss, jlong type_id, jstring name, jlong offset, jlong field_id)
+Java_hdf_hdf5lib_H5_H5Tinsert(JNIEnv *env, jclass clss, jlong type_id, jstring name, jlong offset,
+                              jlong field_id)
 {
     const char *datatypeName = NULL;
-    long        off = (long)offset;
-    herr_t      status = FAIL;
+    long        off          = (long)offset;
+    herr_t      status       = FAIL;
 
     UNUSED(clss);
 
@@ -964,8 +926,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tpack
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tpack(JNIEnv *env, jclass clss, jlong type_id)
 {
     herr_t retVal = FAIL;
 
@@ -984,13 +945,12 @@ done:
  * Signature: (JJJ[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Treclaim
-    (JNIEnv *env, jclass clss, jlong type_id, jlong space_id,
-          jlong xfer_plist_id, jbyteArray buf)
+Java_hdf_hdf5lib_H5_H5Treclaim(JNIEnv *env, jclass clss, jlong type_id, jlong space_id, jlong xfer_plist_id,
+                               jbyteArray buf)
 {
-    jboolean  bufIsCopy;
-    jbyte    *pinBuf = NULL;
-    herr_t    status = FAIL;
+    jboolean bufIsCopy;
+    jbyte *  pinBuf = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1013,8 +973,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Tclose
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5__1H5Tclose(JNIEnv *env, jclass clss, jlong type_id)
 {
     herr_t retVal = FAIL;
 
@@ -1033,8 +992,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tvlen_1create
-    (JNIEnv *env, jclass clss, jlong base_id)
+Java_hdf_hdf5lib_H5__1H5Tvlen_1create(JNIEnv *env, jclass clss, jlong base_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1053,8 +1011,7 @@ done:
  * Signature: (JLjava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1tag
-    (JNIEnv *env, jclass clss, jlong type, jstring tag)
+Java_hdf_hdf5lib_H5_H5Tset_1tag(JNIEnv *env, jclass clss, jlong type, jstring tag)
 {
     const char *tagBuf = NULL;
     herr_t      status = FAIL;
@@ -1082,11 +1039,10 @@ done:
  * Signature: (J)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1tag
-    (JNIEnv *env, jclass clss, jlong type)
+Java_hdf_hdf5lib_H5_H5Tget_1tag(JNIEnv *env, jclass clss, jlong type)
 {
-    jstring  str = NULL;
-    char    *tag = NULL;
+    jstring str = NULL;
+    char *  tag = NULL;
 
     UNUSED(clss);
 
@@ -1109,8 +1065,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1super
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5__1H5Tget_1super(JNIEnv *env, jclass clss, jlong type_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1129,8 +1084,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tenum_1create
-    (JNIEnv *env, jclass clss, jlong base_id)
+Java_hdf_hdf5lib_H5__1H5Tenum_1create(JNIEnv *env, jclass clss, jlong base_id)
 {
     hid_t retVal = H5I_INVALID_HID;
 
@@ -1149,12 +1103,12 @@ done:
  * Signature: (JLjava/lang/String;[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int
-    (JNIEnv *env, jclass clss, jlong type_id, jstring name, jintArray value)
+Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int(JNIEnv *env, jclass clss, jlong type_id, jstring name,
+                                         jintArray value)
 {
     const char *memberName = NULL;
     jboolean    isCopy;
-    jint       *intBuf = NULL;
+    jint *      intBuf = NULL;
     herr_t      status = FAIL;
 
     UNUSED(clss);
@@ -1186,13 +1140,12 @@ done:
  * Signature: (JLjava/lang/String;[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1insert
-    (JNIEnv *env, jclass clss, jlong type_id, jstring name, jbyteArray value)
+Java_hdf_hdf5lib_H5_H5Tenum_1insert(JNIEnv *env, jclass clss, jlong type_id, jstring name, jbyteArray value)
 {
     const char *memberName = NULL;
     jboolean    isCopy;
-    jbyte      *memberBuf = NULL;
-    herr_t      status = FAIL;
+    jbyte *     memberBuf = NULL;
+    herr_t      status    = FAIL;
 
     UNUSED(clss);
 
@@ -1221,15 +1174,14 @@ done:
  * Signature: (J[I[Ljava/lang/String;I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int
-    (JNIEnv *env, jclass clss, jlong type_id, jintArray value, jobjectArray name,
-          jint size)
+Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int(JNIEnv *env, jclass clss, jlong type_id, jintArray value,
+                                         jobjectArray name, jint size)
 {
-    jboolean  isCopy;
-    jstring   str;
-    jint     *intP = NULL;
-    char     *nameP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str;
+    jint *   intP   = NULL;
+    char *   nameP  = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1238,7 +1190,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int
     if (size <= 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tenum_nameof_int: name size < 0");
 
-    if (NULL == (nameP = (char *) HDmalloc(sizeof(char) * (size_t)size)))
+    if (NULL == (nameP = (char *)HDmalloc(sizeof(char) * (size_t)size)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tenum_nameof_int: failed to allocate name buffer");
 
     PIN_INT_ARRAY(ENVONLY, value, intP, &isCopy, "H5Tenum_nameof_int: value not pinned");
@@ -1268,14 +1220,13 @@ done:
  * Signature: (J[BJ)Ljava/lang/String;
  */
 JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1nameof
-    (JNIEnv *env, jclass clss, jlong type_id, jbyteArray value, jlong size)
+Java_hdf_hdf5lib_H5_H5Tenum_1nameof(JNIEnv *env, jclass clss, jlong type_id, jbyteArray value, jlong size)
 {
-    jboolean  isCopy;
-    jstring   str = NULL;
-    jbyte    *byteP = NULL;
-    char     *nameP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jstring  str    = NULL;
+    jbyte *  byteP  = NULL;
+    char *   nameP  = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1284,7 +1235,7 @@ Java_hdf_hdf5lib_H5_H5Tenum_1nameof
     if (NULL == value)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Tenum_nameof: value is NULL");
 
-    if (NULL == (nameP = (char *) HDmalloc(sizeof(char) * (size_t)size)))
+    if (NULL == (nameP = (char *)HDmalloc(sizeof(char) * (size_t)size)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tenum_nameof: failed to allocate name buffer");
 
     PIN_BYTE_ARRAY(ENVONLY, value, byteP, &isCopy, "H5Tenum_nameof: value not pinned");
@@ -1311,13 +1262,13 @@ done:
  * Signature: (JLjava/lang/String;[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int
-    (JNIEnv *env, jclass clss, jlong type_id, jstring name, jintArray value)
+Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int(JNIEnv *env, jclass clss, jlong type_id, jstring name,
+                                          jintArray value)
 {
     const char *enumValue = NULL;
     jboolean    isCopy;
-    jint       *enumValueBuf = NULL;
-    herr_t      status = FAIL;
+    jint *      enumValueBuf = NULL;
+    herr_t      status       = FAIL;
 
     UNUSED(clss);
 
@@ -1348,13 +1299,12 @@ done:
  * Signature: (JLjava/lang/String;[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1valueof
-    (JNIEnv *env, jclass clss, jlong type_id, jstring name, jbyteArray value)
+Java_hdf_hdf5lib_H5_H5Tenum_1valueof(JNIEnv *env, jclass clss, jlong type_id, jstring name, jbyteArray value)
 {
     const char *enumValue = NULL;
     jboolean    isCopy;
-    jbyte      *enumValueBuf = NULL;
-    herr_t      status = FAIL;
+    jbyte *     enumValueBuf = NULL;
+    herr_t      status       = FAIL;
 
     UNUSED(clss);
 
@@ -1383,12 +1333,12 @@ done:
  * Signature: (JI[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int
-    (JNIEnv *env, jclass clss, jlong type_id, jint membno, jintArray value)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int(JNIEnv *env, jclass clss, jlong type_id, jint membno,
+                                               jintArray value)
 {
-    jboolean  isCopy;
-    jint     *intP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jint *   intP   = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1413,12 +1363,12 @@ done:
  * Signature: (JI[B)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1value
-    (JNIEnv *env, jclass clss, jlong type_id, jint membno, jbyteArray value)
+Java_hdf_hdf5lib_H5_H5Tget_1member_1value(JNIEnv *env, jclass clss, jlong type_id, jint membno,
+                                          jbyteArray value)
 {
-    jboolean  isCopy;
-    jbyte    *byteP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jbyte *  byteP  = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1441,8 +1391,7 @@ done:
  * Signature: (J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1ndims
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tget_1array_1ndims(JNIEnv *env, jclass clss, jlong type_id)
 {
     int ndims = -1;
 
@@ -1461,15 +1410,15 @@ done:
  * Signature: (J[I[I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1dims
-    (JNIEnv *env, jclass clss, jlong type_id, jintArray dims, jintArray perms)
+Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *env, jclass clss, jlong type_id, jintArray dims,
+                                        jintArray perms)
 {
-    jboolean  isCopy;
-    hsize_t  *cdims = NULL;
-    size_t    i;
-    jsize     dlen;
-    jint     *dimsP = NULL;
-    int       ndims = -1;
+    jboolean isCopy;
+    hsize_t *cdims = NULL;
+    size_t   i;
+    jsize    dlen;
+    jint *   dimsP = NULL;
+    int      ndims = -1;
 
     UNUSED(clss);
     UNUSED(perms);
@@ -1484,14 +1433,14 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tget_array_dims: dims array length < 0");
     }
 
-    if (NULL == (cdims = (hsize_t *) HDmalloc((size_t)dlen * sizeof(hsize_t))))
+    if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tget_array_dims: failed to allocate dimension buffer");
 
     if ((ndims = H5Tget_array_dims2((hid_t)type_id, cdims)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    for (i = 0; i < (size_t) dlen; i++) {
-        dimsP[i] = (jint) cdims[i];
+    for (i = 0; i < (size_t)dlen; i++) {
+        dimsP[i] = (jint)cdims[i];
     } /* end for */
 
 done:
@@ -1509,8 +1458,7 @@ done:
  * Signature: (J)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tis_1variable_1str
-    (JNIEnv *env, jclass clss, jlong type_id)
+Java_hdf_hdf5lib_H5_H5Tis_1variable_1str(JNIEnv *env, jclass clss, jlong type_id)
 {
     htri_t bval = JNI_FALSE;
 
@@ -1531,8 +1479,7 @@ done:
  * Signature: (JI)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1native_1type
-    (JNIEnv *env, jclass clss, jlong type_id, jint direction)
+Java_hdf_hdf5lib_H5__1H5Tget_1native_1type(JNIEnv *env, jclass clss, jlong type_id, jint direction)
 {
     hid_t native_tid = H5I_INVALID_HID;
 
@@ -1551,8 +1498,7 @@ done:
  * Signature: (JI)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tdetect_1class
-    (JNIEnv *env, jclass clss, jlong type_id, jint dtype_class)
+Java_hdf_hdf5lib_H5_H5Tdetect_1class(JNIEnv *env, jclass clss, jlong type_id, jint dtype_class)
 {
     htri_t bval = JNI_FALSE;
 
@@ -1573,12 +1519,11 @@ done:
  * Signature: (JLjava/lang/String;JJJJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tcommit
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type,
-          jlong link_plist_id, jlong create_plist_id, jlong access_plist_id)
+Java_hdf_hdf5lib_H5_H5Tcommit(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong type,
+                              jlong link_plist_id, jlong create_plist_id, jlong access_plist_id)
 {
     const char *datatypeName = NULL;
-    herr_t      status = FAIL;
+    herr_t      status       = FAIL;
 
     UNUSED(clss);
 
@@ -1587,7 +1532,8 @@ Java_hdf_hdf5lib_H5_H5Tcommit
 
     PIN_JAVA_STRING(ENVONLY, name, datatypeName, NULL, "H5Tcommit: datatype name not pinned");
 
-    if ((status = H5Tcommit2((hid_t)loc_id, datatypeName, (hid_t)type, (hid_t)link_plist_id, (hid_t)create_plist_id, (hid_t)access_plist_id)) < 0)
+    if ((status = H5Tcommit2((hid_t)loc_id, datatypeName, (hid_t)type, (hid_t)link_plist_id,
+                             (hid_t)create_plist_id, (hid_t)access_plist_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1601,15 +1547,14 @@ done:
  * Signature: (JI[J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tarray_1create2
-    (JNIEnv *env, jclass clss, jlong base_id, jint rank, jlongArray dims)
+Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *env, jclass clss, jlong base_id, jint rank, jlongArray dims)
 {
-    jboolean  isCopy;
-    hsize_t  *cdims = NULL;
-    size_t    i;
-    jlong    *dimsP = NULL;
-    jsize     dlen;
-    hid_t     retVal = H5I_INVALID_HID;
+    jboolean isCopy;
+    hsize_t *cdims = NULL;
+    size_t   i;
+    jlong *  dimsP = NULL;
+    jsize    dlen;
+    hid_t    retVal = H5I_INVALID_HID;
 
     UNUSED(clss);
 
@@ -1628,10 +1573,10 @@ Java_hdf_hdf5lib_H5__1H5Tarray_1create2
     if (dlen != rank)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tarray_create: dimension array length != array rank");
 
-    if (NULL == (cdims = (hsize_t *) HDmalloc((size_t)dlen * sizeof(hsize_t))))
+    if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tarray_create: failed to allocate dimension buffer");
 
-    for (i = 0; i < (size_t) dlen; i++) {
+    for (i = 0; i < (size_t)dlen; i++) {
         cdims[i] = (hsize_t)dimsP[i];
     } /* end for */
 
@@ -1653,15 +1598,14 @@ done:
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2
-    (JNIEnv *env, jclass clss, jlong type_id, jlongArray dims)
+Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *env, jclass clss, jlong type_id, jlongArray dims)
 {
-    jboolean  isCopy;
-    hsize_t  *cdims = NULL;
-    size_t    i;
-    jlong    *dimsP = NULL;
-    jsize     dlen;
-    int       ndims = -1;
+    jboolean isCopy;
+    hsize_t *cdims = NULL;
+    size_t   i;
+    jlong *  dimsP = NULL;
+    jsize    dlen;
+    int      ndims = -1;
 
     UNUSED(clss);
 
@@ -1675,14 +1619,14 @@ Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Tarray_get_dims2: dims array length < 0");
     }
 
-    if (NULL == (cdims = (hsize_t *) HDmalloc((size_t)dlen * sizeof(hsize_t))))
+    if (NULL == (cdims = (hsize_t *)HDmalloc((size_t)dlen * sizeof(hsize_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Tarray_get_dims2: failed to allocate dimension buffer");
 
-    if ((ndims = H5Tget_array_dims2((hid_t)type_id, (hsize_t*)cdims)) < 0)
+    if ((ndims = H5Tget_array_dims2((hid_t)type_id, (hsize_t *)cdims)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    for (i = 0; i < (size_t) dlen; i++) {
-        dimsP[i] = (jlong) cdims[i];
+    for (i = 0; i < (size_t)dlen; i++) {
+        dimsP[i] = (jlong)cdims[i];
     } /* end for */
 
 done:
@@ -1700,14 +1644,13 @@ done:
  * Signature: (JJJ[B[BJ)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tconvert
-    (JNIEnv *env, jclass clss, jlong src_id, jlong dst_id, jlong nelmts,
-      jbyteArray buf, jbyteArray background, jlong plist_id)
+Java_hdf_hdf5lib_H5_H5Tconvert(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id, jlong nelmts,
+                               jbyteArray buf, jbyteArray background, jlong plist_id)
 {
-    jboolean  isCopy;
-    jbyte    *bufP = NULL;
-    jbyte    *bgP = NULL;
-    herr_t    status = FAIL;
+    jboolean isCopy;
+    jbyte *  bufP   = NULL;
+    jbyte *  bgP    = NULL;
+    herr_t   status = FAIL;
 
     UNUSED(clss);
 
@@ -1719,7 +1662,8 @@ Java_hdf_hdf5lib_H5_H5Tconvert
     if (background)
         PIN_BYTE_ARRAY(ENVONLY, background, bgP, &isCopy, "H5Tconvert: background buffer not pinned");
 
-    if ((status = H5Tconvert((hid_t)src_id, (hid_t)dst_id, (size_t)nelmts, (void *)bufP, (void *)bgP, (hid_t)plist_id)) < 0)
+    if ((status = H5Tconvert((hid_t)src_id, (hid_t)dst_id, (size_t)nelmts, (void *)bufP, (void *)bgP,
+                             (hid_t)plist_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1763,7 +1707,6 @@ done:
     return;
 }
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5tImp.h b/java/src/jni/h5tImp.h
index 78e4561..41f7681 100644
--- a/java/src/jni/h5tImp.h
+++ b/java/src/jni/h5tImp.h
@@ -26,612 +26,481 @@ extern "C" {
  * Method:    _H5Topen2
  * Signature: (JLjava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Topen2
-  (JNIEnv *, jclass, jlong, jstring, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Topen2(JNIEnv *, jclass, jlong, jstring, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tcommitted
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tcommitted
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Tcommitted(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tcreate
  * Signature: (IJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tcreate
-  (JNIEnv *, jclass, jint, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tcreate(JNIEnv *, jclass, jint, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tcopy
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tcopy
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tcopy(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tequal
  * Signature: (JJ)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tequal
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Tequal(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tlock
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tlock
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tlock(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_class
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1class
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1class(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_size
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1size
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Tget_1size(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_size
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1size
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1size(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_order
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1order
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1order(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_order
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1order
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1order(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_precision
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1precision
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1precision(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_precision_long
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1precision_1long
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Tget_1precision_1long(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_precision
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1precision
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1precision(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_offset
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1offset
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1offset(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_offset
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1offset
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1offset(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_pad
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1pad
-  (JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1pad(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_pad
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1pad
-  (JNIEnv *, jclass, jlong, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1pad(JNIEnv *, jclass, jlong, jint, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_sign
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1sign
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1sign(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_sign
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1sign
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1sign(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_fields_int
  * Signature: (J[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1fields_1int
-  (JNIEnv *, jclass, jlong, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1fields_1int(JNIEnv *, jclass, jlong, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_fields
  * Signature: (J[J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1fields
-  (JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tget_1fields(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_fields
  * Signature: (JJJJJJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1fields
-  (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tset_1fields(JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong,
+                                                          jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_ebias
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1ebias
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1ebias(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_ebias_long
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1ebias_1long
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Tget_1ebias_1long(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_ebias
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1ebias
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1ebias(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_norm
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1norm
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1norm(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_norm
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1norm
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1norm(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_inpad
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1inpad
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1inpad(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_inpad
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1inpad
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1inpad(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_cset
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1cset
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1cset(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_cset
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1cset
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1cset(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_strpad
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1strpad
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1strpad(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_strpad
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1strpad
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1strpad(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_nmembers
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1nmembers
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1nmembers(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_name
  * Signature: (JI)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1name
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1name(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_index
  * Signature: (JLjava/lang/String)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1index
-  (JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1index(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_type
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1member_1type
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tget_1member_1type(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_offset
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1offset
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1offset(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_class
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1class
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1class(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tinsert
  * Signature: (JLjava/lang/String;JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tinsert
-  (JNIEnv *, jclass, jlong, jstring, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tinsert(JNIEnv *, jclass, jlong, jstring, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tpack
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tpack
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tpack(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Treclaim
  * Signature: (JJJ[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Treclaim
-  (JNIEnv*, jclass, jlong, jlong, jlong, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Treclaim(JNIEnv *, jclass, jlong, jlong, jlong, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tclose
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5__1H5Tclose
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5__1H5Tclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tvlen_create
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tvlen_1create
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tvlen_1create(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tset_tag
  * Signature: (JLjava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tset_1tag
-  (JNIEnv *, jclass, jlong, jstring);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tset_1tag(JNIEnv *, jclass, jlong, jstring);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_tag
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1tag
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tget_1tag(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_super
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1super
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tget_1super(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tenum_create
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tenum_1create
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tenum_1create(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_insert_int
  * Signature: (JLjava/lang/String;[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int
-  (JNIEnv *, jclass, jlong, jstring, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1insert_1int(JNIEnv *, jclass, jlong, jstring, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_insert
  * Signature: (JLjava/lang/String;[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1insert
-  (JNIEnv *, jclass, jlong, jstring, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1insert(JNIEnv *, jclass, jlong, jstring, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_nameof_int
  * Signature: (J[I[Ljava/lang/String;I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int
-  (JNIEnv *, jclass, jlong, jintArray, jobjectArray, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1nameof_1int(JNIEnv *, jclass, jlong, jintArray,
+                                                                jobjectArray, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_nameof
  * Signature: (J[BJ)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1nameof
-  (JNIEnv *, jclass, jlong, jbyteArray, jlong);
+JNIEXPORT jstring JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1nameof(JNIEnv *, jclass, jlong, jbyteArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_valueof_int
  * Signature: (JLjava/lang/String;[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int
-  (JNIEnv *, jclass, jlong, jstring, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1valueof_1int(JNIEnv *, jclass, jlong, jstring, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tenum_valueof
  * Signature: (JLjava/lang/String;[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tenum_1valueof
-  (JNIEnv *, jclass, jlong, jstring, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tenum_1valueof(JNIEnv *, jclass, jlong, jstring, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_value_int
  * Signature: (JI[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int
-  (JNIEnv *, jclass, jlong, jint, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1value_1int(JNIEnv *, jclass, jlong, jint,
+                                                                      jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_member_value
  * Signature: (JI[B)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1member_1value
-  (JNIEnv *, jclass, jlong, jint, jbyteArray);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tget_1member_1value(JNIEnv *, jclass, jlong, jint, jbyteArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_array_ndims
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1ndims
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1array_1ndims(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_array_dims
  * Signature: (J[I[I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1dims
-  (JNIEnv *, jclass, jlong, jintArray, jintArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1array_1dims(JNIEnv *, jclass, jlong, jintArray, jintArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tis_variable_str
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tis_1variable_1str
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Tis_1variable_1str(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_native_type
  * Signature: (JI)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tget_1native_1type
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tget_1native_1type(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tdetect_class
  * Signature: (JI)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5Tdetect_1class
-  (JNIEnv *, jclass, jlong, jint);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Tdetect_1class(JNIEnv *, jclass, jlong, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tcommit
  * Signature: (JLjava/lang/String;JJJJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tcommit
-  (JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tcommit(JNIEnv *, jclass, jlong, jstring, jlong, jlong, jlong,
+                                                     jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    _H5Tarray_create2
  * Signature: (JI[J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5__1H5Tarray_1create2
-  (JNIEnv *, jclass, jlong, jint, jlongArray);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5__1H5Tarray_1create2(JNIEnv *, jclass, jlong, jint, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tget_array_dims2
  * Signature: (J[J)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2
-  (JNIEnv *, jclass, jlong, jlongArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Tget_1array_1dims2(JNIEnv *, jclass, jlong, jlongArray);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tconvert
  * Signature: (JJJ[B[BJ)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tconvert
-  (JNIEnv *, jclass, jlong, jlong, jlong, jbyteArray, jbyteArray, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tconvert(JNIEnv *, jclass, jlong, jlong, jlong, jbyteArray,
+                                                      jbyteArray, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Tflush
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Tflush
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Tflush(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Trefresh
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5Trefresh
-  (JNIEnv*, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5Trefresh(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 8c3686d..4d067da 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -31,8 +31,8 @@ extern "C" {
 #define SKIP_UNUSED_DUMP_ROUTINES
 
 /* size of hyperslab buffer when a dataset is bigger than H5TOOLS_MALLOCSIZE */
-hsize_t H5TOOLS_BUFSIZE = (32 * 1024 * 1024);  /* 32 MB */
-int     H5TOOLS_TEXT_BLOCK = 16;  /* Number of elements on a line in a text export file */
+hsize_t H5TOOLS_BUFSIZE    = (32 * 1024 * 1024); /* 32 MB */
+int     H5TOOLS_TEXT_BLOCK = 16;                 /* Number of elements on a line in a text export file */
 
 /*
  * Pointer to the JNI's Virtual Machine; used for callback functions.
@@ -47,44 +47,46 @@ jobject get_callback;
 jobject set_callback;
 jobject delete_callback;
 
-H5E_auto2_t  efunc;
-void        *edata;
+H5E_auto2_t efunc;
+void *      edata;
 
 /********************/
 /* Local Prototypes */
 /********************/
 
 #ifndef SKIP_UNUSED_DUMP_ROUTINES
-static int     h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
-static int     h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
+static int h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
+static int h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
 #endif
-static int     h5str_is_zero(const void *_mem, size_t size);
-static hid_t   h5str_get_native_type(hid_t type);
-static hid_t   h5str_get_little_endian_type(hid_t type);
-static hid_t   h5str_get_big_endian_type(hid_t type);
-static htri_t  h5str_detect_vlen(hid_t tid);
-static htri_t  h5str_detect_vlen_str(hid_t tid);
-static int     h5tools_dump_simple_data(JNIEnv *env, FILE *stream, hid_t container, hid_t type, void *_mem, hsize_t nelmts);
-static int     h5str_render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t block_nelmts);
-static int     render_bin_output_region_data_blocks(FILE *stream, hid_t region_id,
-            hid_t container, int ndims, hid_t type_id, hssize_t nblocks, hsize_t *ptdata);
-static int     render_bin_output_region_blocks(FILE *stream, hid_t region_space,
-            hid_t region_id, hid_t container);
-static int     render_bin_output_region_data_points(FILE *stream, hid_t region_space, hid_t region_id,
-            hid_t container, int ndims, hid_t type_id, hssize_t npoints, hsize_t *ptdata);
-static int     render_bin_output_region_points(FILE *stream, hid_t region_space,
-            hid_t region_id, hid_t container);
+static int    h5str_is_zero(const void *_mem, size_t size);
+static hid_t  h5str_get_native_type(hid_t type);
+static hid_t  h5str_get_little_endian_type(hid_t type);
+static hid_t  h5str_get_big_endian_type(hid_t type);
+static htri_t h5str_detect_vlen(hid_t tid);
+static htri_t h5str_detect_vlen_str(hid_t tid);
+static int    h5tools_dump_simple_data(JNIEnv *env, FILE *stream, hid_t container, hid_t type, void *_mem,
+                                       hsize_t nelmts);
+static int    h5str_render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem,
+                                      hsize_t block_nelmts);
+static int    render_bin_output_region_data_blocks(FILE *stream, hid_t region_id, hid_t container, int ndims,
+                                                   hid_t type_id, hssize_t nblocks, hsize_t *ptdata);
+static int    render_bin_output_region_blocks(FILE *stream, hid_t region_space, hid_t region_id,
+                                              hid_t container);
+static int    render_bin_output_region_data_points(FILE *stream, hid_t region_space, hid_t region_id,
+                                                   hid_t container, int ndims, hid_t type_id, hssize_t npoints,
+                                                   hsize_t *ptdata);
+static int    render_bin_output_region_points(FILE *stream, hid_t region_space, hid_t region_id,
+                                              hid_t container);
 
 /* Strings for output */
-#define H5_TOOLS_GROUP           "GROUP"
-#define H5_TOOLS_DATASET         "DATASET"
-#define H5_TOOLS_DATATYPE        "DATATYPE"
-#define H5_TOOLS_ATTRIBUTE       "ATTRIBUTE"
+#define H5_TOOLS_GROUP     "GROUP"
+#define H5_TOOLS_DATASET   "DATASET"
+#define H5_TOOLS_DATATYPE  "DATATYPE"
+#define H5_TOOLS_ATTRIBUTE "ATTRIBUTE"
 
 /** frees memory held by array of strings */
 void
-h5str_array_free
-    (char **strs, size_t len)
+h5str_array_free(char **strs, size_t len)
 {
     size_t i;
 
@@ -101,20 +103,18 @@ h5str_array_free
 
 /** allocate a new str with given length */
 void
-h5str_new
-    (h5str_t *str, size_t len)
+h5str_new(h5str_t *str, size_t len)
 {
     if (str && len > 0) {
-        str->s = (char *)HDmalloc(len);
-        str->max = len;
+        str->s    = (char *)HDmalloc(len);
+        str->max  = len;
         str->s[0] = '\0';
     } /* end if */
 } /* end h5str_new */
 
 /** free string memory */
 void
-h5str_free
-    (h5str_t *str)
+h5str_free(h5str_t *str)
 {
     if (str && str->max > 0) {
         HDfree(str->s);
@@ -127,15 +127,14 @@ h5str_free
  * TODO: no error return. malloc can fail.
  */
 void
-h5str_resize
-    (h5str_t *str, size_t new_len)
+h5str_resize(h5str_t *str, size_t new_len)
 {
     char *new_str;
 
     if (!str || new_len <= 0 || str->max == new_len)
         return;
 
-    if (NULL == (new_str = (char *) HDmalloc(new_len)))
+    if (NULL == (new_str = (char *)HDmalloc(new_len)))
         return;
 
     if (new_len > str->max) /* increase memory */
@@ -144,7 +143,7 @@ h5str_resize
         HDstrncpy(new_str, str->s, new_len - 1);
 
     HDfree(str->s);
-    str->s = new_str;
+    str->s   = new_str;
     str->max = new_len;
 } /* end h5str_resize */
 
@@ -152,9 +151,8 @@ h5str_resize
  Return Value:
  the char string point to str->s
  */
-char*
-h5str_append
-    (h5str_t *str, const char* cstr)
+char *
+h5str_append(h5str_t *str, const char *cstr)
 {
     size_t len;
 
@@ -180,22 +178,20 @@ h5str_append
  *        FAILURE: 0
  */
 size_t
-h5str_convert
-    (JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf, size_t out_buf_offset)
+h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf, size_t out_buf_offset)
 {
     unsigned char *ucptr = NULL;
     static char    fmt_llong[8], fmt_ullong[8];
-    H5T_class_t    tclass = H5T_NO_CLASS;
-    const char     delimiter[] = " ," H5_COMPOUND_BEGIN_INDICATOR H5_COMPOUND_END_INDICATOR \
-                                      H5_ARRAY_BEGIN_INDICATOR H5_ARRAY_END_INDICATOR \
-                                      H5_VLEN_BEGIN_INDICATOR H5_VLEN_END_INDICATOR;
-    size_t         typeSize = 0;
-    hid_t          mtid = H5I_INVALID_HID;
-    char          *this_str = NULL;
-    char          *token;
-    char          *cptr = NULL;
-    int            n;
-    size_t         retVal = 0;
+    H5T_class_t    tclass      = H5T_NO_CLASS;
+    const char     delimiter[] = " ," H5_COMPOUND_BEGIN_INDICATOR H5_COMPOUND_END_INDICATOR
+        H5_ARRAY_BEGIN_INDICATOR H5_ARRAY_END_INDICATOR H5_VLEN_BEGIN_INDICATOR H5_VLEN_END_INDICATOR;
+    size_t                                                                      typeSize = 0;
+    hid_t                                                                       mtid     = H5I_INVALID_HID;
+    char *                                                                      this_str = NULL;
+    char *                                                                      token;
+    char *                                                                      cptr = NULL;
+    int                                                                         n;
+    size_t                                                                      retVal = 0;
 
     if (!in_str)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "h5str_convert: in_str is NULL");
@@ -203,8 +199,8 @@ h5str_convert
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "h5str_convert: out_buf is NULL");
 
     this_str = *in_str;
-    cptr = &(((char *) out_buf)[out_buf_offset]);
-    ucptr = &(((unsigned char *) out_buf)[out_buf_offset]);
+    cptr     = &(((char *)out_buf)[out_buf_offset]);
+    ucptr    = &(((unsigned char *)out_buf)[out_buf_offset]);
 
     if (H5T_NO_CLASS == (tclass = H5Tget_class(tid)))
         H5_LIBRARY_ERROR(ENVONLY);
@@ -220,13 +216,11 @@ h5str_convert
     } /* end if */
 
     switch (tclass) {
-        case H5T_FLOAT:
-        {
+        case H5T_FLOAT: {
             token = HDstrtok(this_str, delimiter);
 
             switch (typeSize) {
-                case sizeof(float):
-                {
+                case sizeof(float): {
                     float tmp_float = 0.0f;
 
                     sscanf(token, "%f", &tmp_float);
@@ -234,8 +228,7 @@ h5str_convert
                     break;
                 }
 
-                case sizeof(double):
-                {
+                case sizeof(double): {
                     double tmp_double = 0.0;
 
                     sscanf(token, "%lf", &tmp_double);
@@ -243,8 +236,7 @@ h5str_convert
                     break;
                 }
 #if H5_SIZEOF_LONG_DOUBLE != 0 && H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
-                case sizeof(long double):
-                {
+                case sizeof(long double): {
                     long double tmp_ldouble = 0.0;
 
                     sscanf(token, "%Lf", &tmp_ldouble);
@@ -254,7 +246,9 @@ h5str_convert
 #endif
 
                 default:
-                    H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_convert: floating-point datatype size didn't match any of expected sizes");
+                    H5_BAD_ARGUMENT_ERROR(
+                        ENVONLY,
+                        "h5str_convert: floating-point datatype size didn't match any of expected sizes");
                     break;
             }
 
@@ -263,8 +257,7 @@ h5str_convert
             break;
         }
 
-        case H5T_STRING:
-        {
+        case H5T_STRING: {
             size_t len = HDstrlen(this_str);
 
             if (len > 0) {
@@ -280,8 +273,7 @@ h5str_convert
             break;
         }
 
-        case H5T_INTEGER:
-        {
+        case H5T_INTEGER: {
             H5T_sign_t nsign = H5T_SGN_ERROR;
 
             if (H5T_SGN_ERROR == (nsign = H5Tget_sign(tid)))
@@ -290,10 +282,9 @@ h5str_convert
             token = HDstrtok(this_str, delimiter);
 
             switch (typeSize) {
-                case sizeof(char):
-                {
+                case sizeof(char): {
                     unsigned char tmp_uchar = 0;
-                    signed char   tmp_char = 0;
+                    signed char   tmp_char  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         sscanf(token, "%hhu", &tmp_uchar);
@@ -307,10 +298,9 @@ h5str_convert
                     break;
                 }
 
-                case sizeof(short):
-                {
+                case sizeof(short): {
                     unsigned short tmp_ushort = 0;
-                    short          tmp_short = 0;
+                    short          tmp_short  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         sscanf(token, "%hu", &tmp_ushort);
@@ -324,10 +314,9 @@ h5str_convert
                     break;
                 }
 
-                case sizeof(int):
-                {
+                case sizeof(int): {
                     unsigned int tmp_uint = 0;
-                    int          tmp_int = 0;
+                    int          tmp_int  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         sscanf(token, "%u", &tmp_uint);
@@ -342,10 +331,9 @@ h5str_convert
                 }
 
 #if H5_SIZEOF_LONG != H5_SIZEOF_INT
-                case sizeof(long):
-                {
+                case sizeof(long): {
                     unsigned long tmp_ulong = 0;
-                    long          tmp_long = 0;
+                    long          tmp_long  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         sscanf(token, "%lu", &tmp_ulong);
@@ -360,10 +348,9 @@ h5str_convert
                 }
 #endif
 #if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
-                case sizeof(long long):
-                {
+                case sizeof(long long): {
                     unsigned long long tmp_ullong = 0;
-                    long long          tmp_llong = 0;
+                    long long          tmp_llong  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         sscanf(token, fmt_ullong, &tmp_ullong);
@@ -379,7 +366,8 @@ h5str_convert
 #endif
 
                 default:
-                    H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_convert: integer datatype size didn't match any of expected sizes");
+                    H5_BAD_ARGUMENT_ERROR(
+                        ENVONLY, "h5str_convert: integer datatype size didn't match any of expected sizes");
                     break;
             }
 
@@ -388,8 +376,7 @@ h5str_convert
             break;
         }
 
-        case H5T_COMPOUND:
-        {
+        case H5T_COMPOUND: {
             unsigned i;
             size_t   member_offset;
 
@@ -397,11 +384,14 @@ h5str_convert
                 H5_LIBRARY_ERROR(ENVONLY);
 
             /* Skip whitespace and compound indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == '{') this_str++;
-            while (*this_str == ' ') this_str++;
-
-            for (i = 0; i < (unsigned) n; i++) {
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == '{')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
+
+            for (i = 0; i < (unsigned)n; i++) {
                 member_offset = H5Tget_member_offset(tid, i);
 
                 if ((mtid = H5Tget_member_type(tid, i)) < 0)
@@ -413,9 +403,12 @@ h5str_convert
                 }
 
                 /* Skip whitespace and commas */
-                while (*this_str == ' ') this_str++;
-                if (*this_str == ',') this_str++;
-                while (*this_str == ' ') this_str++;
+                while (*this_str == ' ')
+                    this_str++;
+                if (*this_str == ',')
+                    this_str++;
+                while (*this_str == ' ')
+                    this_str++;
 
                 if (H5Tclose(mtid) < 0)
                     H5_LIBRARY_ERROR(ENVONLY);
@@ -423,11 +416,14 @@ h5str_convert
             }
 
             /* Skip whitespace and compound indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == '}') this_str++;
-            while (*this_str == ' ') this_str++;
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == '}')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
 
-            retVal = typeSize * (size_t) n;
+            retVal = typeSize * (size_t)n;
 
             break;
         }
@@ -437,47 +433,41 @@ h5str_convert
             cptr = NULL;
             break;
 
-        case H5T_ENUM:
-        {
+        case H5T_ENUM: {
             void *value;
 
             token = HDstrtok(this_str, delimiter);
 
             switch (typeSize) {
-                case sizeof(char):
-                {
+                case sizeof(char): {
                     unsigned char tmp_uchar = 0;
-                    value = &tmp_uchar;
+                    value                   = &tmp_uchar;
                     break;
                 }
 
-                case sizeof(short):
-                {
+                case sizeof(short): {
                     unsigned short tmp_ushort = 0;
-                    value = &tmp_ushort;
+                    value                     = &tmp_ushort;
                     break;
                 }
 #if H5_SIZEOF_LONG != H5_SIZEOF_INT
-                case sizeof(long):
-                {
+                case sizeof(long): {
                     unsigned long tmp_ulong = 0;
-                    value = &tmp_ulong;
+                    value                   = &tmp_ulong;
                     break;
                 }
 #endif
 #if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
-                case sizeof(long long):
-                {
+                case sizeof(long long): {
                     unsigned long long tmp_ullong = 0;
-                    value = &tmp_ullong;
+                    value                         = &tmp_ullong;
                     break;
                 }
 #endif
 
-                default:
-                {
+                default: {
                     unsigned int tmp_uint = 0;
-                    value = &tmp_uint;
+                    value                 = &tmp_uint;
                     break;
                 }
             }
@@ -492,16 +482,18 @@ h5str_convert
             break;
         }
 
-        case H5T_ARRAY:
-        {
+        case H5T_ARRAY: {
             hsize_t i, dims[H5S_MAX_RANK], total_elmts;
             size_t  baseTypeSize;
             int     rank = 0;
 
             /* Skip whitespace and array indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == '[') this_str++;
-            while (*this_str == ' ') this_str++;
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == '[')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
 
             if ((mtid = H5Tget_super(tid)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
@@ -515,10 +507,10 @@ h5str_convert
             if (H5Tget_array_dims2(tid, dims) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
-            for (i = 0, total_elmts = 1; i < (hsize_t) rank; i++)
+            for (i = 0, total_elmts = 1; i < (hsize_t)rank; i++)
                 total_elmts *= dims[i];
 
-            if (NULL == (cptr = (char *) HDcalloc((size_t)total_elmts, baseTypeSize)))
+            if (NULL == (cptr = (char *)HDcalloc((size_t)total_elmts, baseTypeSize)))
                 H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_convert: failed to allocate array buffer");
 
             for (i = 0; i < total_elmts; i++) {
@@ -528,9 +520,12 @@ h5str_convert
                 }
 
                 /* Skip whitespace and commas */
-                while (*this_str == ' ') this_str++;
-                if (*this_str == ',') this_str++;
-                while (*this_str == ' ') this_str++;
+                while (*this_str == ' ')
+                    this_str++;
+                if (*this_str == ',')
+                    this_str++;
+                while (*this_str == ' ')
+                    this_str++;
             }
 
             if (H5Tclose(mtid) < 0)
@@ -538,20 +533,22 @@ h5str_convert
             mtid = H5I_INVALID_HID;
 
             /* Skip whitespace and array indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == ']') this_str++;
-            while (*this_str == ' ') this_str++;
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == ']')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
 
             retVal = typeSize * total_elmts;
 
             break;
         }
 
-        case H5T_VLEN:
-        {
-            size_t  i, baseTypeSize;
-            hvl_t  *vl_buf = (hvl_t *) out_buf;
-            char    cur_char;
+        case H5T_VLEN: {
+            size_t i, baseTypeSize;
+            hvl_t *vl_buf = (hvl_t *)out_buf;
+            char   cur_char;
 
             if ((mtid = H5Tget_super(tid)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
@@ -564,16 +561,19 @@ h5str_convert
             vl_buf->len = 1;
 
             /* Skip whitespace and vlen indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == '(') this_str++;
-            while (*this_str == ' ') this_str++;
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == '(')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
 
             cur_char = *this_str;
             for (i = 0; cur_char != ')' && cur_char != '\0'; i++) {
                 if (i >= vl_buf->len) {
                     char *tmp_realloc;
 
-                    if (NULL == (tmp_realloc = (char *) HDrealloc(vl_buf->p, vl_buf->len * 2 * baseTypeSize)))
+                    if (NULL == (tmp_realloc = (char *)HDrealloc(vl_buf->p, vl_buf->len * 2 * baseTypeSize)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_convert: failed to reallocate vlen buffer");
                     vl_buf->len *= 2;
                     vl_buf->p = tmp_realloc;
@@ -586,9 +586,12 @@ h5str_convert
                 }
 
                 /* Skip whitespace and commas */
-                while (*this_str == ' ') this_str++;
-                if (*this_str == ',') this_str++;
-                while (*this_str == ' ') this_str++;
+                while (*this_str == ' ')
+                    this_str++;
+                if (*this_str == ',')
+                    this_str++;
+                while (*this_str == ' ')
+                    this_str++;
             }
 
             vl_buf->len = i;
@@ -598,9 +601,12 @@ h5str_convert
             mtid = H5I_INVALID_HID;
 
             /* Skip whitespace and vlen indicators */
-            while (*this_str == ' ') this_str++;
-            if (*this_str == ')') this_str++;
-            while (*this_str == ' ') this_str++;
+            while (*this_str == ' ')
+                this_str++;
+            if (*this_str == ')')
+                this_str++;
+            while (*this_str == ' ')
+                this_str++;
 
             retVal = typeSize;
 
@@ -608,8 +614,7 @@ h5str_convert
         }
 
         case H5T_NCLASSES:
-        case H5T_NO_CLASS:
-        {
+        case H5T_NO_CLASS: {
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_convert: invalid datatype class");
             break;
         }
@@ -617,8 +622,7 @@ h5str_convert
         case H5T_TIME:
         case H5T_BITFIELD:
         case H5T_OPAQUE:
-        default:
-        {
+        default: {
             /* All other types get copied raw */
             HDmemcpy(ucptr, this_str, typeSize);
 
@@ -646,9 +650,9 @@ done:
 void
 h5str_sprint_reference(JNIEnv *env, h5str_t *out_str, hid_t container, void *ref_p)
 {
-    ssize_t      buf_size;
-    char *ref_name = NULL;
-    const H5R_ref_t *ref_vp = (H5R_ref_t *)ref_p;
+    ssize_t          buf_size;
+    char *           ref_name = NULL;
+    const H5R_ref_t *ref_vp   = (H5R_ref_t *)ref_p;
 
     UNUSED(container);
 
@@ -706,18 +710,18 @@ done:
  *        FAILURE: 0
  */
 size_t
-h5str_sprintf
-    (JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *in_buf, size_t in_buf_len, int expand_data)
+h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *in_buf, size_t in_buf_len,
+              int expand_data)
 {
-    unsigned char *ucptr = (unsigned char *) in_buf;
+    unsigned char *ucptr = (unsigned char *)in_buf;
     static char    fmt_llong[8], fmt_ullong[8];
-    H5T_class_t    tclass = H5T_NO_CLASS;
+    H5T_class_t    tclass   = H5T_NO_CLASS;
     size_t         typeSize = 0;
-    H5T_sign_t     nsign = H5T_SGN_ERROR;
-    hid_t          mtid = H5I_INVALID_HID;
-    hid_t          obj = H5I_INVALID_HID;
-    char          *cptr = (char *) in_buf;
-    char          *this_str = NULL;
+    H5T_sign_t     nsign    = H5T_SGN_ERROR;
+    hid_t          mtid     = H5I_INVALID_HID;
+    hid_t          obj      = H5I_INVALID_HID;
+    char *         cptr     = (char *)in_buf;
+    char *         this_str = NULL;
     int            n;
     size_t         retVal = 0;
 
@@ -742,16 +746,14 @@ h5str_sprintf
     } /* end if */
 
     switch (tclass) {
-        case H5T_FLOAT:
-        {
+        case H5T_FLOAT: {
             switch (typeSize) {
-                case sizeof(float):
-                {
+                case sizeof(float): {
                     float tmp_float = 0.0f;
 
                     HDmemcpy(&tmp_float, cptr, sizeof(float));
 
-                    if (NULL == (this_str = (char *) HDmalloc(25)))
+                    if (NULL == (this_str = (char *)HDmalloc(25)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
                     if (HDsprintf(this_str, "%g", tmp_float) < 0)
@@ -760,13 +762,12 @@ h5str_sprintf
                     break;
                 }
 
-                case sizeof(double):
-                {
+                case sizeof(double): {
                     double tmp_double = 0.0;
 
                     HDmemcpy(&tmp_double, cptr, sizeof(double));
 
-                    if (NULL == (this_str = (char *) HDmalloc(25)))
+                    if (NULL == (this_str = (char *)HDmalloc(25)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
                     if (HDsprintf(this_str, "%g", tmp_double) < 0)
@@ -775,13 +776,12 @@ h5str_sprintf
                     break;
                 }
 #if H5_SIZEOF_LONG_DOUBLE != 0 && H5_SIZEOF_LONG_DOUBLE != H5_SIZEOF_DOUBLE
-                case sizeof(long double):
-                {
+                case sizeof(long double): {
                     long double tmp_ldouble = 0.0;
 
                     HDmemcpy(&tmp_ldouble, cptr, sizeof(long double));
 
-                    if (NULL == (this_str = (char *) HDmalloc(27)))
+                    if (NULL == (this_str = (char *)HDmalloc(27)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
                     if (HDsprintf(this_str, "%Lg", tmp_ldouble) < 0)
@@ -792,17 +792,18 @@ h5str_sprintf
 #endif
 
                 default:
-                    H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_sprintf: floating-point datatype size didn't match any of expected sizes");
+                    H5_BAD_ARGUMENT_ERROR(
+                        ENVONLY,
+                        "h5str_sprintf: floating-point datatype size didn't match any of expected sizes");
                     break;
             }
 
             break;
         }
 
-        case H5T_STRING:
-        {
-            htri_t       is_variable;
-            char        *tmp_str;
+        case H5T_STRING: {
+            htri_t is_variable;
+            char * tmp_str;
 
             if ((is_variable = H5Tis_variable_str(tid)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
@@ -820,13 +821,13 @@ h5str_sprintf
 
             /* Check for NULL pointer for string */
             if (!tmp_str) {
-                if (NULL == (this_str = (char *) HDmalloc(5)))
+                if (NULL == (this_str = (char *)HDmalloc(5)))
                     H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
                 HDstrncpy(this_str, "NULL", 5);
             }
             else {
                 if (typeSize > 0) {
-                    if (NULL == (this_str = (char *) HDmalloc(typeSize + 1)))
+                    if (NULL == (this_str = (char *)HDmalloc(typeSize + 1)))
                         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
                     HDstrncpy(this_str, tmp_str, typeSize);
@@ -837,23 +838,22 @@ h5str_sprintf
             break;
         }
 
-        case H5T_INTEGER:
-        {
+        case H5T_INTEGER: {
 
             if (H5T_SGN_ERROR == (nsign = H5Tget_sign(tid)))
                 H5_LIBRARY_ERROR(ENVONLY);
 
             switch (typeSize) {
-                case sizeof(char):
-                {
+                case sizeof(char): {
                     unsigned char tmp_uchar = 0;
-                    char          tmp_char = 0;
+                    char          tmp_char  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         HDmemcpy(&tmp_uchar, cptr, sizeof(unsigned char));
 
-                        if (NULL == (this_str = (char *) HDmalloc(7)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(7)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%hhu", tmp_uchar) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -861,8 +861,9 @@ h5str_sprintf
                     else {
                         HDmemcpy(&tmp_char, cptr, sizeof(char));
 
-                        if (NULL == (this_str = (char *) HDmalloc(7)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(7)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%hhd", tmp_char) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -871,16 +872,16 @@ h5str_sprintf
                     break;
                 }
 
-                case sizeof(short):
-                {
+                case sizeof(short): {
                     unsigned short tmp_ushort = 0;
-                    short          tmp_short = 0;
+                    short          tmp_short  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         HDmemcpy(&tmp_ushort, cptr, sizeof(unsigned short));
 
-                        if (NULL == (this_str = (char *) HDmalloc(9)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(9)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%hu", tmp_ushort) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -888,8 +889,9 @@ h5str_sprintf
                     else {
                         HDmemcpy(&tmp_short, cptr, sizeof(short));
 
-                        if (NULL == (this_str = (char *) HDmalloc(9)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(9)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%hd", tmp_short) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -898,16 +900,16 @@ h5str_sprintf
                     break;
                 }
 
-                case sizeof(int):
-                {
+                case sizeof(int): {
                     unsigned int tmp_uint = 0;
-                    int          tmp_int = 0;
+                    int          tmp_int  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         HDmemcpy(&tmp_uint, cptr, sizeof(unsigned int));
 
-                        if (NULL == (this_str = (char *) HDmalloc(14)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(14)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%u", tmp_uint) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -915,8 +917,9 @@ h5str_sprintf
                     else {
                         HDmemcpy(&tmp_int, cptr, sizeof(int));
 
-                        if (NULL == (this_str = (char *) HDmalloc(14)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(14)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%d", tmp_int) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -925,16 +928,16 @@ h5str_sprintf
                     break;
                 }
 #if H5_SIZEOF_LONG != H5_SIZEOF_INT
-                case sizeof(long):
-                {
+                case sizeof(long): {
                     unsigned long tmp_ulong = 0;
-                    long          tmp_long = 0;
+                    long          tmp_long  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         HDmemcpy(&tmp_ulong, cptr, sizeof(unsigned long));
 
-                        if (NULL == (this_str = (char *) HDmalloc(23)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(23)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%lu", tmp_ulong) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -942,8 +945,9 @@ h5str_sprintf
                     else {
                         HDmemcpy(&tmp_long, cptr, sizeof(long));
 
-                        if (NULL == (this_str = (char *) HDmalloc(23)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(23)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, "%ld", tmp_long) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -953,16 +957,16 @@ h5str_sprintf
                 }
 #endif
 #if H5_SIZEOF_LONG_LONG != H5_SIZEOF_LONG
-                case sizeof(long long):
-                {
+                case sizeof(long long): {
                     unsigned long long tmp_ullong = 0;
-                    long long          tmp_llong = 0;
+                    long long          tmp_llong  = 0;
 
                     if (H5T_SGN_NONE == nsign) {
                         HDmemcpy(&tmp_ullong, cptr, sizeof(unsigned long long));
 
-                        if (NULL == (this_str = (char *) HDmalloc(25)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(25)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, fmt_ullong, tmp_ullong) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -970,8 +974,9 @@ h5str_sprintf
                     else {
                         HDmemcpy(&tmp_llong, cptr, sizeof(long long));
 
-                        if (NULL == (this_str = (char *) HDmalloc(25)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                        if (NULL == (this_str = (char *)HDmalloc(25)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
 
                         if (HDsprintf(this_str, fmt_llong, tmp_llong) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
@@ -982,15 +987,15 @@ h5str_sprintf
 #endif
 
                 default:
-                    H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_sprintf: integer datatype size didn't match any of expected sizes");
+                    H5_BAD_ARGUMENT_ERROR(
+                        ENVONLY, "h5str_sprintf: integer datatype size didn't match any of expected sizes");
                     break;
             }
 
             break;
         }
 
-        case H5T_COMPOUND:
-        {
+        case H5T_COMPOUND: {
             unsigned i;
             size_t   offset;
 
@@ -1000,7 +1005,7 @@ h5str_sprintf
             if (!h5str_append(out_str, H5_COMPOUND_BEGIN_INDICATOR))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-            for (i = 0; i < (unsigned) n; i++) {
+            for (i = 0; i < (unsigned)n; i++) {
                 offset = H5Tget_member_offset(tid, i);
 
                 if ((mtid = H5Tget_member_type(tid, i)) < 0)
@@ -1009,7 +1014,7 @@ h5str_sprintf
                 if (!h5str_sprintf(ENVONLY, out_str, container, mtid, &cptr[offset], in_buf_len, expand_data))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-                if ((i + 1) < (unsigned) n)
+                if ((i + 1) < (unsigned)n)
                     if (!h5str_append(out_str, ", "))
                         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
@@ -1024,8 +1029,7 @@ h5str_sprintf
             break;
         }
 
-        case H5T_ENUM:
-        {
+        case H5T_ENUM: {
             char enum_name[1024];
 
             if (H5Tenum_nameof(tid, cptr, enum_name, sizeof enum_name) >= 0) {
@@ -1035,7 +1039,7 @@ h5str_sprintf
             else {
                 size_t i;
 
-                if (NULL == (this_str = (char *) HDmalloc(4 * (typeSize + 1))))
+                if (NULL == (this_str = (char *)HDmalloc(4 * (typeSize + 1))))
                     H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
                 if (1 == typeSize) {
@@ -1052,8 +1056,7 @@ h5str_sprintf
             break;
         }
 
-        case H5T_REFERENCE:
-        {
+        case H5T_REFERENCE: {
             if (h5str_is_zero(cptr, typeSize)) {
                 if (!h5str_append(out_str, "NULL"))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -1061,29 +1064,29 @@ h5str_sprintf
             }
 
             if (H5Tequal(tid, H5T_STD_REF)) {
-                H5O_type_t obj_type = -1;   /* Object type */
-                H5R_type_t ref_type;   /* Reference type */
+                H5O_type_t       obj_type = -1; /* Object type */
+                H5R_type_t       ref_type;      /* Reference type */
                 const H5R_ref_t *ref_vp = (H5R_ref_t *)cptr;
 
                 ref_type = H5Rget_type(ref_vp);
                 H5Rget_obj_type3(ref_vp, H5P_DEFAULT, &obj_type);
                 switch (ref_type) {
-                    case H5R_OBJECT1:
-                        {
+                    case H5R_OBJECT1: {
                         /* Object references -- show the type and OID of the referenced object. */
                         H5O_info2_t oi;
 
-                        if((obj = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
+                        if ((obj = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                             H5Oget_info3(obj, &oi, H5O_INFO_BASIC);
-                            if(H5Oclose(obj) < 0)
+                            if (H5Oclose(obj) < 0)
                                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
                         }
                         else
                             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-                        if (NULL == (this_str = (char *) HDmalloc(14)))
-                            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
-                        if (HDsprintf(this_str, "%u-", (unsigned) oi.type) < 0)
+                        if (NULL == (this_str = (char *)HDmalloc(14)))
+                            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                   "h5str_sprintf: failed to allocate string buffer");
+                        if (HDsprintf(this_str, "%u-", (unsigned)oi.type) < 0)
                             H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
                         if (!h5str_append(out_str, this_str))
                             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
@@ -1121,21 +1124,22 @@ h5str_sprintf
 
                             H5Otoken_to_str(tid, &oi.token, &token_str);
 
-                            if (NULL == (this_str = (char *) HDmalloc(64 + strlen(token_str) + 1)))
-                                H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
+                            if (NULL == (this_str = (char *)HDmalloc(64 + strlen(token_str) + 1)))
+                                H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                                       "h5str_sprintf: failed to allocate string buffer");
                             if (HDsprintf(this_str, "%lu:%s", oi.fileno, token_str) < 0)
                                 H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
 
                             H5free_memory(token_str);
                         }
 
-                        }
+                    }
 
-                        break;
+                    break;
                     case H5R_DATASET_REGION1:
                         if (!h5str_append(out_str, H5_TOOLS_DATASET))
                             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-                        h5str_sprint_reference(ENVONLY, out_str, container, (void*)cptr);
+                        h5str_sprint_reference(ENVONLY, out_str, container, (void *)cptr);
                         break;
                     case H5R_OBJECT2:
                         switch (obj_type) {
@@ -1160,17 +1164,17 @@ h5str_sprintf
                             default:
                                 break;
                         } /* end switch */
-                        h5str_sprint_reference(ENVONLY, out_str, container, (void*)cptr);
+                        h5str_sprint_reference(ENVONLY, out_str, container, (void *)cptr);
                         break;
                     case H5R_DATASET_REGION2:
                         if (!h5str_append(out_str, H5_TOOLS_DATASET))
                             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-                        h5str_sprint_reference(ENVONLY, out_str, container, (void*)cptr);
+                        h5str_sprint_reference(ENVONLY, out_str, container, (void *)cptr);
                         break;
                     case H5R_ATTR:
                         if (!h5str_append(out_str, H5_TOOLS_ATTRIBUTE))
                             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
-                        h5str_sprint_reference(ENVONLY, out_str, container, (void*)cptr);
+                        h5str_sprint_reference(ENVONLY, out_str, container, (void *)cptr);
                         break;
                     case H5R_BADTYPE:
                     case H5R_MAXTYPE:
@@ -1190,8 +1194,7 @@ h5str_sprintf
             break;
         }
 
-        case H5T_ARRAY:
-        {
+        case H5T_ARRAY: {
             hsize_t dims[H5S_MAX_RANK], i, total_elmts;
             size_t  baseSize;
             int     rank = 0;
@@ -1211,11 +1214,12 @@ h5str_sprintf
             if (H5Tget_array_dims2(tid, dims) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
-            for (i = 0, total_elmts = 1; i < (hsize_t) rank; i++)
+            for (i = 0, total_elmts = 1; i < (hsize_t)rank; i++)
                 total_elmts *= dims[i];
 
             for (i = 0; i < total_elmts; i++) {
-                if (!h5str_sprintf(ENVONLY, out_str, container, mtid, &(cptr[i * baseSize]), in_buf_len, expand_data))
+                if (!h5str_sprintf(ENVONLY, out_str, container, mtid, &(cptr[i * baseSize]), in_buf_len,
+                                   expand_data))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
                 if ((i + 1) < total_elmts)
@@ -1233,11 +1237,10 @@ h5str_sprintf
             break;
         }
 
-        case H5T_VLEN:
-        {
-            unsigned int  i;
-            size_t        baseSize;
-            hvl_t        *vl_buf = (hvl_t *) in_buf;
+        case H5T_VLEN: {
+            unsigned int i;
+            size_t       baseSize;
+            hvl_t *      vl_buf = (hvl_t *)in_buf;
 
             if ((mtid = H5Tget_super(tid)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
@@ -1248,11 +1251,12 @@ h5str_sprintf
             if (!h5str_append(out_str, H5_VLEN_BEGIN_INDICATOR))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-            for (i = 0; i < (unsigned) vl_buf->len; i++) {
-                if (!h5str_sprintf(ENVONLY, out_str, container, mtid, &(((char *) vl_buf->p)[i * baseSize]), vl_buf->len, expand_data))
+            for (i = 0; i < (unsigned)vl_buf->len; i++) {
+                if (!h5str_sprintf(ENVONLY, out_str, container, mtid, &(((char *)vl_buf->p)[i * baseSize]),
+                                   vl_buf->len, expand_data))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-                if ((i + 1) < (unsigned) vl_buf->len)
+                if ((i + 1) < (unsigned)vl_buf->len)
                     if (!h5str_append(out_str, ", "))
                         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
             }
@@ -1268,8 +1272,7 @@ h5str_sprintf
         }
 
         case H5T_NO_CLASS:
-        case H5T_NCLASSES:
-        {
+        case H5T_NCLASSES: {
             H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_sprintf: invalid datatype class");
             break;
         }
@@ -1277,13 +1280,12 @@ h5str_sprintf
         case H5T_TIME:
         case H5T_BITFIELD:
         case H5T_OPAQUE:
-        default:
-        {
+        default: {
             size_t i;
 
             /* All other types get printed as hexadecimal */
 
-            if (NULL == (this_str = (char *) HDmalloc(4 * (typeSize + 1))))
+            if (NULL == (this_str = (char *)HDmalloc(4 * (typeSize + 1))))
                 H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_sprintf: failed to allocate string buffer");
 
             if (1 == typeSize) {
@@ -1328,23 +1330,23 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-h5str_print_region_data_blocks
-    (JNIEnv *env, hid_t region_id, h5str_t *str, int ndims, hid_t type_id, hssize_t nblocks, hsize_t *ptdata)
+h5str_print_region_data_blocks(JNIEnv *env, hid_t region_id, h5str_t *str, int ndims, hid_t type_id,
+                               hssize_t nblocks, hsize_t *ptdata)
 {
-    unsigned  indx;
-    hsize_t  *dims1 = NULL;
-    hsize_t  *start = NULL;
-    hsize_t  *count = NULL;
-    hsize_t   blkndx;
-    hsize_t   total_size[H5S_MAX_RANK];
-    hsize_t   numelem;
-    hsize_t   numindex;
-    size_t    jndx;
-    size_t    type_size;
-    hid_t     mem_space = H5I_INVALID_HID;
-    hid_t     sid1 = H5I_INVALID_HID;
-    void     *region_buf = NULL;
-    int       ret_value = FAIL;
+    unsigned indx;
+    hsize_t *dims1 = NULL;
+    hsize_t *start = NULL;
+    hsize_t *count = NULL;
+    hsize_t  blkndx;
+    hsize_t  total_size[H5S_MAX_RANK];
+    hsize_t  numelem;
+    hsize_t  numindex;
+    size_t   jndx;
+    size_t   type_size;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    hid_t    sid1       = H5I_INVALID_HID;
+    void *   region_buf = NULL;
+    int      ret_value  = FAIL;
 
     if (ndims < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_print_region_data_blocks: ndims < 0");
@@ -1356,13 +1358,14 @@ h5str_print_region_data_blocks
         H5_LIBRARY_ERROR(ENVONLY);
 
     /* Allocate space for the dimension array */
-    if (NULL == (dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_print_region_data_blocks: failed to allocate dimension array buffer");
+    if (NULL == (dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "h5str_print_region_data_blocks: failed to allocate dimension array buffer");
 
     /* Find the dimensions of each data space from the block coordinates */
-    for (jndx = 0, numelem = 1; jndx < (size_t) ndims; jndx++) {
+    for (jndx = 0, numelem = 1; jndx < (size_t)ndims; jndx++) {
         dims1[jndx] = ptdata[jndx + (size_t)ndims] - ptdata[jndx] + 1;
-        numelem = dims1[jndx] * numelem;
+        numelem     = dims1[jndx] * numelem;
     } /* end for */
 
     /* Create dataspace for reading buffer */
@@ -1377,14 +1380,16 @@ h5str_print_region_data_blocks
 
     /* Select (x , x , ..., x ) x (y , y , ..., y ) hyperslab for reading memory dataset */
     /*         1   2        n      1   2        n                                        */
-    if (NULL == (start = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_print_region_data_blocks: failed to allocate hyperslab start buffer");
+    if (NULL == (start = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "h5str_print_region_data_blocks: failed to allocate hyperslab start buffer");
 
-    if (NULL == (count = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_print_region_data_blocks: failed to allocate hyperslab count buffer");
+    if (NULL == (count = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "h5str_print_region_data_blocks: failed to allocate hyperslab count buffer");
 
-    for (blkndx = 0; blkndx < (hsize_t) nblocks; blkndx++) {
-        for (indx = 0; indx < (unsigned) ndims; indx++) {
+    for (blkndx = 0; blkndx < (hsize_t)nblocks; blkndx++) {
+        for (indx = 0; indx < (unsigned)ndims; indx++) {
             start[indx] = ptdata[indx + blkndx * (hsize_t)ndims * 2];
             count[indx] = dims1[indx];
         } /* end for */
@@ -1399,14 +1404,15 @@ h5str_print_region_data_blocks
             H5_LIBRARY_ERROR(ENVONLY);
 
         for (numindex = 0; numindex < numelem; numindex++) {
-            if (!h5str_sprintf(ENVONLY, str, region_id, type_id, ((char *)region_buf + numindex * type_size), 0, 1))
+            if (!h5str_sprintf(ENVONLY, str, region_id, type_id, ((char *)region_buf + numindex * type_size),
+                               0, 1))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             if (numindex + 1 < numelem)
                 if (!h5str_append(str, ", "))
                     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
         } /* end for (jndx = 0; jndx < numelem; jndx++, region_elmtno++, ctx.cur_elmt++) */
-    } /* end for (blkndx = 0; blkndx < nblocks; blkndx++) */
+    }     /* end for (blkndx = 0; blkndx < nblocks; blkndx++) */
 
     ret_value = SUCCEED;
 
@@ -1428,23 +1434,21 @@ done:
 } /* end h5str_print_region_data_blocks */
 
 int
-h5str_dump_region_blocks_data
-    (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
+h5str_dump_region_blocks_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
 {
-    hssize_t  nblocks;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    hid_t     dtype = H5I_INVALID_HID;
-    hid_t     type_id = H5I_INVALID_HID;
-    int       ndims = -1;
-    int       ret_value = FAIL;
+    hssize_t nblocks;
+    hsize_t  alloc_size;
+    hsize_t *ptdata    = NULL;
+    hid_t    dtype     = H5I_INVALID_HID;
+    hid_t    type_id   = H5I_INVALID_HID;
+    int      ndims     = -1;
+    int      ret_value = FAIL;
 
     /*
      * This function fails if the region does not have blocks.
      */
-    H5E_BEGIN_TRY {
-        nblocks = H5Sget_select_hyper_nblocks(region);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { nblocks = H5Sget_select_hyper_nblocks(region); }
+    H5E_END_TRY;
 
     if (nblocks < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1454,11 +1458,12 @@ h5str_dump_region_blocks_data
 
     /* Print block information */
     alloc_size = (hsize_t)nblocks * (hsize_t)ndims * 2 * (hsize_t)sizeof(ptdata[0]);
-    if (alloc_size == (hsize_t)((size_t) alloc_size)) {
-        if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t) alloc_size)))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_dump_region_blocks_data: failed to allocate region block buffer");
+    if (alloc_size == (hsize_t)((size_t)alloc_size)) {
+        if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size)))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "h5str_dump_region_blocks_data: failed to allocate region block buffer");
 
-        if (H5Sget_select_hyper_blocklist(region, (hsize_t) 0, (hsize_t) nblocks, ptdata) < 0)
+        if (H5Sget_select_hyper_blocklist(region, (hsize_t)0, (hsize_t)nblocks, ptdata) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         if ((dtype = H5Dget_type(region_id)) < 0)
@@ -1486,24 +1491,22 @@ done:
 
 #ifndef SKIP_UNUSED_DUMP_ROUTINES
 static int
-h5str_dump_region_blocks
-    (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
+h5str_dump_region_blocks(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
 {
-    hssize_t  nblocks;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    char      tmp_str[256];
-    int       ndims = -1;
-    int       ret_value = FAIL;
+    hssize_t nblocks;
+    hsize_t  alloc_size;
+    hsize_t *ptdata = NULL;
+    char     tmp_str[256];
+    int      ndims     = -1;
+    int      ret_value = FAIL;
 
     UNUSED(region_id);
 
     /*
      * This function fails if the region does not have blocks.
      */
-    H5E_BEGIN_TRY {
-        nblocks = H5Sget_select_hyper_nblocks(region);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { nblocks = H5Sget_select_hyper_nblocks(region); }
+    H5E_END_TRY;
 
     if (nblocks < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1513,13 +1516,14 @@ h5str_dump_region_blocks
 
     /* Print block information */
     alloc_size = (hsize_t)nblocks * (hsize_t)ndims * 2 * (hsize_t)sizeof(ptdata[0]);
-    if (alloc_size == (hsize_t)((size_t) alloc_size)) {
+    if (alloc_size == (hsize_t)((size_t)alloc_size)) {
         int i;
 
-        if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t) alloc_size)))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_dump_region_blocks: failed to allocate region block buffer");
+        if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size)))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "h5str_dump_region_blocks: failed to allocate region block buffer");
 
-        if (H5Sget_select_hyper_blocklist(region, (hsize_t) 0, (hsize_t) nblocks, ptdata) < 0)
+        if (H5Sget_select_hyper_blocklist(region, (hsize_t)0, (hsize_t)nblocks, ptdata) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         if (!h5str_append(str, " {"))
@@ -1535,8 +1539,7 @@ h5str_dump_region_blocks
             for (j = 0; j < ndims; j++) {
                 tmp_str[0] = '\0';
 
-                if (HDsprintf(tmp_str, "%s%lu", j ? "," : "(",
-                        (unsigned long) ptdata[i * 2 * ndims + j]) < 0)
+                if (HDsprintf(tmp_str, "%s%lu", j ? "," : "(", (unsigned long)ptdata[i * 2 * ndims + j]) < 0)
                     H5_JNI_FATAL_ERROR(ENVONLY, "h5str_dump_region_blocks: HDsprintf failure");
 
                 if (!h5str_append(str, tmp_str))
@@ -1547,7 +1550,7 @@ h5str_dump_region_blocks
                 tmp_str[0] = '\0';
 
                 if (HDsprintf(tmp_str, "%s%lu", j ? "," : ")-(",
-                        (unsigned long) ptdata[i * 2 * ndims + j + ndims]) < 0)
+                              (unsigned long)ptdata[i * 2 * ndims + j + ndims]) < 0)
                     H5_JNI_FATAL_ERROR(ENVONLY, "h5str_dump_region_blocks: HDsprintf failure");
 
                 if (!h5str_append(str, tmp_str))
@@ -1585,16 +1588,16 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-h5str_print_region_data_points
-    (JNIEnv *env, hid_t region_space, hid_t region_id, h5str_t *str, int ndims, hid_t type_id, hssize_t npoints, hsize_t *ptdata)
+h5str_print_region_data_points(JNIEnv *env, hid_t region_space, hid_t region_id, h5str_t *str, int ndims,
+                               hid_t type_id, hssize_t npoints, hsize_t *ptdata)
 {
     hsize_t *dims1 = NULL;
     hsize_t  total_size[H5S_MAX_RANK];
     size_t   jndx;
     size_t   type_size;
-    hid_t    mem_space = H5I_INVALID_HID;
-    void    *region_buf = NULL;
-    int      ret_value = FAIL;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    void *   region_buf = NULL;
+    int      ret_value  = FAIL;
 
     UNUSED(ptdata);
 
@@ -1602,8 +1605,9 @@ h5str_print_region_data_points
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "h5str_print_region_data_points: npoints < 0");
 
     /* Allocate space for the dimension array */
-    if (NULL == (dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_print_region_data_points: failed to allocate dimension array buffer");
+    if (NULL == (dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims)))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "h5str_print_region_data_points: failed to allocate dimension array buffer");
 
     dims1[0] = (hsize_t)npoints;
 
@@ -1620,14 +1624,14 @@ h5str_print_region_data_points
     if (H5Dread(region_id, type_id, mem_space, region_space, H5P_DEFAULT, region_buf) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    for (jndx = 0; jndx < (size_t) npoints; jndx++) {
+    for (jndx = 0; jndx < (size_t)npoints; jndx++) {
         if (H5Sget_simple_extent_dims(mem_space, total_size, NULL) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
 
         if (!h5str_sprintf(ENVONLY, str, region_id, type_id, ((char *)region_buf + jndx * type_size), 0, 1))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-        if (jndx + 1 < (size_t) npoints)
+        if (jndx + 1 < (size_t)npoints)
             if (!h5str_append(str, ", "))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
     } /* end for (jndx = 0; jndx < npoints; jndx++, elmtno++) */
@@ -1646,23 +1650,21 @@ done:
 } /* end h5str_print_region_data_points */
 
 int
-h5str_dump_region_points_data
-    (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
+h5str_dump_region_points_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
 {
-    hssize_t  npoints;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    hid_t     dtype = H5I_INVALID_HID;
-    hid_t     type_id = H5I_INVALID_HID;
-    int       ndims = -1;
-    int       ret_value = FAIL;
+    hssize_t npoints;
+    hsize_t  alloc_size;
+    hsize_t *ptdata    = NULL;
+    hid_t    dtype     = H5I_INVALID_HID;
+    hid_t    type_id   = H5I_INVALID_HID;
+    int      ndims     = -1;
+    int      ret_value = FAIL;
 
     /*
      * This function fails if the region does not have points.
      */
-    H5E_BEGIN_TRY {
-        npoints = H5Sget_select_elem_npoints(region);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { npoints = H5Sget_select_elem_npoints(region); }
+    H5E_END_TRY;
 
     if (npoints < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1673,11 +1675,12 @@ h5str_dump_region_points_data
     /* Print point information */
     if (npoints > 0) {
         alloc_size = (hsize_t)npoints * (hsize_t)ndims * (hsize_t)sizeof(ptdata[0]);
-        if (alloc_size == (hsize_t)((size_t) alloc_size)) {
-            if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t) alloc_size)))
-                H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_dump_region_points_data: failed to allocate region point data buffer");
+        if (alloc_size == (hsize_t)((size_t)alloc_size)) {
+            if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size)))
+                H5_OUT_OF_MEMORY_ERROR(
+                    ENVONLY, "h5str_dump_region_points_data: failed to allocate region point data buffer");
 
-            if (H5Sget_select_elem_pointlist(region, (hsize_t) 0, (hsize_t) npoints, ptdata) < 0)
+            if (H5Sget_select_elem_pointlist(region, (hsize_t)0, (hsize_t)npoints, ptdata) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
             if ((dtype = H5Dget_type(region_id)) < 0)
@@ -1686,8 +1689,8 @@ h5str_dump_region_points_data
             if ((type_id = H5Tget_native_type(dtype, H5T_DIR_DEFAULT)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
-            if (h5str_print_region_data_points(ENVONLY, region, region_id,
-                    str, ndims, type_id, npoints, ptdata) < 0)
+            if (h5str_print_region_data_points(ENVONLY, region, region_id, str, ndims, type_id, npoints,
+                                               ptdata) < 0)
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
         }
     }
@@ -1707,24 +1710,22 @@ done:
 
 #ifndef SKIP_UNUSED_DUMP_ROUTINES
 static int
-h5str_dump_region_points
-    (JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
+h5str_dump_region_points(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_id)
 {
-    hssize_t  npoints;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    char      tmp_str[256];
-    int       ndims = -1;
-    int       ret_value = FAIL;
+    hssize_t npoints;
+    hsize_t  alloc_size;
+    hsize_t *ptdata = NULL;
+    char     tmp_str[256];
+    int      ndims     = -1;
+    int      ret_value = FAIL;
 
     UNUSED(region_id);
 
     /*
      * This function fails if the region does not have points.
      */
-    H5E_BEGIN_TRY {
-        npoints = H5Sget_select_elem_npoints(region);
-    } H5E_END_TRY;
+    H5E_BEGIN_TRY { npoints = H5Sget_select_elem_npoints(region); }
+    H5E_END_TRY;
 
     if (npoints < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -1737,11 +1738,12 @@ h5str_dump_region_points
         int i;
 
         alloc_size = (hsize_t)npoints * (hsize_t)ndims * (hsize_t)sizeof(ptdata[0]);
-        if (alloc_size == (hsize_t)((size_t) alloc_size)) {
-            if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t) alloc_size)))
-                H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_dump_region_points: failed to allocate region point buffer");
+        if (alloc_size == (hsize_t)((size_t)alloc_size)) {
+            if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size)))
+                H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                       "h5str_dump_region_points: failed to allocate region point buffer");
 
-            if (H5Sget_select_elem_pointlist(region, (hsize_t) 0, (hsize_t) npoints, ptdata) < 0)
+            if (H5Sget_select_elem_pointlist(region, (hsize_t)0, (hsize_t)npoints, ptdata) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
             if (!h5str_append(str, " {"))
@@ -1756,8 +1758,8 @@ h5str_dump_region_points
                 for (j = 0; j < ndims; j++) {
                     tmp_str[0] = '\0';
 
-                    if (HDsprintf(tmp_str, "%s%lu", j ? "," : "(",
-                            (unsigned long) (ptdata[i * ndims + j])) < 0)
+                    if (HDsprintf(tmp_str, "%s%lu", j ? "," : "(", (unsigned long)(ptdata[i * ndims + j])) <
+                        0)
                         H5_JNI_FATAL_ERROR(ENVONLY, "h5str_dump_region_points: HDsprintf failure");
 
                     if (!h5str_append(str, tmp_str))
@@ -1771,7 +1773,7 @@ h5str_dump_region_points
             if (!h5str_append(str, " }"))
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
         } /* end if (alloc_size == (hsize_t)((size_t) alloc_size)) */
-    } /* end if (npoints > 0) */
+    }     /* end if (npoints > 0) */
 
     ret_value = SUCCEED;
 
@@ -1784,10 +1786,9 @@ done:
 #endif
 
 static int
-h5str_is_zero
-    (const void *_mem, size_t size)
+h5str_is_zero(const void *_mem, size_t size)
 {
-    const unsigned char *mem = (const unsigned char *) _mem;
+    const unsigned char *mem = (const unsigned char *)_mem;
 
     while (size-- > 0)
         if (mem[size])
@@ -1808,8 +1809,7 @@ h5str_is_zero
  *-------------------------------------------------------------------------
  */
 static htri_t
-h5str_detect_vlen
-    (hid_t tid)
+h5str_detect_vlen(hid_t tid)
 {
     htri_t ret = FAIL;
 
@@ -1840,48 +1840,47 @@ done:
  *-------------------------------------------------------------------------
  */
 static htri_t
-h5str_detect_vlen_str
-    (hid_t tid)
+h5str_detect_vlen_str(hid_t tid)
 {
     H5T_class_t tclass = H5T_NO_CLASS;
-    htri_t ret = 0;
+    htri_t      ret    = 0;
 
     ret = H5Tis_variable_str(tid);
-    if((ret == 1) || (ret < 0))
+    if ((ret == 1) || (ret < 0))
         goto done;
 
     tclass = H5Tget_class(tid);
-    if(tclass == H5T_ARRAY || tclass == H5T_VLEN) {
+    if (tclass == H5T_ARRAY || tclass == H5T_VLEN) {
         hid_t btid = H5Tget_super(tid);
 
-        if(btid < 0) {
+        if (btid < 0) {
             ret = (htri_t)btid;
             goto done;
         } /* end if */
         ret = h5str_detect_vlen_str(btid);
-        if((ret == 1) || (ret < 0)) {
+        if ((ret == 1) || (ret < 0)) {
             H5Tclose(btid);
             goto done;
         } /* end if */
-    } /* end if */
-    else if(tclass == H5T_COMPOUND) {
+    }     /* end if */
+    else if (tclass == H5T_COMPOUND) {
         unsigned i = 0;
-        int n = H5Tget_nmembers(tid);
+        int      n = H5Tget_nmembers(tid);
 
         if (n < 0)
             goto done;
 
-        for(i = 0; i < (unsigned) n; i++) {
+        for (i = 0; i < (unsigned)n; i++) {
             hid_t mtid = H5Tget_member_type(tid, i);
 
             ret = h5str_detect_vlen_str(mtid);
-            if((ret == 1) || (ret < 0)) {
+            if ((ret == 1) || (ret < 0)) {
                 H5Tclose(mtid);
                 goto done;
             }
             H5Tclose(mtid);
         } /* end for */
-    } /* end else */
+    }     /* end else */
 
 done:
     return ret;
@@ -1898,8 +1897,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-h5str_get_native_type
-    (hid_t type)
+h5str_get_native_type(hid_t type)
 {
     H5T_class_t type_class;
     hid_t       p_type = H5I_INVALID_HID;
@@ -1913,10 +1911,9 @@ h5str_get_native_type
         p_type = H5Tget_native_type(type, H5T_DIR_DEFAULT);
 
 done:
-    return(p_type);
+    return (p_type);
 } /* end h5str_get_native_type */
 
-
 /*-------------------------------------------------------------------------
  * Function: h5str_get_little_endian_type
  *
@@ -1927,8 +1924,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-h5str_get_little_endian_type
-    (hid_t tid)
+h5str_get_little_endian_type(hid_t tid)
 {
     H5T_class_t type_class;
     H5T_sign_t  sign;
@@ -1944,56 +1940,52 @@ h5str_get_little_endian_type
     if ((sign = H5Tget_sign(tid)) < 0)
         goto done;
 
-    switch ( type_class ) {
-        case H5T_INTEGER:
-        {
-            if ( size == 1 && sign == H5T_SGN_2 )
+    switch (type_class) {
+        case H5T_INTEGER: {
+            if (size == 1 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I8LE);
-            else if ( size == 2 && sign == H5T_SGN_2 )
+            else if (size == 2 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I16LE);
-            else if ( size == 4 && sign == H5T_SGN_2 )
+            else if (size == 4 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I32LE);
-            else if ( size == 8 && sign == H5T_SGN_2 )
+            else if (size == 8 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I64LE);
-            else if ( size == 1 && sign == H5T_SGN_NONE )
+            else if (size == 1 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U8LE);
-            else if ( size == 2 && sign == H5T_SGN_NONE )
+            else if (size == 2 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U16LE);
-            else if ( size == 4 && sign == H5T_SGN_NONE )
+            else if (size == 4 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U32LE);
-            else if ( size == 8 && sign == H5T_SGN_NONE )
+            else if (size == 8 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U64LE);
 
             break;
         }
 
-        case H5T_FLOAT:
-        {
-            if ( size == 4 )
+        case H5T_FLOAT: {
+            if (size == 4)
                 p_type = H5Tcopy(H5T_IEEE_F32LE);
-            else if ( size == 8 )
+            else if (size == 8)
                 p_type = H5Tcopy(H5T_IEEE_F64LE);
 
             break;
         }
 
-        case H5T_BITFIELD:
-        {
-            if ( size == 1 )
+        case H5T_BITFIELD: {
+            if (size == 1)
                 p_type = H5Tcopy(H5T_STD_B8LE);
-            else if ( size == 2 )
+            else if (size == 2)
                 p_type = H5Tcopy(H5T_STD_B16LE);
-            else if ( size == 4 )
+            else if (size == 4)
                 p_type = H5Tcopy(H5T_STD_B32LE);
-            else if ( size == 8 )
+            else if (size == 8)
                 p_type = H5Tcopy(H5T_STD_B64LE);
 
             break;
         }
 
         case H5T_NO_CLASS:
-        case H5T_NCLASSES:
-        {
+        case H5T_NCLASSES: {
             goto done;
             break;
         }
@@ -2013,7 +2005,7 @@ h5str_get_little_endian_type
     }
 
 done:
-    return(p_type);
+    return (p_type);
 } /* end h5str_get_little_endian_type */
 
 /*-------------------------------------------------------------------------
@@ -2026,8 +2018,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static hid_t
-h5str_get_big_endian_type
-    (hid_t tid)
+h5str_get_big_endian_type(hid_t tid)
 {
     H5T_class_t type_class;
     H5T_sign_t  sign;
@@ -2043,56 +2034,52 @@ h5str_get_big_endian_type
     if ((sign = H5Tget_sign(tid)) < 0)
         goto done;
 
-    switch ( type_class ) {
-        case H5T_INTEGER:
-        {
-            if ( size == 1 && sign == H5T_SGN_2 )
+    switch (type_class) {
+        case H5T_INTEGER: {
+            if (size == 1 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I8BE);
-            else if ( size == 2 && sign == H5T_SGN_2 )
+            else if (size == 2 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I16BE);
-            else if ( size == 4 && sign == H5T_SGN_2 )
+            else if (size == 4 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I32BE);
-            else if ( size == 8 && sign == H5T_SGN_2 )
+            else if (size == 8 && sign == H5T_SGN_2)
                 p_type = H5Tcopy(H5T_STD_I64BE);
-            else if ( size == 1 && sign == H5T_SGN_NONE )
+            else if (size == 1 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U8BE);
-            else if ( size == 2 && sign == H5T_SGN_NONE )
+            else if (size == 2 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U16BE);
-            else if ( size == 4 && sign == H5T_SGN_NONE )
+            else if (size == 4 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U32BE);
-            else if ( size == 8 && sign == H5T_SGN_NONE )
+            else if (size == 8 && sign == H5T_SGN_NONE)
                 p_type = H5Tcopy(H5T_STD_U64BE);
 
             break;
         }
 
-        case H5T_FLOAT:
-        {
-            if ( size == 4 )
+        case H5T_FLOAT: {
+            if (size == 4)
                 p_type = H5Tcopy(H5T_IEEE_F32BE);
-            else if ( size == 8 )
+            else if (size == 8)
                 p_type = H5Tcopy(H5T_IEEE_F64BE);
 
             break;
         }
 
-        case H5T_BITFIELD:
-        {
-            if ( size == 1 )
+        case H5T_BITFIELD: {
+            if (size == 1)
                 p_type = H5Tcopy(H5T_STD_B8BE);
-            else if ( size == 2 )
+            else if (size == 2)
                 p_type = H5Tcopy(H5T_STD_B16BE);
-            else if ( size == 4 )
+            else if (size == 4)
                 p_type = H5Tcopy(H5T_STD_B32BE);
-            else if ( size == 8 )
+            else if (size == 8)
                 p_type = H5Tcopy(H5T_STD_B64BE);
 
             break;
         }
 
         case H5T_NO_CLASS:
-        case H5T_NCLASSES:
-        {
+        case H5T_NCLASSES: {
             goto done;
             break;
         }
@@ -2112,7 +2099,7 @@ h5str_get_big_endian_type
     }
 
 done:
-    return(p_type);
+    return (p_type);
 } /* end h5str_get_big_endian_type */
 
 /*-------------------------------------------------------------------------
@@ -2125,13 +2112,12 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-h5str_render_bin_output
-    (FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t block_nelmts)
+h5str_render_bin_output(FILE *stream, hid_t container, hid_t tid, void *_mem, hsize_t block_nelmts)
 {
-    unsigned char *mem = (unsigned char*)_mem;
+    unsigned char *mem = (unsigned char *)_mem;
     H5T_class_t    type_class;
     hsize_t        block_index;
-    size_t         size;   /* datum size */
+    size_t         size; /* datum size */
     int            ret_value = 0;
 
     if (!(size = H5Tget_size(tid))) {
@@ -2147,12 +2133,11 @@ h5str_render_bin_output
     switch (type_class) {
         case H5T_INTEGER:
         case H5T_FLOAT:
-        case H5T_ENUM:
-        {
+        case H5T_ENUM: {
             block_index = block_nelmts * size;
             while (block_index > 0) {
-                size_t bytes_in    = 0;    /* # of bytes to write  */
-                size_t bytes_wrote = 0;    /* # of bytes written   */
+                size_t bytes_in    = 0; /* # of bytes to write  */
+                size_t bytes_wrote = 0; /* # of bytes written   */
 
                 if (block_index > sizeof(size_t))
                     bytes_in = sizeof(size_t);
@@ -2173,12 +2158,11 @@ h5str_render_bin_output
             break;
         }
 
-        case H5T_STRING:
-        {
-            unsigned char  tempuchar;
-            unsigned int   i;
-            H5T_str_t      pad;
-            char          *s;
+        case H5T_STRING: {
+            unsigned char tempuchar;
+            unsigned int  i;
+            H5T_str_t     pad;
+            char *        s;
 
             if ((pad = H5Tget_strpad(tid)) < 0) {
                 ret_value = FAIL;
@@ -2189,12 +2173,12 @@ h5str_render_bin_output
                 mem = ((unsigned char *)_mem) + block_index * size;
 
                 if (H5Tis_variable_str(tid)) {
-                    s = *(char**) mem;
+                    s = *(char **)mem;
                     if (s != NULL)
                         size = HDstrlen(s);
                 }
                 else {
-                    s = (char *) mem;
+                    s = (char *)mem;
                 }
                 for (i = 0; i < size && (s[i] || pad != H5T_STR_NULLTERM); i++) {
                     HDmemcpy(&tempuchar, &s[i], sizeof(unsigned char));
@@ -2210,8 +2194,7 @@ h5str_render_bin_output
             break;
         }
 
-        case H5T_COMPOUND:
-        {
+        case H5T_COMPOUND: {
             unsigned j;
             size_t   offset;
             hid_t    memb = H5I_INVALID_HID;
@@ -2223,8 +2206,8 @@ h5str_render_bin_output
             }
 
             for (block_index = 0; block_index < block_nelmts; block_index++) {
-                mem = ((unsigned char*)_mem) + block_index * size;
-                for (j = 0; j < (unsigned) nmembs; j++) {
+                mem = ((unsigned char *)_mem) + block_index * size;
+                for (j = 0; j < (unsigned)nmembs; j++) {
                     offset = H5Tget_member_offset(tid, j);
                     memb   = H5Tget_member_type(tid, j);
 
@@ -2244,8 +2227,7 @@ h5str_render_bin_output
             break;
         }
 
-        case H5T_ARRAY:
-        {
+        case H5T_ARRAY: {
             hsize_t dims[H5S_MAX_RANK], temp_nelmts, nelmts;
             hid_t   memb;
             int     k, ndims;
@@ -2270,11 +2252,11 @@ h5str_render_bin_output
             for (k = 0, nelmts = 1; k < ndims; k++) {
                 temp_nelmts = nelmts;
                 temp_nelmts *= dims[k];
-                nelmts = (size_t) temp_nelmts;
+                nelmts = (size_t)temp_nelmts;
             }
 
             for (block_index = 0; block_index < block_nelmts; block_index++) {
-                mem = ((unsigned char*)_mem) + block_index * size;
+                mem = ((unsigned char *)_mem) + block_index * size;
 
                 /* dump the array element */
                 if (h5str_render_bin_output(stream, container, memb, mem, nelmts) < 0) {
@@ -2288,8 +2270,7 @@ h5str_render_bin_output
             break;
         }
 
-        case H5T_VLEN:
-        {
+        case H5T_VLEN: {
             hsize_t nelmts;
             hid_t   memb;
 
@@ -2300,13 +2281,14 @@ h5str_render_bin_output
             }
 
             for (block_index = 0; block_index < block_nelmts; block_index++) {
-                mem = ((unsigned char*)_mem) + block_index * size;
+                mem = ((unsigned char *)_mem) + block_index * size;
 
                 /* Get the number of sequence elements */
-                nelmts = ((hvl_t *) mem)->len;
+                nelmts = ((hvl_t *)mem)->len;
 
                 /* dump the array element */
-                if (h5str_render_bin_output(stream, container, memb, ((char *) (((hvl_t *) mem)->p)), nelmts) < 0) {
+                if (h5str_render_bin_output(stream, container, memb, ((char *)(((hvl_t *)mem)->p)), nelmts) <
+                    0) {
                     ret_value = FAIL;
                     break;
                 }
@@ -2317,26 +2299,28 @@ h5str_render_bin_output
             break;
         }
 
-        case H5T_REFERENCE:
-        {
+        case H5T_REFERENCE: {
             if (H5Tequal(tid, H5T_STD_REF)) {
-                hid_t   region_id = H5I_INVALID_HID;
-                hid_t   region_space = H5I_INVALID_HID;
+                hid_t        region_id    = H5I_INVALID_HID;
+                hid_t        region_space = H5I_INVALID_HID;
                 H5S_sel_type region_type;
 
                 /* Region data */
                 for (block_index = 0; block_index < block_nelmts; block_index++) {
-                    mem = ((unsigned char*)_mem) + block_index * size;
-                    if((region_id = H5Ropen_object((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+                    mem = ((unsigned char *)_mem) + block_index * size;
+                    if ((region_id = H5Ropen_object((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) < 0)
                         continue;
                     else {
-                        if((region_space = H5Ropen_region((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
+                        if ((region_space =
+                                 H5Ropen_region((const H5R_ref_t *)mem, H5P_DEFAULT, H5P_DEFAULT)) >= 0) {
                             if (!h5str_is_zero(mem, H5Tget_size(H5T_STD_REF))) {
                                 region_type = H5Sget_select_type(region_space);
                                 if (region_type == H5S_SEL_POINTS)
-                                    ret_value = render_bin_output_region_points(stream, region_space, region_id, container);
+                                    ret_value = render_bin_output_region_points(stream, region_space,
+                                                                                region_id, container);
                                 else
-                                    ret_value = render_bin_output_region_blocks(stream, region_space, region_id, container);
+                                    ret_value = render_bin_output_region_blocks(stream, region_space,
+                                                                                region_id, container);
                             }
                             H5Sclose(region_space);
                         } /* end if (region_space >= 0) */
@@ -2363,8 +2347,7 @@ h5str_render_bin_output
         }
 
         case H5T_NO_CLASS:
-        case H5T_NCLASSES:
-        {
+        case H5T_NCLASSES: {
             ret_value = FAIL;
             goto done;
             break;
@@ -2375,7 +2358,7 @@ h5str_render_bin_output
         case H5T_OPAQUE:
         default:
             for (block_index = 0; block_index < block_nelmts; block_index++) {
-                mem = ((unsigned char*)_mem) + block_index * size;
+                mem = ((unsigned char *)_mem) + block_index * size;
                 if (size != fwrite(mem, sizeof(char), size, stream)) {
                     ret_value = FAIL;
                     break;
@@ -2400,8 +2383,8 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-render_bin_output_region_data_blocks
-    (FILE *stream, hid_t region_id, hid_t container, int ndims, hid_t type_id, hssize_t nblocks, hsize_t *ptdata)
+render_bin_output_region_data_blocks(FILE *stream, hid_t region_id, hid_t container, int ndims, hid_t type_id,
+                                     hssize_t nblocks, hsize_t *ptdata)
 {
     hsize_t *dims1 = NULL;
     hsize_t *start = NULL;
@@ -2409,9 +2392,9 @@ render_bin_output_region_data_blocks
     hsize_t  numelem;
     hsize_t  total_size[H5S_MAX_RANK];
     size_t   type_size;
-    hid_t    sid1 = H5I_INVALID_HID;
-    hid_t    mem_space = H5I_INVALID_HID;
-    void    *region_buf = NULL;
+    hid_t    sid1       = H5I_INVALID_HID;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    void *   region_buf = NULL;
     int      blkndx;
     int      jndx;
     int      ret_value = SUCCEED;
@@ -2423,7 +2406,7 @@ render_bin_output_region_data_blocks
     }
 
     /* Allocate space for the dimension array */
-    if (NULL == (dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
+    if (NULL == (dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
         ret_value = FAIL;
         goto done;
     }
@@ -2431,7 +2414,7 @@ render_bin_output_region_data_blocks
     /* Find the dimensions of each data space from the block coordinates */
     for (jndx = 0, numelem = 1; jndx < ndims; jndx++) {
         dims1[jndx] = ptdata[jndx + ndims] - ptdata[jndx] + 1;
-        numelem = dims1[jndx] * numelem;
+        numelem     = dims1[jndx] * numelem;
     }
 
     /* Create dataspace for reading buffer */
@@ -2452,12 +2435,12 @@ render_bin_output_region_data_blocks
 
     /* Select (x , x , ..., x ) x (y , y , ..., y ) hyperslab for reading memory dataset */
     /*         1   2        n      1   2        n                                        */
-    if (NULL == (start = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
+    if (NULL == (start = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
         ret_value = FAIL;
         goto done;
     }
 
-    if (NULL == (count = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
+    if (NULL == (count = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
         ret_value = FAIL;
         goto done;
     }
@@ -2520,16 +2503,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-render_bin_output_region_blocks
-    (FILE *stream, hid_t region_space, hid_t region_id, hid_t container)
+render_bin_output_region_blocks(FILE *stream, hid_t region_space, hid_t region_id, hid_t container)
 {
-    hssize_t  nblocks;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    hid_t     dtype = H5I_INVALID_HID;
-    hid_t     type_id = H5I_INVALID_HID;
-    int       ndims;
-    int       ret_value = SUCCEED;
+    hssize_t nblocks;
+    hsize_t  alloc_size;
+    hsize_t *ptdata  = NULL;
+    hid_t    dtype   = H5I_INVALID_HID;
+    hid_t    type_id = H5I_INVALID_HID;
+    int      ndims;
+    int      ret_value = SUCCEED;
 
     if ((nblocks = H5Sget_select_hyper_nblocks(region_space)) < 0) {
         ret_value = FAIL;
@@ -2545,7 +2527,7 @@ render_bin_output_region_blocks
 
         alloc_size = (hsize_t)nblocks * (hsize_t)ndims * 2 * (hsize_t)sizeof(ptdata[0]);
 
-        if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t)alloc_size))) {
+        if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size))) {
             ret_value = FAIL;
             goto done;
         }
@@ -2565,8 +2547,8 @@ render_bin_output_region_blocks
             goto done;
         }
 
-        if (render_bin_output_region_data_blocks(stream, region_id, container,
-                ndims, type_id, nblocks, ptdata) < 0) {
+        if (render_bin_output_region_data_blocks(stream, region_id, container, ndims, type_id, nblocks,
+                                                 ptdata) < 0) {
             ret_value = FAIL;
             goto done;
         }
@@ -2595,15 +2577,14 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-render_bin_output_region_data_points
-    (FILE *stream, hid_t region_space, hid_t region_id,
-        hid_t container, int ndims, hid_t type_id, hssize_t npoints, hsize_t *ptdata)
+render_bin_output_region_data_points(FILE *stream, hid_t region_space, hid_t region_id, hid_t container,
+                                     int ndims, hid_t type_id, hssize_t npoints, hsize_t *ptdata)
 {
     hsize_t *dims1 = NULL;
     size_t   type_size;
-    hid_t    mem_space = H5I_INVALID_HID;
-    void    *region_buf = NULL;
-    int      ret_value = SUCCEED;
+    hid_t    mem_space  = H5I_INVALID_HID;
+    void *   region_buf = NULL;
+    int      ret_value  = SUCCEED;
 
     UNUSED(ptdata);
 
@@ -2618,7 +2599,7 @@ render_bin_output_region_data_points
     }
 
     /* Allocate space for the dimension array */
-    if (NULL == (dims1 = (hsize_t *) HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
+    if (NULL == (dims1 = (hsize_t *)HDmalloc(sizeof(hsize_t) * (size_t)ndims))) {
         ret_value = FAIL;
         goto done;
     }
@@ -2668,16 +2649,15 @@ done:
  *-------------------------------------------------------------------------
  */
 static int
-render_bin_output_region_points
-    (FILE *stream, hid_t region_space, hid_t region_id, hid_t container)
+render_bin_output_region_points(FILE *stream, hid_t region_space, hid_t region_id, hid_t container)
 {
-    hssize_t  npoints;
-    hsize_t   alloc_size;
-    hsize_t  *ptdata = NULL;
-    hid_t     dtype = H5I_INVALID_HID;
-    hid_t     type_id = H5I_INVALID_HID;
-    int       ndims;
-    int       ret_value = SUCCEED;
+    hssize_t npoints;
+    hsize_t  alloc_size;
+    hsize_t *ptdata  = NULL;
+    hid_t    dtype   = H5I_INVALID_HID;
+    hid_t    type_id = H5I_INVALID_HID;
+    int      ndims;
+    int      ret_value = SUCCEED;
 
     if ((npoints = H5Sget_select_elem_npoints(region_space)) < 0) {
         ret_value = FAIL;
@@ -2693,7 +2673,7 @@ render_bin_output_region_points
 
         alloc_size = (hsize_t)npoints * (hsize_t)ndims * (hsize_t)sizeof(ptdata[0]);
 
-        if (NULL == (ptdata = (hsize_t *) HDmalloc((size_t)alloc_size))) {
+        if (NULL == (ptdata = (hsize_t *)HDmalloc((size_t)alloc_size))) {
             ret_value = FAIL;
             goto done;
         }
@@ -2713,8 +2693,8 @@ render_bin_output_region_points
             goto done;
         }
 
-        if (render_bin_output_region_data_points(stream, region_space, region_id,
-                container, ndims, type_id, npoints, ptdata) < 0) {
+        if (render_bin_output_region_data_points(stream, region_space, region_id, container, ndims, type_id,
+                                                 npoints, ptdata) < 0) {
             ret_value = FAIL;
             goto done;
         }
@@ -2732,8 +2712,7 @@ done:
 } /* end render_bin_output_region_points */
 
 int
-h5str_dump_simple_dset
-    (JNIEnv *env, FILE *stream, hid_t dset, int binary_order)
+h5str_dump_simple_dset(JNIEnv *env, FILE *stream, hid_t dset, int binary_order)
 {
     hsize_t elmtno;                    /* counter  */
     hsize_t zero[8];                   /* vector of zeros */
@@ -2741,7 +2720,7 @@ h5str_dump_simple_dset
     size_t  i;                         /* counter  */
     hid_t   f_space = H5I_INVALID_HID; /* file data space */
     int     ndims;
-    int     carry;                     /* counter carry value */
+    int     carry; /* counter carry value */
 
     /* Print info */
     hsize_t p_nelmts;      /* total selected elmts */
@@ -2761,8 +2740,8 @@ h5str_dump_simple_dset
 
     /* VL data special information */
     unsigned int vl_data = 0; /* contains VL datatypes */
-    hid_t        p_type = H5I_INVALID_HID;
-    hid_t        f_type = H5I_INVALID_HID;
+    hid_t        p_type  = H5I_INVALID_HID;
+    hid_t        f_type  = H5I_INVALID_HID;
 
     int ret_value = FAIL;
 
@@ -2773,32 +2752,28 @@ h5str_dump_simple_dset
         H5_LIBRARY_ERROR(ENVONLY);
 
     switch (binary_order) {
-        case 1:
-        {
+        case 1: {
             if ((p_type = h5str_get_native_type(f_type)) < 0)
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             break;
         }
 
-        case 2:
-        {
+        case 2: {
             if ((p_type = h5str_get_little_endian_type(f_type)) < 0)
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             break;
         }
 
-        case 3:
-        {
+        case 3: {
             if ((p_type = h5str_get_big_endian_type(f_type)) < 0)
                 CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
             break;
         }
 
-        default:
-        {
+        default: {
             if ((p_type = H5Tcopy(f_type)) < 0)
                 H5_LIBRARY_ERROR(ENVONLY);
 
@@ -2820,7 +2795,7 @@ h5str_dump_simple_dset
         p_nelmts = 1;
 
         if (ndims > 0) {
-            for (i = 0; i < (size_t) ndims; i++)
+            for (i = 0; i < (size_t)ndims; i++)
                 p_nelmts *= total_size[i];
         } /* end if */
 
@@ -2839,7 +2814,7 @@ h5str_dump_simple_dset
             if (ndims > 0) {
                 for (i = (size_t)ndims; i > 0; --i) {
                     hsize_t size = H5TOOLS_BUFSIZE / sm_nbytes;
-                    if ( size == 0 ) /* datum size > H5TOOLS_BUFSIZE */
+                    if (size == 0) /* datum size > H5TOOLS_BUFSIZE */
                         size = 1;
                     sm_size[i - 1] = (((total_size[i - 1]) < (size)) ? (total_size[i - 1]) : (size));
                     sm_nbytes *= sm_size[i - 1];
@@ -2847,7 +2822,7 @@ h5str_dump_simple_dset
             }
 
             if (sm_nbytes > 0) {
-                if (NULL == (sm_buf = (unsigned char *) HDmalloc((size_t)sm_nbytes)))
+                if (NULL == (sm_buf = (unsigned char *)HDmalloc((size_t)sm_nbytes)))
                     H5_OUT_OF_MEMORY_ERROR(ENVONLY, "h5str_dump_simple_dset: failed to allocate sm_buf");
 
                 sm_nelmts = sm_nbytes / p_type_nbytes;
@@ -2862,8 +2837,10 @@ h5str_dump_simple_dset
                 for (elmtno = 0; elmtno < p_nelmts; elmtno += hs_nelmts) {
                     /* Calculate the hyperslab size */
                     if (ndims > 0) {
-                        for (i = 0, hs_nelmts = 1; i < (size_t) ndims; i++) {
-                            hs_size[i] = (((total_size[i] - hs_offset[i]) < (sm_size[i])) ? (total_size[i] - hs_offset[i]) : (sm_size[i]));
+                        for (i = 0, hs_nelmts = 1; i < (size_t)ndims; i++) {
+                            hs_size[i] = (((total_size[i] - hs_offset[i]) < (sm_size[i]))
+                                              ? (total_size[i] - hs_offset[i])
+                                              : (sm_size[i]));
                             hs_nelmts *= hs_size[i];
                         }
 
@@ -2934,23 +2911,24 @@ done:
 } /* end h5str_dump_simple_dset */
 
 htri_t
-H5Tdetect_variable_str(hid_t tid) {
+H5Tdetect_variable_str(hid_t tid)
+{
     htri_t ret_val = 0;
 
     if (H5Tget_class(tid) == H5T_COMPOUND) {
         unsigned i;
         unsigned nm = (unsigned)H5Tget_nmembers(tid);
-        for(i = 0; i < nm; i++) {
+        for (i = 0; i < nm; i++) {
             htri_t status = 0;
-            hid_t mtid = 0;
-            if((mtid = H5Tget_member_type(tid, i)) < 0)
+            hid_t  mtid   = 0;
+            if ((mtid = H5Tget_member_type(tid, i)) < 0)
                 return FAIL; /* exit immediately on error */
-            if((status = H5Tdetect_variable_str(mtid)) < 0)
+            if ((status = H5Tdetect_variable_str(mtid)) < 0)
                 return status; /* exit immediately on error */
             ret_val |= status;
-            H5Tclose (mtid);
+            H5Tclose(mtid);
         } /* end for */
-    } /* end if */
+    }     /* end if */
     else
         ret_val = H5Tis_variable_str(tid);
 
@@ -2958,8 +2936,7 @@ H5Tdetect_variable_str(hid_t tid) {
 } /* end H5Tdetect_variable_str */
 
 static int
-h5tools_dump_simple_data
-    (JNIEnv *env, FILE *stream, hid_t container, hid_t type, void *_mem, hsize_t nelmts)
+h5tools_dump_simple_data(JNIEnv *env, FILE *stream, hid_t container, hid_t type, void *_mem, hsize_t nelmts)
 {
     unsigned char *mem = (unsigned char *)_mem;
     h5str_t        buffer; /* string into which to render */
@@ -2972,8 +2949,8 @@ h5tools_dump_simple_data
         H5_LIBRARY_ERROR(ENVONLY);
 
     for (i = 0, line_count = 0; i < nelmts; i++, line_count++) {
-        size_t  bytes_in = 0;    /* # of bytes to write  */
-        void   *memref = mem + i * size;
+        size_t bytes_in = 0; /* # of bytes to write  */
+        void * memref   = mem + i * size;
 
         /* Render the data element*/
         h5str_new(&buffer, 32 * size);
@@ -3023,17 +3000,17 @@ done:
  * Signature: (JJ[Ljava/lang/String;)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AreadComplex
-(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id, jobjectArray buf)
+Java_hdf_hdf5lib_H5_H5AreadComplex(JNIEnv *env, jclass clss, jlong attr_id, jlong mem_type_id,
+                                   jobjectArray buf)
 {
-    h5str_t  h5str;
-    jstring  jstr;
-    size_t   size;
-    size_t   i;
-    hid_t    p_type = H5I_INVALID_HID;
-    jsize    n;
-    char    *readBuf = NULL;
-    herr_t   status = FAIL;
+    h5str_t h5str;
+    jstring jstr;
+    size_t  size;
+    size_t  i;
+    hid_t   p_type = H5I_INVALID_HID;
+    jsize   n;
+    char *  readBuf = NULL;
+    herr_t  status  = FAIL;
 
     UNUSED(clss);
 
@@ -3042,14 +3019,15 @@ Java_hdf_hdf5lib_H5_H5AreadComplex
     if ((p_type = H5Tget_native_type(mem_type_id, H5T_DIR_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    size = (((H5Tget_size(mem_type_id))>(H5Tget_size(p_type))) ? (H5Tget_size(mem_type_id)) : (H5Tget_size(p_type)));
+    size = (((H5Tget_size(mem_type_id)) > (H5Tget_size(p_type))) ? (H5Tget_size(mem_type_id))
+                                                                 : (H5Tget_size(p_type)));
 
     if ((n = ENVPTR->GetArrayLength(ENVONLY, buf)) <= 0) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5AreadComplex: read buffer length <= 0");
     }
 
-    if (NULL == (readBuf = (char *) HDmalloc((size_t)n * size)))
+    if (NULL == (readBuf = (char *)HDmalloc((size_t)n * size)))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AreadComplex: failed to allocate read buffer");
 
     if ((status = H5Aread(attr_id, mem_type_id, readBuf)) < 0)
@@ -3060,7 +3038,7 @@ Java_hdf_hdf5lib_H5_H5AreadComplex
     if (!h5str.s)
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5AreadComplex: failed to allocate string buffer");
 
-    for (i = 0; i < (size_t) n; i++) {
+    for (i = 0; i < (size_t)n; i++) {
         h5str.s[0] = '\0';
 
         if (!h5str_sprintf(ENVONLY, &h5str, attr_id, mem_type_id, readBuf + (i * size), 0, 0))
@@ -3069,7 +3047,7 @@ Java_hdf_hdf5lib_H5_H5AreadComplex
         if (NULL == (jstr = ENVPTR->NewStringUTF(ENVONLY, h5str.s)))
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
-        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize) i, jstr);
+        ENVPTR->SetObjectArrayElement(ENVONLY, buf, (jsize)i, jstr);
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
 
         ENVPTR->DeleteLocalRef(ENVONLY, jstr);
@@ -3093,16 +3071,15 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Acopy
-    (JNIEnv *env, jclass clss, jlong src_id, jlong dst_id)
+Java_hdf_hdf5lib_H5_H5Acopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id)
 {
-    hssize_t  npoints;
-    hsize_t   total_size = 0;
-    size_t    type_size;
-    jbyte    *buf = NULL;
-    hid_t     tid = H5I_INVALID_HID;
-    hid_t     sid = H5I_INVALID_HID;
-    herr_t    retVal = FAIL;
+    hssize_t npoints;
+    hsize_t  total_size = 0;
+    size_t   type_size;
+    jbyte *  buf    = NULL;
+    hid_t    tid    = H5I_INVALID_HID;
+    hid_t    sid    = H5I_INVALID_HID;
+    herr_t   retVal = FAIL;
 
     UNUSED(clss);
 
@@ -3118,7 +3095,7 @@ Java_hdf_hdf5lib_H5_H5Acopy
         H5_LIBRARY_ERROR(ENVONLY);
     total_size = (hsize_t)npoints * (hsize_t)type_size;
 
-    if (NULL == (buf = (jbyte *) HDmalloc((size_t)total_size * sizeof(jbyte))))
+    if (NULL == (buf = (jbyte *)HDmalloc((size_t)total_size * sizeof(jbyte))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Acopy: failed to allocate buffer");
 
     if ((retVal = H5Aread((hid_t)src_id, tid, buf)) < 0)
@@ -3152,16 +3129,15 @@ done:
  * Signature: (JJ)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dcopy
-    (JNIEnv *env, jclass clss, jlong src_id, jlong dst_id)
+Java_hdf_hdf5lib_H5_H5Dcopy(JNIEnv *env, jclass clss, jlong src_id, jlong dst_id)
 {
-    hssize_t  npoints;
-    hsize_t   total_size = 0, total_allocated_size;
-    size_t    type_size;
-    jbyte    *buf = NULL;
-    hid_t     tid = H5I_INVALID_HID;
-    hid_t     sid = H5I_INVALID_HID;
-    herr_t    retVal = FAIL;
+    hssize_t npoints;
+    hsize_t  total_size = 0, total_allocated_size;
+    size_t   type_size;
+    jbyte *  buf    = NULL;
+    hid_t    tid    = H5I_INVALID_HID;
+    hid_t    sid    = H5I_INVALID_HID;
+    herr_t   retVal = FAIL;
 
     UNUSED(clss);
 
@@ -3180,7 +3156,7 @@ Java_hdf_hdf5lib_H5_H5Dcopy
         H5_LIBRARY_ERROR(ENVONLY);
     total_size = (hsize_t)npoints * (hsize_t)type_size;
 
-    if (NULL == (buf = (jbyte *) HDmalloc((size_t)total_size * sizeof(jbyte))))
+    if (NULL == (buf = (jbyte *)HDmalloc((size_t)total_size * sizeof(jbyte))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Dcopy: failed to allocate buffer");
 
     if ((retVal = H5Dread((hid_t)src_id, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf)) < 0)
@@ -3219,29 +3195,29 @@ done:
  */
 
 #ifdef __cplusplus
-    herr_t obj_info_all(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
-    herr_t obj_info_max(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
-    int H5Gget_obj_info_max(hid_t, char **, int *, int *, H5O_token_t *, long);
-    int H5Gget_obj_info_full( hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno, H5O_token_t *obj_token, int indexType, int indexOrder);
+herr_t obj_info_all(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
+herr_t obj_info_max(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
+int    H5Gget_obj_info_max(hid_t, char **, int *, int *, H5O_token_t *, long);
+int    H5Gget_obj_info_full(hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno,
+                            H5O_token_t *obj_token, int indexType, int indexOrder);
 #else
-    static herr_t obj_info_all(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
-    static herr_t obj_info_max(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
-    static int H5Gget_obj_info_max(hid_t, char **, int *, int *, H5O_token_t *, long);
-    static int H5Gget_obj_info_full( hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno, H5O_token_t *obj_token, int indexType, int indexOrder);
+static herr_t obj_info_all(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
+static herr_t obj_info_max(hid_t g_id, const char *name, const H5L_info2_t *linfo, void *op_data);
+static int    H5Gget_obj_info_max(hid_t, char **, int *, int *, H5O_token_t *, long);
+static int    H5Gget_obj_info_full(hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno,
+                                   H5O_token_t *obj_token, int indexType, int indexOrder);
 #endif
 
-typedef struct info_all
-{
-    char **objname;
-    int *otype;
-    int *ltype;
-    H5O_token_t *obj_token;
+typedef struct info_all {
+    char **        objname;
+    int *          otype;
+    int *          ltype;
+    H5O_token_t *  obj_token;
     unsigned long *fno;
-    unsigned long idxnum;
-    int count;
+    unsigned long  idxnum;
+    int            count;
 } info_all_t;
 
-
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_obj_info_full
@@ -3253,26 +3229,26 @@ typedef struct info_all
  * end up overwriting memory heap-tracking info.
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full
-    (JNIEnv *env, jclass clss, jlong loc_id, jstring group_name,
-        jobjectArray objName, jintArray oType, jintArray lType, jlongArray fNo,
-        jobjectArray oToken, jint n, jint indx_type, jint indx_order)
+Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full(JNIEnv *env, jclass clss, jlong loc_id, jstring group_name,
+                                            jobjectArray objName, jintArray oType, jintArray lType,
+                                            jlongArray fNo, jobjectArray oToken, jint n, jint indx_type,
+                                            jint indx_order)
 {
-    unsigned long  *fnos = NULL;
-    H5O_token_t    *tokens = NULL;
-    const char     *gName = NULL;
-    char          **oName = NULL;
-    jboolean        isCopy;
-    jstring         str;
-    jobject         token;
-    jint           *otarr = NULL;
-    jint           *ltarr = NULL;
-    jlong          *fnoP = NULL;
-    hid_t           gid = (hid_t)loc_id;
-    int             i;
-    int             indexType = indx_type;
-    int             indexOrder = indx_order;
-    herr_t          ret_val = FAIL;
+    unsigned long *fnos   = NULL;
+    H5O_token_t *  tokens = NULL;
+    const char *   gName  = NULL;
+    char **        oName  = NULL;
+    jboolean       isCopy;
+    jstring        str;
+    jobject        token;
+    jint *         otarr = NULL;
+    jint *         ltarr = NULL;
+    jlong *        fnoP  = NULL;
+    hid_t          gid   = (hid_t)loc_id;
+    int            i;
+    int            indexType  = indx_type;
+    int            indexOrder = indx_order;
+    herr_t         ret_val    = FAIL;
 
     UNUSED(clss);
 
@@ -3289,14 +3265,15 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full
     PIN_INT_ARRAY(ENVONLY, lType, ltarr, &isCopy, "H5Gget_obj_info_full: lType not pinned");
     PIN_LONG_ARRAY(ENVONLY, fNo, fnoP, &isCopy, "H5Gget_obj_info_full: fNo not pinned");
 
-    if (NULL == (oName = (char **) HDcalloc((size_t)n, sizeof(*oName))))
+    if (NULL == (oName = (char **)HDcalloc((size_t)n, sizeof(*oName))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Gget_obj_info_full: failed to allocate buffer for object name");
 
-    if (NULL == (tokens = (H5O_token_t *) HDcalloc((size_t)n, sizeof(H5O_token_t))))
+    if (NULL == (tokens = (H5O_token_t *)HDcalloc((size_t)n, sizeof(H5O_token_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Gget_obj_info_full: failed to allocate buffer for object tokens");
 
-    if (NULL == (fnos = (unsigned long *) HDcalloc((size_t)n, sizeof(unsigned long))))
-        H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Gget_obj_info_full: failed to allocate buffer for file number info");
+    if (NULL == (fnos = (unsigned long *)HDcalloc((size_t)n, sizeof(unsigned long))))
+        H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                               "H5Gget_obj_info_full: failed to allocate buffer for file number info");
 
     if (group_name) {
         PIN_JAVA_STRING(ENVONLY, group_name, gName, &isCopy, "H5Gget_obj_info_full: group_name not pinned");
@@ -3305,7 +3282,8 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full
             H5_LIBRARY_ERROR(ENVONLY);
     }
 
-    if ((ret_val = H5Gget_obj_info_full(gid, oName, (int *)otarr, (int *)ltarr, fnos, tokens, indexType, indexOrder)) < 0)
+    if ((ret_val = H5Gget_obj_info_full(gid, oName, (int *)otarr, (int *)ltarr, fnos, tokens, indexType,
+                                        indexOrder)) < 0)
         H5_JNI_FATAL_ERROR(ENVONLY, "H5Gget_obj_info_full: retrieval of object info failed");
 
     for (i = 0; i < n; i++) {
@@ -3363,19 +3341,19 @@ done:
  * will most likely end up overwriting memory heap-tracking info.
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max
-    (JNIEnv *env, jclass clss, jlong loc_id, jobjectArray objName,
-          jintArray oType, jintArray lType, jobjectArray oToken, jlong maxnum, jint n)
+Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max(JNIEnv *env, jclass clss, jlong loc_id, jobjectArray objName,
+                                           jintArray oType, jintArray lType, jobjectArray oToken,
+                                           jlong maxnum, jint n)
 {
-    H5O_token_t  *tokens = NULL;
-    jboolean      isCopy;
-    jstring       str;
-    jobject       token;
-    char        **oName = NULL;
-    jint         *otarr = NULL;
-    jint         *ltarr = NULL;
-    int           i;
-    herr_t        ret_val = FAIL;
+    H5O_token_t *tokens = NULL;
+    jboolean     isCopy;
+    jstring      str;
+    jobject      token;
+    char **      oName = NULL;
+    jint *       otarr = NULL;
+    jint *       ltarr = NULL;
+    int          i;
+    herr_t       ret_val = FAIL;
 
     UNUSED(clss);
 
@@ -3389,10 +3367,10 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max
     PIN_INT_ARRAY(ENVONLY, oType, otarr, &isCopy, "H5Gget_obj_info_max: oType not pinned");
     PIN_INT_ARRAY(ENVONLY, lType, ltarr, &isCopy, "H5Gget_obj_info_max: lType not pinned");
 
-    if (NULL == (oName = (char **) HDcalloc((size_t)n, sizeof(*oName))))
+    if (NULL == (oName = (char **)HDcalloc((size_t)n, sizeof(*oName))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Gget_obj_info_max: failed to allocate buffer for object name");
 
-    if (NULL == (tokens = (H5O_token_t *) HDcalloc((size_t)n, sizeof(H5O_token_t))))
+    if (NULL == (tokens = (H5O_token_t *)HDcalloc((size_t)n, sizeof(H5O_token_t))))
         H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Gget_obj_info_max: failed to allocate buffer for object tokens");
 
     if ((ret_val = H5Gget_obj_info_max((hid_t)loc_id, oName, (int *)otarr, (int *)ltarr, tokens, maxnum)) < 0)
@@ -3433,30 +3411,31 @@ done:
 } /* end Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max */
 
 int
-H5Gget_obj_info_full
-    (hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno, H5O_token_t *obj_token, int indexType, int indexOrder)
+H5Gget_obj_info_full(hid_t loc_id, char **objname, int *otype, int *ltype, unsigned long *fno,
+                     H5O_token_t *obj_token, int indexType, int indexOrder)
 {
     info_all_t info;
 
-    info.objname = objname;
-    info.otype = otype;
-    info.ltype = ltype;
-    info.idxnum = 0;
-    info.fno = fno;
+    info.objname   = objname;
+    info.otype     = otype;
+    info.ltype     = ltype;
+    info.idxnum    = 0;
+    info.fno       = fno;
     info.obj_token = obj_token;
-    info.count = 0;
+    info.count     = 0;
 
-    if (H5Literate2(loc_id, (H5_index_t)indexType, (H5_iter_order_t)indexOrder, NULL, obj_info_all, (void *)&info) < 0) {
+    if (H5Literate2(loc_id, (H5_index_t)indexType, (H5_iter_order_t)indexOrder, NULL, obj_info_all,
+                    (void *)&info) < 0) {
         /*
          * Reset info stats; most importantly, reset the count.
          */
-        info.objname = objname;
-        info.otype = otype;
-        info.ltype = ltype;
-        info.idxnum = 0;
-        info.fno = fno;
+        info.objname   = objname;
+        info.otype     = otype;
+        info.ltype     = ltype;
+        info.idxnum    = 0;
+        info.fno       = fno;
         info.obj_token = obj_token;
-        info.count = 0;
+        info.count     = 0;
 
         /* Iteration failed, try normal alphabetical order */
         if (H5Literate2(loc_id, H5_INDEX_NAME, H5_ITER_INC, NULL, obj_info_all, (void *)&info) < 0)
@@ -3467,17 +3446,16 @@ H5Gget_obj_info_full
 } /* end H5Gget_obj_info_full */
 
 int
-H5Gget_obj_info_max
-    (hid_t loc_id, char **objname, int *otype, int *ltype, H5O_token_t *obj_token, long maxnum)
+H5Gget_obj_info_max(hid_t loc_id, char **objname, int *otype, int *ltype, H5O_token_t *obj_token, long maxnum)
 {
     info_all_t info;
 
-    info.objname = objname;
-    info.otype = otype;
-    info.ltype = ltype;
-    info.idxnum = (unsigned long)maxnum;
+    info.objname   = objname;
+    info.otype     = otype;
+    info.ltype     = ltype;
+    info.idxnum    = (unsigned long)maxnum;
     info.obj_token = obj_token;
-    info.count = 0;
+    info.count     = 0;
 
     if (H5Lvisit2(loc_id, H5_INDEX_NAME, H5_ITER_NATIVE, obj_info_max, (void *)&info) < 0)
         return -1;
@@ -3486,20 +3464,19 @@ H5Gget_obj_info_max
 } /* end H5Gget_obj_info_max */
 
 herr_t
-obj_info_all
-    (hid_t loc_id, const char *name, const H5L_info2_t *info, void *op_data)
+obj_info_all(hid_t loc_id, const char *name, const H5L_info2_t *info, void *op_data)
 {
-    info_all_t  *datainfo = (info_all_t *)op_data;
-    H5O_info2_t  object_info;
-    htri_t       object_exists;
-    size_t       str_len;
+    info_all_t *datainfo = (info_all_t *)op_data;
+    H5O_info2_t object_info;
+    htri_t      object_exists;
+    size_t      str_len;
 
-    datainfo->otype[datainfo->count] = -1;
-    datainfo->ltype[datainfo->count] = -1;
+    datainfo->otype[datainfo->count]     = -1;
+    datainfo->ltype[datainfo->count]     = -1;
     datainfo->obj_token[datainfo->count] = H5O_TOKEN_UNDEF;
 
     str_len = HDstrlen(name);
-    if (NULL == (datainfo->objname[datainfo->count] = (char *) HDmalloc(str_len + 1)))
+    if (NULL == (datainfo->objname[datainfo->count] = (char *)HDmalloc(str_len + 1)))
         goto done;
 
     HDstrncpy(datainfo->objname[datainfo->count], name, str_len);
@@ -3514,7 +3491,7 @@ obj_info_all
 
         datainfo->otype[datainfo->count] = object_info.type;
         datainfo->ltype[datainfo->count] = info->type;
-        datainfo->fno[datainfo->count] = object_info.fileno;
+        datainfo->fno[datainfo->count]   = object_info.fileno;
 
         HDmemcpy(&datainfo->obj_token[datainfo->count], &object_info.token, sizeof(object_info.token));
     }
@@ -3526,21 +3503,20 @@ done:
 } /* end obj_info_all */
 
 herr_t
-obj_info_max
-    (hid_t loc_id, const char *name, const H5L_info2_t *info, void *op_data)
+obj_info_max(hid_t loc_id, const char *name, const H5L_info2_t *info, void *op_data)
 {
-    info_all_t  *datainfo = (info_all_t *)op_data;
-    H5O_info2_t  object_info;
-    size_t       str_len;
+    info_all_t *datainfo = (info_all_t *)op_data;
+    H5O_info2_t object_info;
+    size_t      str_len;
 
-    datainfo->otype[datainfo->count] = -1;
-    datainfo->ltype[datainfo->count] = -1;
-    datainfo->objname[datainfo->count] = NULL;
+    datainfo->otype[datainfo->count]     = -1;
+    datainfo->ltype[datainfo->count]     = -1;
+    datainfo->objname[datainfo->count]   = NULL;
     datainfo->obj_token[datainfo->count] = H5O_TOKEN_UNDEF;
 
     /* This will be freed by h5str_array_free(oName, n) */
     str_len = HDstrlen(name);
-    if (NULL == (datainfo->objname[datainfo->count] = (char *) HDmalloc(str_len + 1)))
+    if (NULL == (datainfo->objname[datainfo->count] = (char *)HDmalloc(str_len + 1)))
         goto done;
 
     HDstrncpy(datainfo->objname[datainfo->count], name, str_len);
@@ -3569,17 +3545,17 @@ done:
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5export_1dataset
-    (JNIEnv *env, jclass clss, jstring file_export_name, jstring file_name, jstring object_path, jint binary_order)
+Java_hdf_hdf5lib_H5_H5export_1dataset(JNIEnv *env, jclass clss, jstring file_export_name, jstring file_name,
+                                      jstring object_path, jint binary_order)
 {
     const char *file_export = NULL;
     const char *object_name = NULL;
-    const char *fileName = NULL;
+    const char *fileName    = NULL;
     jboolean    isCopy;
-    herr_t      ret_val = FAIL;
-    hid_t       file_id = H5I_INVALID_HID;
+    herr_t      ret_val    = FAIL;
+    hid_t       file_id    = H5I_INVALID_HID;
     hid_t       dataset_id = H5I_INVALID_HID;
-    FILE       *stream = NULL;
+    FILE *      stream     = NULL;
 
     UNUSED(clss);
 
@@ -3602,7 +3578,8 @@ Java_hdf_hdf5lib_H5_H5export_1dataset
     if ((dataset_id = H5Dopen2(file_id, object_name, H5P_DEFAULT)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
-    PIN_JAVA_STRING(ENVONLY, file_export_name, file_export, NULL, "H5export_dataset: file_export name not pinned");
+    PIN_JAVA_STRING(ENVONLY, file_export_name, file_export, NULL,
+                    "H5export_dataset: file_export name not pinned");
 
     if (NULL == (stream = HDfopen(file_export, "w+")))
         H5_JNI_FATAL_ERROR(ENVONLY, "HDfopen failed");
diff --git a/java/src/jni/h5util.h b/java/src/jni/h5util.h
index 51b6594..7c5fb90 100644
--- a/java/src/jni/h5util.h
+++ b/java/src/jni/h5util.h
@@ -23,51 +23,51 @@
 #include "h5jni.h"
 
 #ifndef SUCCEED
-#define SUCCEED     0
+#define SUCCEED 0
 #endif
 
 #ifndef FAIL
-#define FAIL        (-1)
+#define FAIL (-1)
 #endif
 
 typedef struct h5str_t {
-    char    *s;
-    size_t   max;  /* the allocated size of the string */
+    char * s;
+    size_t max; /* the allocated size of the string */
 } h5str_t;
 
-extern void    h5str_new(h5str_t *str, size_t len);
-extern void    h5str_free(h5str_t *str);
-extern void    h5str_resize(h5str_t *str, size_t new_len);
-extern char*   h5str_append(h5str_t *str, const char* cstr);
-extern size_t  h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf, size_t out_buf_offset);
-extern void    h5str_sprint_reference(JNIEnv *env, h5str_t *out_str, hid_t container, void *ref_p);
-extern size_t  h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *in_buf, size_t in_buf_len, int expand_data);
-extern void    h5str_array_free(char **strs, size_t len);
-extern int     h5str_dump_simple_dset(JNIEnv *env, FILE *stream, hid_t dset, int binary_order);
-extern int     h5str_dump_region_blocks_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
-extern int     h5str_dump_region_points_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
-
-extern htri_t  H5Tdetect_variable_str(hid_t tid);
+extern void   h5str_new(h5str_t *str, size_t len);
+extern void   h5str_free(h5str_t *str);
+extern void   h5str_resize(h5str_t *str, size_t new_len);
+extern char * h5str_append(h5str_t *str, const char *cstr);
+extern size_t h5str_convert(JNIEnv *env, char **in_str, hid_t container, hid_t tid, void *out_buf,
+                            size_t out_buf_offset);
+extern void   h5str_sprint_reference(JNIEnv *env, h5str_t *out_str, hid_t container, void *ref_p);
+extern size_t h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *in_buf,
+                            size_t in_buf_len, int expand_data);
+extern void   h5str_array_free(char **strs, size_t len);
+extern int    h5str_dump_simple_dset(JNIEnv *env, FILE *stream, hid_t dset, int binary_order);
+extern int    h5str_dump_region_blocks_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
+extern int    h5str_dump_region_points_data(JNIEnv *env, h5str_t *str, hid_t region, hid_t region_obj);
+
+extern htri_t H5Tdetect_variable_str(hid_t tid);
 
 /*
  * Symbols used to format the output of h5str_sprintf and
  * to interpret the input to h5str_convert.
  */
 #define H5_COMPOUND_BEGIN_INDICATOR "{"
-#define H5_COMPOUND_END_INDICATOR "}"
-#define H5_ARRAY_BEGIN_INDICATOR "["
-#define H5_ARRAY_END_INDICATOR "]"
-#define H5_VLEN_BEGIN_INDICATOR "("
-#define H5_VLEN_END_INDICATOR ")"
+#define H5_COMPOUND_END_INDICATOR   "}"
+#define H5_ARRAY_BEGIN_INDICATOR    "["
+#define H5_ARRAY_END_INDICATOR      "]"
+#define H5_VLEN_BEGIN_INDICATOR     "("
+#define H5_VLEN_END_INDICATOR       ")"
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5AreadComplex
  * Signature: (JJ[Ljava/lang/String;)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5AreadComplex
-  (JNIEnv *, jclass, jlong, jlong, jobjectArray);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5AreadComplex(JNIEnv *, jclass, jlong, jlong, jobjectArray);
 
 /*
  * Copies the content of one dataset to another dataset
@@ -75,9 +75,7 @@ Java_hdf_hdf5lib_H5_H5AreadComplex
  * Method:    H5Acopy
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Acopy
-  (JNIEnv *, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Acopy(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Copies the content of one dataset to another dataset
@@ -85,35 +83,33 @@ Java_hdf_hdf5lib_H5_H5Acopy
  * Method:    H5Dcopy
  * Signature: (JJ)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Dcopy
-  (JNIEnv*, jclass, jlong, jlong);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Dcopy(JNIEnv *, jclass, jlong, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_obj_info_full
  * Signature: (JLjava/lang/String;[Ljava/lang/String;[I[I[J[JIII)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full
-  (JNIEnv*, jclass, jlong, jstring, jobjectArray, jintArray, jintArray, jlongArray, jobjectArray, jint, jint, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full(JNIEnv *, jclass, jlong, jstring,
+                                                                   jobjectArray, jintArray, jintArray,
+                                                                   jlongArray, jobjectArray, jint, jint,
+                                                                   jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Gget_obj_info_max
  * Signature: (J[Ljava/lang/String;[I[I[JJI)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max
-  (JNIEnv*, jclass, jlong, jobjectArray, jintArray, jintArray, jlongArray, jlong, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max(JNIEnv *, jclass, jlong, jobjectArray,
+                                                                  jintArray, jintArray, jlongArray, jlong,
+                                                                  jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5export_dataset
  * Signature: (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5export_1dataset
-  (JNIEnv*, jclass, jstring, jstring, jstring, jint);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5export_1dataset(JNIEnv *, jclass, jstring, jstring, jstring,
+                                                             jint);
 
-#endif  /* H5UTIL_H__ */
+#endif /* H5UTIL_H__ */
diff --git a/java/src/jni/h5vlImp.c b/java/src/jni/h5vlImp.c
index 1ead30b..1460e5d 100644
--- a/java/src/jni/h5vlImp.c
+++ b/java/src/jni/h5vlImp.c
@@ -33,18 +33,19 @@ extern "C" {
  * Signature: (Ljava/lang/String;J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1name
-  (JNIEnv *env, jclass clss, jobject connector_name, jlong vipl_id)
+Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1name(JNIEnv *env, jclass clss, jobject connector_name,
+                                                      jlong vipl_id)
 {
     const char *volName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
     if (NULL == connector_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5VLregister_connector_by_name: VOL connector name is NULL");
 
-    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL, "H5VLregister_connector_by_name: VOL connector name not pinned");
+    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL,
+                    "H5VLregister_connector_by_name: VOL connector name not pinned");
 
     if ((status = H5VLregister_connector_by_name(volName, (hid_t)vipl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -62,8 +63,8 @@ done:
  * Signature: (IJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1value
-  (JNIEnv *env, jclass clss, jint connector_value, jlong vipl_id)
+Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1value(JNIEnv *env, jclass clss, jint connector_value,
+                                                       jlong vipl_id)
 {
     hid_t status = H5I_INVALID_HID;
 
@@ -82,18 +83,18 @@ done:
  * Signature: (Ljava/lang/String;)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1name
-  (JNIEnv *env, jclass clss, jobject connector_name)
+Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1name(JNIEnv *env, jclass clss, jobject connector_name)
 {
     const char *volName = NULL;
-    htri_t      bval = JNI_FALSE;
+    htri_t      bval    = JNI_FALSE;
 
     UNUSED(clss);
 
     if (NULL == connector_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5VLis_connector_registered_by_name: VOL connector name is NULL");
 
-    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL, "H5VLis_connector_registered_by_name: VOL connector name not pinned");
+    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL,
+                    "H5VLis_connector_registered_by_name: VOL connector name not pinned");
 
     if ((bval = H5VLis_connector_registered_by_name(volName)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -113,8 +114,7 @@ done:
  * Signature: (I)Z
  */
 JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1value
-  (JNIEnv *env, jclass clss, jint connector_value)
+Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1value(JNIEnv *env, jclass clss, jint connector_value)
 {
     htri_t bval = JNI_FALSE;
 
@@ -138,8 +138,7 @@ done:
  * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id
-  (JNIEnv *env, jclass clss, jlong obj_id)
+Java_hdf_hdf5lib_H5_H5VLget_1connector_1id(JNIEnv *env, jclass clss, jlong obj_id)
 {
     hid_t status = H5I_INVALID_HID;
 
@@ -158,18 +157,18 @@ done:
  * Signature: (Ljava/lang/String;)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1name
-  (JNIEnv *env, jclass clss, jobject connector_name)
+Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1name(JNIEnv *env, jclass clss, jobject connector_name)
 {
     const char *volName = NULL;
-    hid_t       status = H5I_INVALID_HID;
+    hid_t       status  = H5I_INVALID_HID;
 
     UNUSED(clss);
 
     if (NULL == connector_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5VLget_connector_id_by_name: VOL connector name is NULL");
 
-    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL, "H5VLget_connector_id_by_name: VOL connector name not pinned");
+    PIN_JAVA_STRING(ENVONLY, connector_name, volName, NULL,
+                    "H5VLget_connector_id_by_name: VOL connector name not pinned");
 
     if ((status = H5VLget_connector_id_by_name(volName)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -187,8 +186,7 @@ done:
  * Signature: (I)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1value
-  (JNIEnv *env, jclass clss, jint connector_value)
+Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1value(JNIEnv *env, jclass clss, jint connector_value)
 {
     hid_t status = H5I_INVALID_HID;
 
@@ -211,12 +209,11 @@ done:
  */
 
 JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1name
-  (JNIEnv *env, jclass clss, jlong object_id)
+Java_hdf_hdf5lib_H5_H5VLget_1connector_1name(JNIEnv *env, jclass clss, jlong object_id)
 {
-    ssize_t  buf_size, status;
-    char    *volName = NULL;
-    jstring  str = NULL;
+    ssize_t buf_size, status;
+    char *  volName = NULL;
+    jstring str     = NULL;
 
     UNUSED(clss);
 
@@ -225,8 +222,9 @@ Java_hdf_hdf5lib_H5_H5VLget_1connector_1name
         H5_LIBRARY_ERROR(ENVONLY);
 
     if (buf_size > 0) {
-        if (NULL == (volName = (char *) HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
-            H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5VLget_connector_name: failed to allocated VOL connector name buffer");
+        if (NULL == (volName = (char *)HDmalloc(sizeof(char) * (size_t)buf_size + 1)))
+            H5_OUT_OF_MEMORY_ERROR(ENVONLY,
+                                   "H5VLget_connector_name: failed to allocated VOL connector name buffer");
 
         if ((status = H5VLget_connector_name((hid_t)object_id, volName, (size_t)buf_size + 1)) < 0)
             H5_LIBRARY_ERROR(ENVONLY);
@@ -249,8 +247,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5VLclose
-  (JNIEnv *env, jclass clss, jlong connector_id)
+Java_hdf_hdf5lib_H5_H5VLclose(JNIEnv *env, jclass clss, jlong connector_id)
 {
     herr_t retValue = FAIL;
 
@@ -269,8 +266,7 @@ done:
  * Signature: (J)V
  */
 JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5VLunregister_1connector
-    (JNIEnv *env, jclass clss, jlong connector_id)
+Java_hdf_hdf5lib_H5_H5VLunregister_1connector(JNIEnv *env, jclass clss, jlong connector_id)
 {
     herr_t retValue = FAIL;
 
@@ -283,7 +279,6 @@ done:
     return;
 } /* end Java_hdf_hdf5lib_H5_H5VLunregister_1connector */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5vlImp.h b/java/src/jni/h5vlImp.h
index a58abef..4fbf577 100644
--- a/java/src/jni/h5vlImp.h
+++ b/java/src/jni/h5vlImp.h
@@ -25,63 +25,52 @@ extern "C" {
  * Method:    H5VLregister_connector_by_name
  * Signature: (Ljava/lang/String;J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1name
-  (JNIEnv *, jclass, jobject, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1name(JNIEnv *, jclass, jobject,
+                                                                              jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLregister_connector_by_value
  * Signature: (IJ)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1value
-  (JNIEnv *, jclass, jint, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5VLregister_1connector_1by_1value(JNIEnv *, jclass, jint, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLis_connector_registered_by_name
  * Signature: (Ljava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1name
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1name(JNIEnv *, jclass,
+                                                                                       jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLis_connector_registered_by_value
  * Signature: (I)Z
  */
-JNIEXPORT jboolean JNICALL
-Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1value
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5VLis_1connector_1registered_1by_1value(JNIEnv *, jclass,
+                                                                                        jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLget_connector_id
  * Signature: (J)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1id(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLget_connector_id_by_name
  * Signature: (Ljava/lang/String;)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1name
-  (JNIEnv *, jclass, jobject);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1name(JNIEnv *, jclass, jobject);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLget_connector_id_by_value
  * Signature: (I)J
  */
-JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1value
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1value(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
@@ -89,27 +78,21 @@ Java_hdf_hdf5lib_H5_H5VLget_1connector_1id_1by_1value
  * Signature: (J)Ljava/lang/String;
  */
 
-JNIEXPORT jobject JNICALL
-Java_hdf_hdf5lib_H5_H5VLget_1connector_1name
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT jobject JNICALL Java_hdf_hdf5lib_H5_H5VLget_1connector_1name(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLclose
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5VLclose
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5VLclose(JNIEnv *, jclass, jlong);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5VLunregister_connector
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL
-Java_hdf_hdf5lib_H5_H5VLunregister_1connector
-  (JNIEnv *, jclass, jlong);
+JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5VLunregister_1connector(JNIEnv *, jclass, jlong);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/h5zImp.c b/java/src/jni/h5zImp.c
index a1c8517..5d9f442 100644
--- a/java/src/jni/h5zImp.c
+++ b/java/src/jni/h5zImp.c
@@ -33,8 +33,7 @@ extern "C" {
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zunregister
-    (JNIEnv *env, jclass clss, jint filter)
+Java_hdf_hdf5lib_H5_H5Zunregister(JNIEnv *env, jclass clss, jint filter)
 {
     herr_t retVal = FAIL;
 
@@ -53,8 +52,7 @@ done:
  * Signature: (I)I
  */
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zfilter_1avail
-    (JNIEnv *env, jclass clss, jint filter)
+Java_hdf_hdf5lib_H5_H5Zfilter_1avail(JNIEnv *env, jclass clss, jint filter)
 {
     herr_t retVal = FAIL;
 
@@ -74,21 +72,19 @@ done:
  */
 
 JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zget_1filter_1info
-    (JNIEnv *env, jclass clss, jint filter)
+Java_hdf_hdf5lib_H5_H5Zget_1filter_1info(JNIEnv *env, jclass clss, jint filter)
 {
     unsigned int flags = 0;
 
     UNUSED(clss);
 
-    if (H5Zget_filter_info((H5Z_filter_t) filter, (unsigned *) &flags) < 0)
+    if (H5Zget_filter_info((H5Z_filter_t)filter, (unsigned *)&flags) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
     return (jint)flags;
 } /* end Java_hdf_hdf5lib_H5_H5Zget_1filter_1info */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/h5zImp.h b/java/src/jni/h5zImp.h
index bffe9d8..58b088b 100644
--- a/java/src/jni/h5zImp.h
+++ b/java/src/jni/h5zImp.h
@@ -26,18 +26,14 @@ extern "C" {
  * Method:    H5Zunregister
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zunregister
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Zunregister(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
  * Method:    H5Zfilter_avail
  * Signature: (I)I
  */
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zfilter_1avail
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Zfilter_1avail(JNIEnv *, jclass, jint);
 
 /*
  * Class:     hdf_hdf5lib_H5
@@ -45,9 +41,7 @@ Java_hdf_hdf5lib_H5_H5Zfilter_1avail
  * Signature: (I)I
  */
 
-JNIEXPORT jint JNICALL
-Java_hdf_hdf5lib_H5_H5Zget_1filter_1info
-  (JNIEnv *, jclass, jint);
+JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Zget_1filter_1info(JNIEnv *, jclass, jint);
 
 #ifdef __cplusplus
 } /* end extern "C" */
diff --git a/java/src/jni/nativeData.c b/java/src/jni/nativeData.c
index 3c3d3d5..d2f00ec 100644
--- a/java/src/jni/nativeData.c
+++ b/java/src/jni/nativeData.c
@@ -44,21 +44,20 @@ extern "C" {
 #include "h5jni.h"
 #include "nativeData.h"
 
-
 /* returns int [] */
 JNIEXPORT jintArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B
-    (JNIEnv *env, jclass clss, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B(JNIEnv *env, jclass clss,
+                                              jbyteArray bdata) /* IN: array of bytes */
 {
-    jintArray  rarray = NULL;
-    jboolean   bb;
-    jbyte     *barr = NULL;
-    jint      *iarray = NULL;
-    jint      *iap = NULL;
-    char      *bp = NULL;
-    int        blen;
-    int        ii;
-    int        len;
+    jintArray rarray = NULL;
+    jboolean  bb;
+    jbyte *   barr   = NULL;
+    jint *    iarray = NULL;
+    jint *    iap    = NULL;
+    char *    bp     = NULL;
+    int       blen;
+    int       ii;
+    int       len;
 
     UNUSED(clss);
 
@@ -79,7 +78,7 @@ Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B
 
     PIN_INT_ARRAY(ENVONLY, rarray, iarray, &bb, "byteToInt: int array not pinned");
 
-    bp = (char *)barr;
+    bp  = (char *)barr;
     iap = iarray;
     for (ii = 0; ii < len; ii++) {
         *iap = *(jint *)bp;
@@ -98,18 +97,18 @@ done:
 
 /* returns float [] */
 JNIEXPORT jfloatArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B
-    (JNIEnv *env, jclass clss, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B(JNIEnv *env, jclass clss,
+                                                jbyteArray bdata) /* IN: array of bytes */
 {
-    jfloatArray  rarray = NULL;
-    jboolean     bb;
-    jfloat      *farray = NULL;
-    jfloat      *iap = NULL;
-    jbyte       *barr = NULL;
-    char        *bp = NULL;
-    int          blen;
-    int          ii;
-    int          len;
+    jfloatArray rarray = NULL;
+    jboolean    bb;
+    jfloat *    farray = NULL;
+    jfloat *    iap    = NULL;
+    jbyte *     barr   = NULL;
+    char *      bp     = NULL;
+    int         blen;
+    int         ii;
+    int         len;
 
     UNUSED(clss);
 
@@ -130,7 +129,7 @@ Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B
 
     PIN_FLOAT_ARRAY(ENVONLY, rarray, farray, &bb, "byteToFloat: float array not pinned");
 
-    bp = (char *)barr;
+    bp  = (char *)barr;
     iap = farray;
     for (ii = 0; ii < len; ii++) {
         *iap = *(jfloat *)bp;
@@ -149,18 +148,18 @@ done:
 
 /* returns short [] */
 JNIEXPORT jshortArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B
-    (JNIEnv *env, jclass clss, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B(JNIEnv *env, jclass clss,
+                                                jbyteArray bdata) /* IN: array of bytes */
 {
-    jshortArray  rarray = NULL;
-    jboolean     bb;
-    jshort      *sarray = NULL;
-    jshort      *iap = NULL;
-    jbyte       *barr = NULL;
-    char        *bp = NULL;
-    int          blen;
-    int          ii;
-    int          len;
+    jshortArray rarray = NULL;
+    jboolean    bb;
+    jshort *    sarray = NULL;
+    jshort *    iap    = NULL;
+    jbyte *     barr   = NULL;
+    char *      bp     = NULL;
+    int         blen;
+    int         ii;
+    int         len;
 
     UNUSED(clss);
 
@@ -181,7 +180,7 @@ Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B
 
     PIN_SHORT_ARRAY(ENVONLY, rarray, sarray, &bb, "byteToShort: short array not pinned");
 
-    bp = (char *)barr;
+    bp  = (char *)barr;
     iap = sarray;
     for (ii = 0; ii < len; ii++) {
         *iap = *(jshort *)bp;
@@ -200,18 +199,18 @@ done:
 
 /* returns long [] */
 JNIEXPORT jlongArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B
-    (JNIEnv *env, jclass clss, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B(JNIEnv *env, jclass clss,
+                                               jbyteArray bdata) /* IN: array of bytes */
 {
-    jlongArray  rarray = NULL;
-    jboolean    bb;
-    jlong      *larray = NULL;
-    jlong      *iap = NULL;
-    jbyte      *barr = NULL;
-    char       *bp = NULL;
-    int         blen;
-    int         ii;
-    int         len;
+    jlongArray rarray = NULL;
+    jboolean   bb;
+    jlong *    larray = NULL;
+    jlong *    iap    = NULL;
+    jbyte *    barr   = NULL;
+    char *     bp     = NULL;
+    int        blen;
+    int        ii;
+    int        len;
 
     UNUSED(clss);
 
@@ -232,7 +231,7 @@ Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B
 
     PIN_LONG_ARRAY(ENVONLY, rarray, larray, &bb, "byteToLong: long array not pinned");
 
-    bp = (char *)barr;
+    bp  = (char *)barr;
     iap = larray;
     for (ii = 0; ii < len; ii++) {
         *iap = *(jlong *)bp;
@@ -251,18 +250,18 @@ done:
 
 /* returns double [] */
 JNIEXPORT jdoubleArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B
-    (JNIEnv *env, jclass clss, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B(JNIEnv *env, jclass clss,
+                                                 jbyteArray bdata) /* IN: array of bytes */
 {
-    jdoubleArray  rarray = NULL;
-    jboolean      bb;
-    jdouble      *darray = NULL;
-    jdouble      *iap = NULL;
-    jbyte        *barr = NULL;
-    char         *bp = NULL;
-    int           blen;
-    int           ii;
-    int           len;
+    jdoubleArray rarray = NULL;
+    jboolean     bb;
+    jdouble *    darray = NULL;
+    jdouble *    iap    = NULL;
+    jbyte *      barr   = NULL;
+    char *       bp     = NULL;
+    int          blen;
+    int          ii;
+    int          len;
 
     UNUSED(clss);
 
@@ -283,7 +282,7 @@ Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B
 
     PIN_DOUBLE_ARRAY(ENVONLY, rarray, darray, &bb, "byteToDouble: double array not pinned");
 
-    bp = (char *)barr;
+    bp  = (char *)barr;
     iap = darray;
     for (ii = 0; ii < len; ii++) {
         *iap = *(jdouble *)bp;
@@ -302,17 +301,17 @@ done:
 
 /* returns int [] */
 JNIEXPORT jintArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B
-    (JNIEnv *env, jclass clss, jint start, jint len, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B(JNIEnv *env, jclass clss, jint start, jint len,
+                                                jbyteArray bdata) /* IN: array of bytes */
 {
-    jintArray  rarray = NULL;
-    jboolean   bb;
-    jint      *iarray = NULL;
-    jint      *iap = NULL;
-    jbyte     *barr = NULL;
-    char      *bp = NULL;
-    int        blen;
-    int        ii;
+    jintArray rarray = NULL;
+    jboolean  bb;
+    jint *    iarray = NULL;
+    jint *    iap    = NULL;
+    jbyte *   barr   = NULL;
+    char *    bp     = NULL;
+    int       blen;
+    int       ii;
 
     UNUSED(clss);
 
@@ -354,17 +353,17 @@ done:
 
 /* returns short [] */
 JNIEXPORT jshortArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B
-    (JNIEnv *env, jclass clss, jint start, jint len, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B(JNIEnv *env, jclass clss, jint start, jint len,
+                                                  jbyteArray bdata) /* IN: array of bytes */
 {
-    jshortArray  rarray = NULL;
-    jboolean     bb;
-    jshort      *sarray = NULL;
-    jshort      *iap = NULL;
-    jbyte       *barr = NULL;
-    char        *bp = NULL;
-    int          blen;
-    int          ii;
+    jshortArray rarray = NULL;
+    jboolean    bb;
+    jshort *    sarray = NULL;
+    jshort *    iap    = NULL;
+    jbyte *     barr   = NULL;
+    char *      bp     = NULL;
+    int         blen;
+    int         ii;
 
     UNUSED(clss);
 
@@ -406,17 +405,17 @@ done:
 
 /* returns float [] */
 JNIEXPORT jfloatArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B
-    (JNIEnv *env, jclass clss, jint start, jint len, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B(JNIEnv *env, jclass clss, jint start, jint len,
+                                                  jbyteArray bdata) /* IN: array of bytes */
 {
-    jfloatArray  rarray = NULL;
-    jboolean     bb;
-    jfloat      *farray = NULL;
-    jfloat      *iap = NULL;
-    jbyte       *barr = NULL;
-    char        *bp = NULL;
-    int          blen;
-    int          ii;
+    jfloatArray rarray = NULL;
+    jboolean    bb;
+    jfloat *    farray = NULL;
+    jfloat *    iap    = NULL;
+    jbyte *     barr   = NULL;
+    char *      bp     = NULL;
+    int         blen;
+    int         ii;
 
     UNUSED(clss);
 
@@ -458,17 +457,17 @@ done:
 
 /* returns long [] */
 JNIEXPORT jlongArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B
-    (JNIEnv *env, jclass clss, jint start, jint len, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B(JNIEnv *env, jclass clss, jint start, jint len,
+                                                 jbyteArray bdata) /* IN: array of bytes */
 {
-    jlongArray  rarray = NULL;
-    jboolean    bb;
-    jlong      *larray = NULL;
-    jlong      *iap = NULL;
-    jbyte      *barr = NULL;
-    char       *bp = NULL;
-    int         blen;
-    int         ii;
+    jlongArray rarray = NULL;
+    jboolean   bb;
+    jlong *    larray = NULL;
+    jlong *    iap    = NULL;
+    jbyte *    barr   = NULL;
+    char *     bp     = NULL;
+    int        blen;
+    int        ii;
 
     UNUSED(clss);
 
@@ -510,17 +509,17 @@ done:
 
 /* returns double [] */
 JNIEXPORT jdoubleArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B
-    (JNIEnv *env, jclass clss, jint start, jint len, jbyteArray bdata)  /* IN: array of bytes */
+Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B(JNIEnv *env, jclass clss, jint start, jint len,
+                                                   jbyteArray bdata) /* IN: array of bytes */
 {
-    jdoubleArray  rarray = NULL;
-    jboolean      bb;
-    jdouble      *darray = NULL;
-    jdouble      *iap = NULL;
-    jbyte        *barr = NULL;
-    char         *bp = NULL;
-    int           blen;
-    int           ii;
+    jdoubleArray rarray = NULL;
+    jboolean     bb;
+    jdouble *    darray = NULL;
+    jdouble *    iap    = NULL;
+    jbyte *      barr   = NULL;
+    char *       bp     = NULL;
+    int          blen;
+    int          ii;
 
     UNUSED(clss);
 
@@ -562,21 +561,21 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I
-    (JNIEnv *env, jclass clss, jint start, jint len, jintArray idata)  /* IN: array of int */
+Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I(JNIEnv *env, jclass clss, jint start, jint len,
+                                                jintArray idata) /* IN: array of int */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    jint       *ip = NULL;
-    jint       *iarr = NULL;
-    int         ilen;
-    int         blen;
-    int         ii;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    jint *     ip     = NULL;
+    jint *     iarr   = NULL;
+    int        ilen;
+    int        blen;
+    int        ii;
+    int        ij;
     union things {
-        int ival;
+        int  ival;
         char bytes[4];
     } u;
 
@@ -607,11 +606,11 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I
     bap = barray;
     for (ii = 0; ii < len; ii++) {
         u.ival = *ip++;
-        for (ij = 0; (size_t) ij < sizeof(jint); ij++) {
+        for (ij = 0; (size_t)ij < sizeof(jint); ij++) {
             *bap = u.bytes[ij];
             bap++;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
 done:
     if (barray)
@@ -624,22 +623,22 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S
-    (JNIEnv *env, jclass clss, jint start, jint len, jshortArray sdata)  /* IN: array of short */
+Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S(JNIEnv *env, jclass clss, jint start, jint len,
+                                                  jshortArray sdata) /* IN: array of short */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jshort     *ip = NULL;
-    jshort     *sarr = NULL;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ilen;
-    int         blen;
-    int         ii;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jshort *   ip     = NULL;
+    jshort *   sarr   = NULL;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ilen;
+    int        blen;
+    int        ii;
+    int        ij;
     union things {
         short ival;
-        char bytes[4];
+        char  bytes[4];
     } u;
 
     UNUSED(clss);
@@ -669,11 +668,11 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S
     bap = barray;
     for (ii = 0; ii < len; ii++) {
         u.ival = *ip++;
-        for (ij = 0; (size_t) ij < sizeof(jshort); ij++) {
+        for (ij = 0; (size_t)ij < sizeof(jshort); ij++) {
             *bap = u.bytes[ij];
             bap++;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
 done:
     if (barray)
@@ -686,22 +685,22 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F
-    (JNIEnv *env, jclass clss, jint start, jint len, jfloatArray fdata)  /* IN: array of float */
+Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F(JNIEnv *env, jclass clss, jint start, jint len,
+                                                  jfloatArray fdata) /* IN: array of float */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jfloat     *ip = NULL;
-    jfloat     *farr = NULL;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ilen;
-    int         blen;
-    int         ii;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jfloat *   ip     = NULL;
+    jfloat *   farr   = NULL;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ilen;
+    int        blen;
+    int        ii;
+    int        ij;
     union things {
         float ival;
-        char bytes[4];
+        char  bytes[4];
     } u;
 
     UNUSED(clss);
@@ -731,11 +730,11 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F
     bap = barray;
     for (ii = 0; ii < len; ii++) {
         u.ival = *ip++;
-        for (ij = 0; (size_t) ij < sizeof(jfloat); ij++) {
+        for (ij = 0; (size_t)ij < sizeof(jfloat); ij++) {
             *bap = u.bytes[ij];
             bap++;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
 done:
     if (barray)
@@ -748,22 +747,22 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D
-    (JNIEnv *env, jclass clss, jint start, jint len, jdoubleArray ddata)  /* IN: array of double */
+Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D(JNIEnv *env, jclass clss, jint start, jint len,
+                                                   jdoubleArray ddata) /* IN: array of double */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jdouble    *ip = NULL;
-    jdouble    *darr = NULL;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ilen;
-    int         blen;
-    int         ii;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jdouble *  ip     = NULL;
+    jdouble *  darr   = NULL;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ilen;
+    int        blen;
+    int        ii;
+    int        ij;
     union things {
         double ival;
-        char bytes[8];
+        char   bytes[8];
     } u;
 
     UNUSED(clss);
@@ -793,11 +792,11 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D
     bap = barray;
     for (ii = 0; ii < len; ii++) {
         u.ival = *ip++;
-        for (ij = 0; (size_t) ij < sizeof(jdouble); ij++) {
+        for (ij = 0; (size_t)ij < sizeof(jdouble); ij++) {
             *bap = u.bytes[ij];
             bap++;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
 done:
     if (barray)
@@ -810,22 +809,22 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J
-    (JNIEnv *env, jclass clss, jint start, jint len, jlongArray ldata)  /* IN: array of long */
+Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J(JNIEnv *env, jclass clss, jint start, jint len,
+                                                 jlongArray ldata) /* IN: array of long */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jlong      *ip = NULL;
-    jlong      *larr = NULL;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ilen;
-    int         blen;
-    int         ii;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jlong *    ip     = NULL;
+    jlong *    larr   = NULL;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ilen;
+    int        blen;
+    int        ii;
+    int        ij;
     union things {
         jlong ival;
-        char bytes[8];
+        char  bytes[8];
     } u;
 
     UNUSED(clss);
@@ -855,11 +854,11 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J
     bap = barray;
     for (ii = 0; ii < len; ii++) {
         u.ival = *ip++;
-        for (ij = 0; (size_t) ij < sizeof(jlong); ij++) {
+        for (ij = 0; (size_t)ij < sizeof(jlong); ij++) {
             *bap = u.bytes[ij];
             bap++;
         } /* end for */
-    } /* end for */
+    }     /* end for */
 
 done:
     if (barray)
@@ -872,16 +871,15 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_intToByte__I
-    (JNIEnv *env, jclass clss, jint idata)  /* IN: int */
+Java_hdf_hdf5lib_HDFNativeData_intToByte__I(JNIEnv *env, jclass clss, jint idata) /* IN: int */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
-        int ival;
+        int  ival;
         char bytes[sizeof(int)];
     } u;
 
@@ -892,9 +890,9 @@ Java_hdf_hdf5lib_HDFNativeData_intToByte__I
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "intToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = idata;
-    for (ij = 0; (size_t) ij < sizeof(jint); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jint); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -908,17 +906,16 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_floatToByte__F
-    (JNIEnv *env, jclass clss, jfloat fdata)  /* IN: float */
+Java_hdf_hdf5lib_HDFNativeData_floatToByte__F(JNIEnv *env, jclass clss, jfloat fdata) /* IN: float */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
         float ival;
-        char bytes[sizeof(float)];
+        char  bytes[sizeof(float)];
     } u;
 
     UNUSED(clss);
@@ -928,9 +925,9 @@ Java_hdf_hdf5lib_HDFNativeData_floatToByte__F
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "floatToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = fdata;
-    for (ij = 0; (size_t) ij < sizeof(jfloat); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jfloat); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -944,17 +941,16 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_shortToByte__S
-    (JNIEnv *env, jclass clss, jshort sdata)  /* IN: short */
+Java_hdf_hdf5lib_HDFNativeData_shortToByte__S(JNIEnv *env, jclass clss, jshort sdata) /* IN: short */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
         short ival;
-        char bytes[sizeof(short)];
+        char  bytes[sizeof(short)];
     } u;
 
     UNUSED(clss);
@@ -964,9 +960,9 @@ Java_hdf_hdf5lib_HDFNativeData_shortToByte__S
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "shortToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = sdata;
-    for (ij = 0; (size_t) ij < sizeof(jshort); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jshort); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -980,17 +976,16 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D
-    (JNIEnv *env, jclass clss, jdouble ddata)  /* IN: double */
+Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D(JNIEnv *env, jclass clss, jdouble ddata) /* IN: double */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
         double ival;
-        char bytes[sizeof(double)];
+        char   bytes[sizeof(double)];
     } u;
 
     UNUSED(clss);
@@ -1000,9 +995,9 @@ Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "doubleToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = ddata;
-    for (ij = 0; (size_t) ij < sizeof(jdouble); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jdouble); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -1016,17 +1011,16 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_longToByte__J
-    (JNIEnv *env, jclass clss, jlong ldata)  /* IN: long */
+Java_hdf_hdf5lib_HDFNativeData_longToByte__J(JNIEnv *env, jclass clss, jlong ldata) /* IN: long */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
         jlong ival;
-        char bytes[sizeof(jlong)];
+        char  bytes[sizeof(jlong)];
     } u;
 
     UNUSED(clss);
@@ -1036,9 +1030,9 @@ Java_hdf_hdf5lib_HDFNativeData_longToByte__J
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "longToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = ldata;
-    for (ij = 0; (size_t) ij < sizeof(jlong); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jlong); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -1052,17 +1046,16 @@ done:
 
 /* returns byte [] */
 JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToByte__B
-    (JNIEnv *env, jclass clss, jbyte bdata)  /* IN: byte */
+Java_hdf_hdf5lib_HDFNativeData_byteToByte__B(JNIEnv *env, jclass clss, jbyte bdata) /* IN: byte */
 {
-    jbyteArray  rarray = NULL;
-    jboolean    bb;
-    jbyte      *barray = NULL;
-    jbyte      *bap = NULL;
-    int         ij;
+    jbyteArray rarray = NULL;
+    jboolean   bb;
+    jbyte *    barray = NULL;
+    jbyte *    bap    = NULL;
+    int        ij;
     union things {
         jbyte ival;
-        char bytes[sizeof(jbyte)];
+        char  bytes[sizeof(jbyte)];
     } u;
 
     UNUSED(clss);
@@ -1072,9 +1065,9 @@ Java_hdf_hdf5lib_HDFNativeData_byteToByte__B
 
     PIN_BYTE_ARRAY(ENVONLY, rarray, barray, &bb, "byteToByte: byte array not pinned");
 
-    bap = barray;
+    bap    = barray;
     u.ival = bdata;
-    for (ij = 0; (size_t) ij < sizeof(jbyte); ij++) {
+    for (ij = 0; (size_t)ij < sizeof(jbyte); ij++) {
         *bap = u.bytes[ij];
         bap++;
     } /* end for */
@@ -1086,7 +1079,6 @@ done:
     return rarray;
 } /* end Java_hdf_hdf5lib_HDFNativeData_byteToByte__B */
 
-
 #ifdef __cplusplus
 } /* end extern "C" */
 #endif /* __cplusplus */
diff --git a/java/src/jni/nativeData.h b/java/src/jni/nativeData.h
index e9e1a5d..012f73e 100644
--- a/java/src/jni/nativeData.h
+++ b/java/src/jni/nativeData.h
@@ -21,111 +21,78 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 /* returns int [] */
-JNIEXPORT jintArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B
-(JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jintArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToInt___3B(JNIEnv *, jclass, jbyteArray);
 
 /* returns float [] */
-JNIEXPORT jfloatArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B
-(JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jfloatArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToFloat___3B(JNIEnv *, jclass, jbyteArray);
 
 /* returns short [] */
-JNIEXPORT jshortArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B
-(JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jshortArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToShort___3B(JNIEnv *, jclass, jbyteArray);
 
 /* returns long [] */
-JNIEXPORT jlongArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B
-(JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jlongArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToLong___3B(JNIEnv *, jclass, jbyteArray);
 
 /* returns double [] */
-JNIEXPORT jdoubleArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B
-(JNIEnv *, jclass, jbyteArray);
+JNIEXPORT jdoubleArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToDouble___3B(JNIEnv *, jclass, jbyteArray);
 
 /* returns int [] */
-JNIEXPORT jintArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B
-(JNIEnv *, jclass, jint, jint, jbyteArray);
+JNIEXPORT jintArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToInt__II_3B(JNIEnv *, jclass, jint, jint,
+                                                                            jbyteArray);
 
 /* returns short [] */
-JNIEXPORT jshortArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B
-(JNIEnv *, jclass, jint, jint, jbyteArray);
+JNIEXPORT jshortArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToShort__II_3B(JNIEnv *, jclass, jint, jint,
+                                                                                jbyteArray);
 
 /* returns float [] */
-JNIEXPORT jfloatArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B
-(JNIEnv *, jclass, jint, jint, jbyteArray);
+JNIEXPORT jfloatArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToFloat__II_3B(JNIEnv *, jclass, jint, jint,
+                                                                                jbyteArray);
 
 /* returns long [] */
-JNIEXPORT jlongArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B
-(JNIEnv *, jclass, jint, jint, jbyteArray);
+JNIEXPORT jlongArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToLong__II_3B(JNIEnv *, jclass, jint, jint,
+                                                                              jbyteArray);
 
 /* returns double [] */
-JNIEXPORT jdoubleArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B
-(JNIEnv *, jclass, jint, jint, jbyteArray);
+JNIEXPORT jdoubleArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToDouble__II_3B(JNIEnv *, jclass, jint,
+                                                                                  jint, jbyteArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I
-(JNIEnv *, jclass, jint, jint, jintArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_intToByte__II_3I(JNIEnv *, jclass, jint, jint,
+                                                                             jintArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S
-(JNIEnv *, jclass, jint, jint, jshortArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_shortToByte__II_3S(JNIEnv *, jclass, jint, jint,
+                                                                               jshortArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F
-(JNIEnv *, jclass, jint, jint, jfloatArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_floatToByte__II_3F(JNIEnv *, jclass, jint, jint,
+                                                                               jfloatArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D
-(JNIEnv *, jclass, jint, jint, jdoubleArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_doubleToByte__II_3D(JNIEnv *, jclass, jint, jint,
+                                                                                jdoubleArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J
-(JNIEnv *, jclass, jint, jint, jlongArray);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_longToByte__II_3J(JNIEnv *, jclass, jint, jint,
+                                                                              jlongArray);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_intToByte__I
-(JNIEnv *, jclass, jint);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_intToByte__I(JNIEnv *, jclass, jint);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_floatToByte__F
-(JNIEnv *, jclass, jfloat);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_floatToByte__F(JNIEnv *, jclass, jfloat);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_shortToByte__S
-(JNIEnv *, jclass, jshort);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_shortToByte__S(JNIEnv *, jclass, jshort);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D
-(JNIEnv *env, jclass, jdouble);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_doubleToByte__D(JNIEnv *env, jclass, jdouble);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_longToByte__J
-(JNIEnv *, jclass, jlong);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_longToByte__J(JNIEnv *, jclass, jlong);
 
 /* returns byte [] */
-JNIEXPORT jbyteArray JNICALL
-Java_hdf_hdf5lib_HDFNativeData_byteToByte__B
-(JNIEnv *, jclass, jbyte);
+JNIEXPORT jbyteArray JNICALL Java_hdf_hdf5lib_HDFNativeData_byteToByte__B(JNIEnv *, jclass, jbyte);
 
 #ifdef __cplusplus
 } /* end extern "C" */