Clang-format of source files

1 files changed, 299 insertions, 295 deletions

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: