Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 237 insertions, 258 deletions

diff --git a/java/src/jni/h5pDCPLImp.c b/java/src/jni/h5pDCPLImp.c
index 7559c3b..760a5a8 100644
--- a/java/src/jni/h5pDCPLImp.c
+++ b/java/src/jni/h5pDCPLImp.c
@@ -1,12 +1,11 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -37,8 +36,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 +55,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 +74,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,14 +98,14 @@ 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))))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pset_chunk: memory allocation failed");
+    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;
     for (i = 0; i < rank; i++) {
@@ -136,15 +132,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,8 +155,8 @@ 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))))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_chunk: memory allocation failed");
+    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)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -184,8 +179,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 +198,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 +217,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 +239,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 +262,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 +281,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 +314,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 +344,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 +376,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 +395,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 +427,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 +446,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 +460,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 +478,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 +513,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 +534,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 +553,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 +576,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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_filter: memory allocation failed");
+    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 +601,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, filter))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_JNI_FATAL_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);
@@ -632,7 +614,7 @@ done:
     if (cd_nelmtsArray)
         UNPIN_LONG_ARRAY(ENVONLY, cd_nelmts, cd_nelmtsArray, (status < 0) ? JNI_ABORT : 0);
     if (flagsArray)
-        UNPIN_INT_ARRAY(ENVONLY, flags, flagsArray, (status < 0) ? JNI_ABORT : 0)
+        UNPIN_INT_ARRAY(ENVONLY, flags, flagsArray, (status < 0) ? JNI_ABORT : 0);
     if (filter)
         HDfree(filter);
 
@@ -645,19 +627,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 +651,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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_filter2: memory allocation failed");
+    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 +682,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 +697,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter2
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, filter))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_JNI_FATAL_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 +725,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 +754,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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_filter_by_id: memory allocation failed");
+    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 +771,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 +785,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, aName))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_JNI_FATAL_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 +811,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 +842,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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_filter_by_id2: memory allocation failed");
+    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 +869,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1filter_1by_1id2
 
     if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, aName))) {
         CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-        H5_JNI_FATAL_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 +897,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 +912,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 +928,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 +947,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 +966,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 +985,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 +1010,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 +1029,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 +1049,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 +1078,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 +1103,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)))
-            H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_external: memory allocation failed");
+        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 +1122,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1external
 
         if (NULL == (str = ENVPTR->NewStringUTF(ENVONLY, file))) {
             CHECK_JNI_EXCEPTION(ENVONLY, JNI_TRUE);
-            H5_JNI_FATAL_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 +1145,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 +1164,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 +1197,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 +1216,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 index)
+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)index, 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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_virtual_dsetname: memory allocation failed");
+    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)index, 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_JNI_FATAL_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 +1255,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 index)
+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)index, 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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_virtual_filename: memory allocation failed");
+    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)index, 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_JNI_FATAL_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 +1294,13 @@ done:
  * Signature: (JJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1srcspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+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)index)) < 0)
+    if ((space_id = H5Pget_virtual_srcspace((hid_t)dcpl_id, (size_t)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1332,14 +1313,13 @@ done:
  * Signature: (JJ)J
  */
 JNIEXPORT jlong JNICALL
-Java_hdf_hdf5lib_H5_H5Pget_1virtual_1vspace
-    (JNIEnv *env, jclass clss, jlong dcpl_id, jlong index)
+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)index)) < 0)
+    if ((space_id = H5Pget_virtual_vspace((hid_t)dcpl_id, (size_t)idx)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
 
 done:
@@ -1352,11 +1332,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 +1358,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)))
-        H5_JNI_FATAL_ERROR(ENVONLY, "H5Pget_virtual_prefix: memory allocation failed");
+    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_JNI_FATAL_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: