diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-21 13:49:22 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-21 13:49:22 (GMT) |
| commit | f679b7495d68244b4eaa92fe7f16d058caeeb2ab (patch) | |
| tree | 30d3ba6c37883b57a13bda88214d66cbc75abb69 /java | |
| parent | 9016f66248aa2e857a6fcb5926d1af7bbf2cbdc4 (diff) | |
| parent | 576e713924b1802a64ae2f6655d2389d70fadfd1 (diff) | |
| download | hdf5-f679b7495d68244b4eaa92fe7f16d058caeeb2ab.zip hdf5-f679b7495d68244b4eaa92fe7f16d058caeeb2ab.tar.gz hdf5-f679b7495d68244b4eaa92fe7f16d058caeeb2ab.tar.bz2 | |
Merge pull request #2173 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '576e713924b1802a64ae2f6655d2389d70fadfd1':
Add new h5diff files
Fix compile statement order
HDFFV-10976,-10980 Init obj_type before calling H5Rget_obj_type3
Add unknown define for h5dump ref objects
Standalone doesn't use h5test implementation.
HDFFV-10980 - h5diff uses new ref APIs
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/jni/h5rImp.c | 2 | ||||
| -rw-r--r-- | java/src/jni/h5util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/java/src/jni/h5rImp.c b/java/src/jni/h5rImp.c index 4ad5d5f..21ee658 100644 --- a/java/src/jni/h5rImp.c +++ b/java/src/jni/h5rImp.c @@ -452,7 +452,7 @@ JNIEXPORT jint JNICALL Java_hdf_hdf5lib_H5_H5Rget_1obj_1type3 (JNIEnv *env, jclass clss, jbyteArray ref, jlong rapl_id) { - H5O_type_t object_info; + H5O_type_t object_info = -1; jboolean isCopy; jbyte *refBuf = NULL; int retVal = -1; diff --git a/java/src/jni/h5util.c b/java/src/jni/h5util.c index 5f1bccb..5c82edc 100644 --- a/java/src/jni/h5util.c +++ b/java/src/jni/h5util.c @@ -1059,7 +1059,7 @@ h5str_sprintf } if (H5Tequal(tid, H5T_STD_REF)) { - H5O_type_t obj_type; /* Object type */ + H5O_type_t obj_type = -1; /* Object type */ H5R_type_t ref_type; /* Reference type */ const H5R_ref_t *ref_vp = (H5R_ref_t *)cptr; |