diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-06-05 20:06:53 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-06-05 20:06:53 (GMT) |
commit | d3a6a9ed8fdd47d85c52ed29ae8aa70230f24beb (patch) | |
tree | 5d023c2be7f3d3d4a2f358e6c5a1c580de6efc69 /java/src/jni/h5sImp.c | |
parent | b31a53bfcbea9a0cb157fa0390f3e197d1420493 (diff) | |
parent | 1ecce0e9bbc07cb3eb6f6bc1fca9d42c9e9c8176 (diff) | |
download | hdf5-d3a6a9ed8fdd47d85c52ed29ae8aa70230f24beb.zip hdf5-d3a6a9ed8fdd47d85c52ed29ae8aa70230f24beb.tar.gz hdf5-d3a6a9ed8fdd47d85c52ed29ae8aa70230f24beb.tar.bz2 |
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
Diffstat (limited to 'java/src/jni/h5sImp.c')
-rw-r--r-- | java/src/jni/h5sImp.c | 14 |
1 files changed, 7 insertions, 7 deletions
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); |