diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 18:37:18 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2019-10-10 18:37:18 (GMT) |
| commit | 93f509a2f2d5143450a0e6753325557b2bb8b707 (patch) | |
| tree | 3f6553e73ef0dba911ed567a15cb10008a06b74a /java/src/jni/h5fImp.c | |
| parent | 35062073449be67956c3df0a4c6f56cad05e63bf (diff) | |
| download | hdf5-93f509a2f2d5143450a0e6753325557b2bb8b707.zip hdf5-93f509a2f2d5143450a0e6753325557b2bb8b707.tar.gz hdf5-93f509a2f2d5143450a0e6753325557b2bb8b707.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 */ |