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

Fix for a tools compile issue when deprecated symbols are disabled (#1884)

Browse Source 
* Fix for a tools compile issue when deprecated symbols are disabled

Introduced in #1811, also uses VOL token instead of addr

* Fix for similar compile issues in java when deprecated symbols are
disabled.

* Committing clang-format changes

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
This commit is contained in:
Dana Robinson 2022-07-13 08:53:00 -07:00 committed by GitHub
parent b2363a8195
commit b0d9fa058a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1180,8 +1180,9 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE); CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
} }
else if (H5R_OBJ_REF_BUF_SIZE == typeSize) { else if (H5R_OBJ_REF_BUF_SIZE == typeSize) {
H5O_info1_t oi; H5O_info2_t oi;
hid_t obj = H5I_INVALID_HID; hid_t obj = H5I_INVALID_HID;
char * obj_tok_str = NULL;
/* /*
* Object references -- show the type and OID of the referenced * Object references -- show the type and OID of the referenced
@ -1194,33 +1195,40 @@ h5str_sprintf(JNIEnv *env, h5str_t *out_str, hid_t container, hid_t tid, void *i
if ((obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, cptr)) < 0) if ((obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, cptr)) < 0)
H5_LIBRARY_ERROR(ENVONLY); H5_LIBRARY_ERROR(ENVONLY);
if (H5Oget_info2(obj, &oi, H5O_INFO_ALL) < 0) if (H5Oget_info3(obj, &oi, H5O_INFO_ALL) < 0)
H5_LIBRARY_ERROR(ENVONLY); H5_LIBRARY_ERROR(ENVONLY);
/* Print object data and close object */ /* Print object data and close object */
H5Otoken_to_str(obj, &oi.token, &obj_tok_str);
switch (oi.type) { switch (oi.type) {
case H5O_TYPE_GROUP: case H5O_TYPE_GROUP:
if (HDsprintf(this_str, "%s %llu", H5_TOOLS_GROUP, oi.addr) < 0) if (HDsprintf(this_str, "%s %s", H5_TOOLS_GROUP, obj_tok_str) < 0)
H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure"); H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
break; break;
case H5O_TYPE_DATASET: case H5O_TYPE_DATASET:
if (HDsprintf(this_str, "%s %llu", H5_TOOLS_DATASET, oi.addr) < 0) if (HDsprintf(this_str, "%s %s", H5_TOOLS_DATASET, obj_tok_str) < 0)
H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure"); H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
break; break;
case H5O_TYPE_NAMED_DATATYPE: case H5O_TYPE_NAMED_DATATYPE:
if (HDsprintf(this_str, "%s %llu", H5_TOOLS_DATATYPE, oi.addr) < 0) if (HDsprintf(this_str, "%s %s", H5_TOOLS_DATATYPE, obj_tok_str) < 0)
H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure"); H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
break; break;
case H5O_TYPE_UNKNOWN: case H5O_TYPE_UNKNOWN:
case H5O_TYPE_NTYPES: case H5O_TYPE_NTYPES:
default: default:
if (HDsprintf(this_str, "%u-%llu", (unsigned)oi.type, oi.addr) < 0) if (HDsprintf(this_str, "%u-%s", (unsigned)oi.type, obj_tok_str) < 0)
H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure"); H5_JNI_FATAL_ERROR(ENVONLY, "h5str_sprintf: HDsprintf failure");
break; break;
} /* end switch */ }
if (obj_tok_str) {
H5free_memory(obj_tok_str);
obj_tok_str = NULL;
}
if (H5Oclose(obj) < 0) if (H5Oclose(obj) < 0)
H5_LIBRARY_ERROR(ENVONLY); H5_LIBRARY_ERROR(ENVONLY);

20
tools/lib/h5tools_str.c
View File

@ -1196,7 +1196,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
case H5R_MAXTYPE: case H5R_MAXTYPE:
default: default:
break; break;
} /* end switch */ }
H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF end"); H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF end");
} }
else if (H5Tequal(type, H5T_STD_REF_DSETREG)) { else if (H5Tequal(type, H5T_STD_REF_DSETREG)) {
@ -1210,11 +1210,12 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
/* /*
* Object references -- show the type and OID of the referenced object. * Object references -- show the type and OID of the referenced object.
*/ */
H5O_info1_t oi; H5O_info2_t oi;
char * obj_tok_str = NULL;
H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF_OBJ"); H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF_OBJ");
obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, vp); obj = H5Rdereference2(container, H5P_DEFAULT, H5R_OBJECT, vp);
H5Oget_info2(obj, &oi, H5O_INFO_BASIC); H5Oget_info3(obj, &oi, H5O_INFO_BASIC);
/* Print object type and close object */ /* Print object type and close object */
switch (oi.type) { switch (oi.type) {
@ -1235,14 +1236,21 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
default: default:
h5tools_str_append(str, "%u-", (unsigned)oi.type); h5tools_str_append(str, "%u-", (unsigned)oi.type);
break; break;
} /* end switch */ }
H5Oclose(obj); H5Oclose(obj);
/* Print OID */ /* Print OID */
H5Otoken_to_str(obj, &oi.token, &obj_tok_str);
if (info->obj_hidefileno) if (info->obj_hidefileno)
h5tools_str_append(str, info->obj_format, oi.addr); h5tools_str_append(str, info->obj_format, obj_tok_str);
else else
h5tools_str_append(str, info->obj_format, oi.fileno, oi.addr); h5tools_str_append(str, info->obj_format, oi.fileno, obj_tok_str);
if (obj_tok_str) {
H5free_memory(obj_tok_str);
obj_tok_str = NULL;
}
h5tools_str_sprint_old_reference(str, container, vp); h5tools_str_sprint_old_reference(str, container, vp);
} /* end else if (H5Tequal(type, H5T_STD_REF_OBJ)) */ } /* end else if (H5Tequal(type, H5T_STD_REF_OBJ)) */