Merge pull request #1715 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '1ecce0e9bbc07cb3eb6f6bc1fca9d42c9e9c8176':
  Fix minor issues
  Update macro
  Java formatting of args

10 files changed, 83 insertions, 83 deletions

diff --git a/java/src/jni/h5Imp.c b/java/src/jni/h5Imp.c
index 99c91fd..f0dd691 100644
--- a/java/src/jni/h5Imp.c
+++ b/java/src/jni/h5Imp.c
@@ -127,7 +127,7 @@ done:
     if (libversionArray)
         UNPIN_INT_ARRAY(ENVONLY, libversion, libversionArray, (status < 0) ? JNI_ABORT : 0);
 
-	return (jint)status;
+    return (jint)status;
 } /* end Java_hdf_hdf5lib_H5_H5get_1libversion */
 
 /*
diff --git a/java/src/jni/h5dImp.c b/java/src/jni/h5dImp.c
index d46773a..5500847 100644
--- a/java/src/jni/h5dImp.c
+++ b/java/src/jni/h5dImp.c
@@ -1838,7 +1838,7 @@ Java_hdf_hdf5lib_H5_H5Dfill
 {
     jboolean  isCopy1;
     jboolean  isCopy2;
-    herr_t    status;
+    herr_t    status = FAIL;
     jbyte    *fillP = NULL;
     jbyte    *buffP = NULL;
 
diff --git a/java/src/jni/h5eImp.c b/java/src/jni/h5eImp.c
index 4ab00df..937323e 100644
--- a/java/src/jni/h5eImp.c
+++ b/java/src/jni/h5eImp.c
@@ -62,11 +62,11 @@ static herr_t H5E_walk_cb(int nindx, const H5E_error2_t *info, void *cb_data);
  */
 JNIEXPORT jboolean JNICALL
 Java_hdf_hdf5lib_H5_H5Eauto_1is_1v2
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
     unsigned int is_stack = 0;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eauto_is_v2: invalid stack ID");
@@ -85,14 +85,14 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eregister_1class
-    (JNIEnv *env, jclass cls, jstring cls_name, jstring lib_name, jstring version)
+    (JNIEnv *env, jclass clss, jstring cls_name, jstring lib_name, jstring version)
 {
     const char* the_cls_name = NULL;
     const char* the_lib_name = NULL;
     const char* the_version = NULL;
     hid_t       ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == cls_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Eregister_class: class name is NULL");
@@ -126,9 +126,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eunregister_1class
-    (JNIEnv *env, jclass cls, jlong cls_id)
+    (JNIEnv *env, jclass clss, jlong cls_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (cls_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eunregister_class: invalid error class ID");
@@ -147,9 +147,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclose_1msg
-    (JNIEnv *env, jclass cls, jlong err_id)
+    (JNIEnv *env, jclass clss, jlong err_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (err_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclose_msg: invalid error message ID");
@@ -168,13 +168,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Ecreate_1msg
-    (JNIEnv *env, jclass cls, jlong err_id, jint msg_type, jstring err_msg)
+    (JNIEnv *env, jclass clss, jlong err_id, jint msg_type, jstring err_msg)
 {
     H5E_type_t  error_msg_type = (H5E_type_t)msg_type;
     const char *the_err_msg = NULL;
     hid_t       ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (err_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Ecreate_msg: invalid error class ID");
@@ -200,11 +200,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Ecreate_1stack
-    (JNIEnv *env, jclass cls)
+    (JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Ecreate_stack()) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -220,11 +220,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1current_1stack
-    (JNIEnv *env, jclass cls)
+    (JNIEnv *env, jclass clss)
 {
     hid_t ret_val = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Eget_current_stack()) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -240,9 +240,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclose_1stack
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclose_stack: invalid error stack ID");
@@ -261,11 +261,11 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eprint2
-    (JNIEnv *env, jclass cls, jlong stk_id, jobject stream_obj)
+    (JNIEnv *env, jclass clss, jlong stk_id, jobject stream_obj)
 {
     herr_t ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eprint2: invalid error stack ID");
@@ -290,13 +290,13 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1class_1name
-    (JNIEnv *env, jclass cls, jlong cls_id)
+    (JNIEnv *env, jclass clss, jlong cls_id)
 {
     jstring  str = NULL;
     ssize_t  buf_size;
     char    *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (cls_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_class_name: invalid error class ID");
@@ -332,9 +332,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eset_1current_1stack
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eset_current_stack: invalid error stack ID");
@@ -353,9 +353,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Epop
-    (JNIEnv *env, jclass cls, jlong stk_id, jlong count)
+    (JNIEnv *env, jclass clss, jlong stk_id, jlong count)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Epop: invalid error stack ID");
@@ -374,7 +374,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Epush2
-    (JNIEnv *env, jclass cls, jlong stk_id, jstring filename, jstring funcname,
+    (JNIEnv *env, jclass clss, jlong stk_id, jstring filename, jstring funcname,
         jint linenumber, jlong class_id, jlong major_id, jlong minor_id, jstring err_desc)
 {
     const char *fName = NULL;
@@ -382,7 +382,7 @@ Java_hdf_hdf5lib_H5_H5Epush2
     const char *errMsg = NULL;
     herr_t      ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Epush2: invalid error stack ID");
@@ -423,9 +423,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Eclear2
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eclear2: invalid error stack ID");
@@ -444,7 +444,7 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1msg
-    (JNIEnv *env, jclass cls, jlong msg_id, jintArray error_msg_type_list)
+    (JNIEnv *env, jclass clss, jlong msg_id, jintArray error_msg_type_list)
 {
     H5E_type_t  error_msg_type;
     jstring     str = NULL;
@@ -452,7 +452,7 @@ Java_hdf_hdf5lib_H5_H5Eget_1msg
     jint       *theArray = NULL;
     char       *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (msg_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_msg: invalid error message ID");
@@ -496,11 +496,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Eget_1num
-    (JNIEnv *env, jclass cls, jlong stk_id)
+    (JNIEnv *env, jclass clss, jlong stk_id)
 {
     ssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (stk_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Eget_num: invalid error stack ID");
@@ -587,11 +587,11 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Ewalk2
-    (JNIEnv *env, jclass cls, jlong stk_id, jlong direction, jobject callback_op, jobject op_data)
+    (JNIEnv *env, jclass clss, jlong stk_id, jlong direction, jobject callback_op, jobject op_data)
 {
     cb_wrapper wrapper = { callback_op, op_data };
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     ENVPTR->GetJavaVM(ENVONLY, &jvm);
     CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 80567d9..4fd6807 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -118,13 +118,13 @@ done:
  */
 JNIEXPORT jstring JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1name
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     jstring  str = NULL;
     ssize_t  buf_size;
     char    *namePtr = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     /* Get the length of the name */
     if ((buf_size = H5Fget_name((hid_t)file_id, NULL, 0)) < 0)
@@ -378,11 +378,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1freespace
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     hssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Fget_freespace((hid_t)file_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -418,7 +418,7 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
-    (JNIEnv *env, jclass cls, jlong file_id, jint types, jlong maxObjs,
+    (JNIEnv *env, jclass clss, jlong file_id, jint types, jlong maxObjs,
           jlongArray obj_id_list)
 {
     jboolean  isCopy;
@@ -428,7 +428,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1obj_1ids
     jlong    *obj_id_listP = NULL;
     hid_t    *id_list = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == obj_id_list)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_obj_ids: obj_id_list is NULL");
@@ -466,11 +466,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1obj_1count
-    (JNIEnv *env, jclass cls, jlong file_id, jint types)
+    (JNIEnv *env, jclass clss, jlong file_id, jint types)
 {
     ssize_t ret_val = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((ret_val = H5Fget_obj_count((hid_t)file_id, (unsigned int)types)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -506,11 +506,11 @@ done:
  */
 JNIEXPORT jdouble JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1hit_1rate
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
     double rate = 0.0;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fget_mdc_hit_rate((hid_t)file_id, &rate) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -526,7 +526,7 @@ done:
  */
 JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
-    (JNIEnv *env, jclass cls, jlong file_id, jlongArray metadata_cache)
+    (JNIEnv *env, jclass clss, jlong file_id, jlongArray metadata_cache)
 {
     jboolean  isCopy;
     size_t    max_size = 0, min_clean_size = 0, cur_size = 0;
@@ -534,7 +534,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1size
     jsize     size = 0;
     int       cur_num_entries = -1;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == metadata_cache)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_mdc_size: metadata cache array is NULL");
@@ -612,9 +612,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Freset_1mdc_1hit_1rate_1stats
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Freset_mdc_hit_rate_stats((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -630,9 +630,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fclear_1elink_1file_1cache
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fclear_elink_file_cache((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -648,9 +648,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstart_1swmr_1write
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstart_swmr_write((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -666,9 +666,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstart_1mdc_1logging
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstart_mdc_logging((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -684,9 +684,9 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fstop_1mdc_1logging
-    (JNIEnv *env, jclass cls, jlong file_id)
+    (JNIEnv *env, jclass clss, jlong file_id)
 {
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Fstop_mdc_logging((hid_t)file_id) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -702,7 +702,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
-    (JNIEnv *env, jclass cls, jlong file_id, jbooleanArray mdc_logging_status)
+    (JNIEnv *env, jclass clss, jlong file_id, jbooleanArray mdc_logging_status)
 {
     jboolean  *mdc_logging_status_ptr = NULL;
     jboolean   isCopy;
@@ -710,7 +710,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status
     hbool_t    is_currently_logging;
     jsize      size;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == mdc_logging_status)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fget_mdc_logging_status: mdc_logging_status is NULL");
diff --git a/java/src/jni/h5gImp.c b/java/src/jni/h5gImp.c
index b579f31..79b1b65 100644
--- a/java/src/jni/h5gImp.c
+++ b/java/src/jni/h5gImp.c
@@ -148,11 +148,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5__1H5Gcreate_1anon
-    (JNIEnv *env, jclass cls, jlong loc_id, jlong gcpl_id, jlong gapl_id)
+    (JNIEnv *env, jclass clss, jlong loc_id, jlong gcpl_id, jlong gapl_id)
 {
     hid_t group_id = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((group_id = H5Gcreate_anon((hid_t)loc_id, (hid_t)gcpl_id, (hid_t)gapl_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -198,11 +198,11 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1create_1plist
-    (JNIEnv *env, jclass cls, jlong loc_id)
+    (JNIEnv *env, jclass clss, jlong loc_id)
 {
     hid_t plist_id = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((plist_id = H5Gget_create_plist((hid_t)loc_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -218,12 +218,12 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info
-    (JNIEnv *env, jclass cls, jlong loc_id)
+    (JNIEnv *env, jclass clss, jlong loc_id)
 {
     H5G_info_t group_info;
     jobject    obj = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (H5Gget_info((hid_t)loc_id, &group_info) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
@@ -242,14 +242,14 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1name
-    (JNIEnv *env, jclass cls, jlong loc_id, jstring name, jlong lapl_id)
+    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong lapl_id)
 {
     H5G_info_t  group_info;
     const char *grpName = NULL;
     jobject     obj = NULL;
     herr_t      ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Gget_info_by_name: group name is NULL");
@@ -278,7 +278,7 @@ done:
  */
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
-    (JNIEnv *env, jclass cls, jlong loc_id, jstring name, jint index_type,
+    (JNIEnv *env, jclass clss, jlong loc_id, jstring name, jint index_type,
           jint order, jlong n, jlong lapl_id)
 {
     H5_iter_order_t  corder = (H5_iter_order_t)order;
@@ -288,7 +288,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1info_1by_1idx
     jobject          obj = NULL;
     herr_t           ret_val = FAIL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Gget_info_by_idx: group name is NULL");
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index af6c8ba..7413023 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -628,7 +628,7 @@ H5L_iterate_cb
     jclass      cls;
     jvalue      args[5];
     void       *op_data = (void *)wrapper->op_data;
-    jint        status;
+    jint        status = -1;
 
     if (JVMPTR->AttachCurrentThread(JVMPAR, (void **)&cbenv, NULL) < 0) {
         CHECK_JNI_EXCEPTION(CBENVONLY, JNI_TRUE);
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c
index 83e2216..1a77fd3 100644
--- a/java/src/jni/h5rImp.c
+++ b/java/src/jni/h5rImp.c
@@ -211,7 +211,7 @@ Java_hdf_hdf5lib_H5_H5Rget_1obj_1type2
     jboolean  isCopy, isCopy2;
     jbyte    *refBuf = NULL;
     jint     *ref_objP = NULL;
-    jint      status;
+    jint      status = -1;
     int       retVal = -1;
 
     UNUSED(clss);
diff --git a/java/src/jni/h5sImp.c b/java/src/jni/h5sImp.c
index d8110a1..eedd42e 100644
--- a/java/src/jni/h5sImp.c
+++ b/java/src/jni/h5sImp.c
@@ -66,7 +66,7 @@ Java_hdf_hdf5lib_H5__1H5Screate_1simple
     hsize_t  *lp = NULL;
     jlong    *dimsP = NULL, *maxdimsP = NULL;
     jlong    *jlp = NULL;
-    jsize     drank, mrank;
+    jsize     drank = 0, mrank = 0;
     int       i;
     hid_t     retVal = H5I_INVALID_HID;
 
@@ -1129,14 +1129,14 @@ done:
  */
 JNIEXPORT jbyteArray JNICALL
 Java_hdf_hdf5lib_H5_H5Sencode
-    (JNIEnv *env, jclass cls, jlong obj_id)
+    (JNIEnv *env, jclass clss, jlong obj_id)
 {
     unsigned char *bufPtr = NULL;
     size_t         buf_size = 0;
     herr_t         status = FAIL;
     jbyteArray     returnedArray = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (obj_id < 0)
         H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Sencode: invalid object ID");
@@ -1173,13 +1173,13 @@ done:
  */
 JNIEXPORT jlong JNICALL
 Java_hdf_hdf5lib_H5_H5Sdecode
-    (JNIEnv *env, jclass cls, jbyteArray buf)
+    (JNIEnv *env, jclass clss, jbyteArray buf)
 {
     jboolean  isCopy;
     jbyte    *bufP = NULL;
     hid_t     sid = H5I_INVALID_HID;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == buf)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Sdecode: buffer is NULL");
@@ -1203,11 +1203,11 @@ done:
  */
 JNIEXPORT jboolean JNICALL
 Java_hdf_hdf5lib_H5_H5Sis_1regular_1hyperslab
-    (JNIEnv *env, jclass cls, jlong obj_id)
+    (JNIEnv *env, jclass clss, jlong obj_id)
 {
     htri_t bval = JNI_FALSE;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if ((bval = H5Sis_regular_hyperslab((hid_t)obj_id)) < 0)
         H5_LIBRARY_ERROR(ENVONLY);
diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c
index 313ca8b..460f12e 100644
--- a/java/src/jni/h5tImp.c
+++ b/java/src/jni/h5tImp.c
@@ -1620,7 +1620,7 @@ done:
 
 /*
  * Class:     hdf_hdf5lib_H5
- * Method:    H5Tarray_get_dims2
+ * Method:    H5Tget_array_dims2
  * Signature: (J[J)I
  */
 JNIEXPORT jint JNICALL
diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c
index 10ca3f2..af83caa 100644
--- a/java/src/jni/h5util.c
+++ b/java/src/jni/h5util.c
@@ -3453,7 +3453,7 @@ done:
  */
 JNIEXPORT void JNICALL
 Java_hdf_hdf5lib_H5_H5export_1dataset
-    (JNIEnv *env, jclass cls, jstring file_export_name, jstring file_name, jstring object_path, jint binary_order)
+    (JNIEnv *env, jclass clss, jstring file_export_name, jstring file_name, jstring object_path, jint binary_order)
 {
     const char *file_export = NULL;
     const char *object_name = NULL;
@@ -3462,9 +3462,9 @@ Java_hdf_hdf5lib_H5_H5export_1dataset
     herr_t      ret_val = FAIL;
     hid_t       file_id = H5I_INVALID_HID;
     hid_t       dataset_id = H5I_INVALID_HID;
-    FILE       *stream;
+    FILE       *stream = NULL;
 
-    UNUSED(cls);
+    UNUSED(clss);
 
     if (NULL == file_export_name)
         H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5export_dataset: file_export_name is NULL");