diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-09-14 20:44:24 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-14 20:44:24 (GMT) |
commit | 45178c87a3099a9fef8bae6f7249ca306cf89629 (patch) | |
tree | cb404581365434d641e4d6303921613ef3432bd0 /java/src/jni | |
parent | dcf3b54b6ef3ffe2093cfae81fe80cdb2bb53047 (diff) | |
download | hdf5-45178c87a3099a9fef8bae6f7249ca306cf89629.zip hdf5-45178c87a3099a9fef8bae6f7249ca306cf89629.tar.gz hdf5-45178c87a3099a9fef8bae6f7249ca306cf89629.tar.bz2 |
develop Merge doxygen from 1.12 branch (#2095)
Diffstat (limited to 'java/src/jni')
-rw-r--r-- | java/src/jni/exceptionImp.c | 12 | ||||
-rw-r--r-- | java/src/jni/exceptionImp.h | 2 | ||||
-rw-r--r-- | java/src/jni/h5Constants.c | 5 |
3 files changed, 12 insertions, 7 deletions
diff --git a/java/src/jni/exceptionImp.c b/java/src/jni/exceptionImp.c index 0f135cd..01b4ee2 100644 --- a/java/src/jni/exceptionImp.c +++ b/java/src/jni/exceptionImp.c @@ -153,7 +153,7 @@ Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss) * Method: printStackTrace0 * Signature: (Ljava/lang/Object;)V * - * Call the HDF-5 library to print the HDF-5 error stack to 'file_name'. + * Call the HDF5 library to print the HDF5 error stack to 'file_name'. */ JNIEXPORT void JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, jstring file_name) @@ -187,7 +187,7 @@ done: * Method: _getMajorErrorNumber * Signature: ()J * - * Extract the HDF-5 major error number from the HDF-5 error stack. + * Extract the HDF5 major error number from the HDF5 error stack. */ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber(JNIEnv *env, jobject obj) @@ -211,7 +211,7 @@ Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMajorErrorNumber(JNIEnv *e * Method: _getMinorErrorNumber * Signature: ()J * - * Extract the HDF-5 minor error number from the HDF-5 error stack. + * Extract the HDF5 minor error number from the HDF5 error stack. */ JNIEXPORT jlong JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException__1getMinorErrorNumber(JNIEnv *env, jobject obj) @@ -350,10 +350,10 @@ h5raiseException(JNIEnv *env, const char *message, const char *exception) } /* end h5raiseException() */ /* - * h5libraryError() determines the HDF-5 major error code + * h5libraryError() determines the HDF5 major error code * and creates and throws the appropriate sub-class of * HDF5LibraryException(). This routine should be called - * whenever a call to the HDF-5 library fails, i.e., when + * whenever a call to the HDF5 library fails, i.e., when * the return is -1. * * Note: This routine never returns from the 'throw', @@ -436,7 +436,7 @@ done: /* * defineHDF5LibraryException() returns the name of the sub-class - * which goes with an HDF-5 error code. + * which goes with an HDF5 error code. */ static const char * defineHDF5LibraryException(hid_t maj_num) diff --git a/java/src/jni/exceptionImp.h b/java/src/jni/exceptionImp.h index 38469df..c7375e7 100644 --- a/java/src/jni/exceptionImp.h +++ b/java/src/jni/exceptionImp.h @@ -41,7 +41,7 @@ JNIEXPORT void JNICALL Java_hdf_hdf5lib_H5_H5error_1on(JNIEnv *env, jclass clss) * Method: printStackTrace0 * Signature: (Ljava/lang/Object;)V * - * Call the HDF-5 library to print the HDF-5 error stack to 'file_name'. + * Call the HDF5 library to print the HDF5 error stack to 'file_name'. */ JNIEXPORT void JNICALL Java_hdf_hdf5lib_exceptions_HDF5LibraryException_printStackTrace0(JNIEnv *env, jobject obj, diff --git a/java/src/jni/h5Constants.c b/java/src/jni/h5Constants.c index bdffdbd..0eff43e 100644 --- a/java/src/jni/h5Constants.c +++ b/java/src/jni/h5Constants.c @@ -1210,6 +1210,11 @@ Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1FAIL(JNIEnv *env, jclass cls) { return H5ES_STATUS_FAIL; } +JNIEXPORT jlong JNICALL +Java_hdf_hdf5lib_HDF5Constants_H5ES_1STATUS_1CANCELED(JNIEnv *env, jclass cls) +{ + return H5ES_STATUS_CANCELED; +} /* Java does not have unsigned native types */ H5_GCC_CLANG_DIAG_OFF("sign-conversion") |