diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-03-16 17:45:59 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-03-16 17:45:59 (GMT) |
| commit | e06b457e88de84c22a0fe9bc712d20b5fbf537b2 (patch) | |
| tree | 92c3223b3374e497b90a14aa8c67c0ec806e585d /java/src/jni | |
| parent | 19e8a6e0079676ce1188134abc4ad9dc6c892c60 (diff) | |
| download | hdf5-e06b457e88de84c22a0fe9bc712d20b5fbf537b2.zip hdf5-e06b457e88de84c22a0fe9bc712d20b5fbf537b2.tar.gz hdf5-e06b457e88de84c22a0fe9bc712d20b5fbf537b2.tar.bz2 | |
[svn-r29452] Correct signature of H5Pexist to return boolean and fix test compare
Diffstat (limited to 'java/src/jni')
| -rw-r--r-- | java/src/jni/h5pImp.c | 14 | ||||
| -rw-r--r-- | java/src/jni/h5pImp.h | 4 |
2 files changed, 10 insertions, 8 deletions
diff --git a/java/src/jni/h5pImp.c b/java/src/jni/h5pImp.c index eb83bb0..8ecd81c 100644 --- a/java/src/jni/h5pImp.c +++ b/java/src/jni/h5pImp.c @@ -2162,24 +2162,26 @@ Java_hdf_hdf5lib_H5_H5Pset(JNIEnv *env, jclass clss, jlong plid, jstring name, j /* * Class: hdf_hdf5lib_H5 * Method: H5Pexist - * Signature: (JLjava/lang/String;)J + * Signature: (JLjava/lang/String;)Z */ -JNIEXPORT jlong JNICALL +JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pexist(JNIEnv *env, jclass clss, jlong plid, jstring name) { - hid_t retVal = -1; + htri_t bval = JNI_FALSE; const char *cstr; PIN_JAVA_STRING(name, cstr, -1); - retVal = H5Pexist((hid_t)plid, cstr); + bval = H5Pexist((hid_t)plid, cstr); UNPIN_JAVA_STRING(name, cstr); - if (retVal < 0) + if (bval > 0) + bval = JNI_TRUE; + else if (bval < 0) h5libraryError(env); - return (jlong)retVal; + return (jboolean)bval; } /* end Java_hdf_hdf5lib_H5_H5Pexist */ /* diff --git a/java/src/jni/h5pImp.h b/java/src/jni/h5pImp.h index 22c817e..a06a64f 100644 --- a/java/src/jni/h5pImp.h +++ b/java/src/jni/h5pImp.h @@ -579,9 +579,9 @@ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pset /* * Class: hdf_hdf5lib_H5 * Method: H5Pexist - * Signature: (JLjava/lang/String;)J + * Signature: (JLjava/lang/String;)Z */ -JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_H5_H5Pexist +JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Pexist (JNIEnv *, jclass, jlong, jstring); /* |