diff options
author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 18:37:18 (GMT) |
---|---|---|
committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 21:03:34 (GMT) |
commit | f3f67a5645d2bbc9631894e93c72809eda4897e0 (patch) | |
tree | fac37b3ef1fe43bef6748a478741c9e4a3b38303 /java/src/jni/h5fImp.c | |
parent | 3a25a655721f01ed5b6bb4682dd61d27f02b04cd (diff) | |
download | hdf5-f3f67a5645d2bbc9631894e93c72809eda4897e0.zip hdf5-f3f67a5645d2bbc9631894e93c72809eda4897e0.tar.gz hdf5-f3f67a5645d2bbc9631894e93c72809eda4897e0.tar.bz2 |
Fix various Java issues when deprecated symbols are disabled
Diffstat (limited to 'java/src/jni/h5fImp.c')
-rw-r--r-- | java/src/jni/h5fImp.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c index 4fd6807..2eb3ad5 100644 --- a/java/src/jni/h5fImp.c +++ b/java/src/jni/h5fImp.c @@ -156,15 +156,17 @@ JNIEXPORT jboolean JNICALL Java_hdf_hdf5lib_H5_H5Fis_1hdf5 (JNIEnv *env, jclass clss, jstring name) { +#ifndef H5_NO_DEPRECATED_SYMBOLS const char *fileName = NULL; +#endif htri_t bval = JNI_FALSE; UNUSED(clss); #ifdef H5_NO_DEPRECATED_SYMBOLS + UNUSED(name); H5_UNIMPLEMENTED(ENVONLY, "H5Fis_hdf5: not implemented"); -#endif - +#else if (NULL == name) H5_NULL_ARGUMENT_ERROR(ENVONLY, "H5Fis_hdf5: file name is NULL"); @@ -174,10 +176,13 @@ Java_hdf_hdf5lib_H5_H5Fis_1hdf5 H5_LIBRARY_ERROR(ENVONLY); bval = (bval > 0) ? JNI_TRUE : JNI_FALSE; +#endif done: +#ifndef H5_NO_DEPRECATED_SYMBOLS if (fileName) UNPIN_JAVA_STRING(ENVONLY, name, fileName); +#endif return (jboolean)bval; } /* end Java_hdf_hdf5lib_H5_H5Fis_1hdf5 */ |