summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDana Robinson <43805+derobins@users.noreply.github.com>2022-07-13 21:14:59 (GMT)
committerGitHub <noreply@github.com>2022-07-13 21:14:59 (GMT)
commit26d8e760b6b2d4d98dd670f6256591fe854552a3 (patch)
treebe1eb5136d1bf6a642d5267d3fd25e949c9119ee /tools
parentd6ff0ff657860972ce76145a963eb631708dd3be (diff)
downloadhdf5-26d8e760b6b2d4d98dd670f6256591fe854552a3.zip
hdf5-26d8e760b6b2d4d98dd670f6256591fe854552a3.tar.gz
hdf5-26d8e760b6b2d4d98dd670f6256591fe854552a3.tar.bz2
Cherry-pick of deprecated symbols issue (#1884) from develop (#1886)
Diffstat (limited to 'tools')
-rw-r--r--tools/lib/h5tools_str.c20
1 files changed, 14 insertions, 6 deletions
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 22d6677..626adfa 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -1175,7 +1175,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
case H5R_MAXTYPE:
default:
break;
- } /* end switch */
+ }
H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF end");
}
else if (H5Tequal(type, H5T_STD_REF_DSETREG)) {
@@ -1189,11 +1189,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.
*/
- H5O_info1_t oi;
+ H5O_info2_t oi;
+ char * obj_tok_str = NULL;
H5TOOLS_DEBUG("H5T_REFERENCE:H5T_STD_REF_OBJ");
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 */
switch (oi.type) {
@@ -1214,14 +1215,21 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai
default:
h5tools_str_append(str, "%u-", (unsigned)oi.type);
break;
- } /* end switch */
+ }
H5Oclose(obj);
/* Print OID */
+ H5Otoken_to_str(obj, &oi.token, &obj_tok_str);
+
if (info->obj_hidefileno)
- h5tools_str_append(str, info->obj_format, oi.addr);
+ h5tools_str_append(str, info->obj_format, obj_tok_str);
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);
} /* end else if (H5Tequal(type, H5T_STD_REF_OBJ)) */