mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

HDFFV-10976,-10980 Init obj_type before calling H5Rget_obj_type3

Browse Source
This commit is contained in:
Allen Byrne 2019-12-20 13:23:48 -06:00
parent d7c38eeee9
commit 23f813026f
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/jni/h5rImp.c
View File

@ -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;

2
java/src/jni/h5util.c
View File

@ -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;

4
tools/lib/h5diff_array.c
View File

@ -753,8 +753,8 @@ static hsize_t diff_datum(
hid_t region2_id = -1;
H5R_ref_t *ref1_buf = (const H5R_ref_t *)_mem1;
H5R_ref_t *ref2_buf = (const H5R_ref_t *)_mem2;
H5O_type_t obj1_type; /* Object type */
H5O_type_t obj2_type; /* Object type */
H5O_type_t obj1_type = -1; /* Object type */
H5O_type_t obj2_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
ref_type = H5Rget_type(ref1_buf);

2
tools/lib/h5tools_dump.c
View File

@ -4084,7 +4084,7 @@ h5tools_dump_data(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
}
}
for(i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
H5O_type_t obj_type; /* Object type */
H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference loop:%d with curr_pos=%ld", i, curr_pos);

2
tools/lib/h5tools_str.c
View File

@ -1093,7 +1093,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
h5tools_str_append(str, "NULL");
else {
if (H5Tequal(type, 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 = (const H5R_ref_t *)vp;

2
tools/src/h5ls/h5ls.c
View File

@ -1313,7 +1313,7 @@ dump_reference(FILE *stream, const h5tool_format_t *info, h5tools_context_t *ctx
HDmemset(&buffer, 0, sizeof(h5tools_str_t));
for(i = 0; i < ndims; i++, datactx.cur_elmt++, elmt_counter++) {
H5O_type_t obj_type; /* Object type */
H5O_type_t obj_type = -1; /* Object type */
H5R_type_t ref_type; /* Reference type */
H5TOOLS_DEBUG(H5E_tools_min_dbg_id_g, "reference loop:%d with curr_pos=%ld", i, curr_pos);

2
tools/testfiles/trefer_obj_delR.ddl
View File

@ -4,7 +4,7 @@ GROUP "/" {
DATATYPE H5T_REFERENCE { H5T_STD_REF }
DATASPACE SCALAR
DATA {
GROUP "trefer_obj_del.h5"
UNKNOWN "trefer_obj_del.h5"
}
}
}