diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-04-24 21:44:35 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-04-24 21:44:35 (GMT) |
| commit | 9d84abe503267baaf3ddc675a4e3182d7f415be0 (patch) | |
| tree | c8c6ad68accf6a903f20098b15565311d4b919fb /java/src | |
| parent | 2deb953dbbde17712723529c4bca6a2bf3eedf6b (diff) | |
| parent | 0fb5ce7ad50664f800ffe7e107e0fb0f90f66e12 (diff) | |
| download | hdf5-9d84abe503267baaf3ddc675a4e3182d7f415be0.zip hdf5-9d84abe503267baaf3ddc675a4e3182d7f415be0.tar.gz hdf5-9d84abe503267baaf3ddc675a4e3182d7f415be0.tar.bz2 | |
Merge pull request #457 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '0fb5ce7ad50664f800ffe7e107e0fb0f90f66e12':
Correct name of native function
Fix javadoc
Fix typo
Signature change requires a ptr
Change H5PLsize() signature
Revert HDFFV-9655
Changed signature of H5PLgetsize
Revert HDFFV-9655 by disabling test and not using new function.
Fix path to actual executable location
Windows ahs one more directory level
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/hdf/hdf5lib/H5.java | 6 | ||||
| -rw-r--r-- | java/src/jni/h5plImp.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 23e2a34..5e13fdf 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -2895,7 +2895,8 @@ public class H5 implements java.io.Serializable { * @param file_id * IN: Identifier of the target file. * - * @param mdc_logging_status, the status + * @param mdc_logging_status + * the status * mdc_logging_status[0] = is_enabled, whether logging is enabled * mdc_logging_status[1] = is_currently_logging, whether events are currently being logged * @@ -5813,7 +5814,8 @@ public class H5 implements java.io.Serializable { * * @param fapl_id * IN: File access property list identifier - * @param mdc_log_options, the options + * @param mdc_log_options + * the options * mdc_logging_options[0] = is_enabled, whether logging is enabled * mdc_logging_options[1] = start_on_access, whether the logging begins as soon as the file is opened or created * diff --git a/java/src/jni/h5plImp.c b/java/src/jni/h5plImp.c index 09a1032..9b6100e 100644 --- a/java/src/jni/h5plImp.c +++ b/java/src/jni/h5plImp.c @@ -213,13 +213,11 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5PLsize (JNIEnv *env, jclass clss) { - int retVal = -1; - - retVal = H5PLsize(); - if (retVal < 0) + unsigned int listsize = 0; + if (H5PLsize(&listsize) < 0) { h5libraryError(env); - - return (jint)retVal; + } + return (jint)listsize; } /* end Java_hdf_hdf5lib_H5_H5PLsize */ #ifdef __cplusplus |