diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2020-04-09 15:13:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@koziol.gov> | 2020-04-09 15:13:23 (GMT) |
| commit | 5c885f52335525cb218ad3620fd2ff1a008e4962 (patch) | |
| tree | 6d0f2c4054c369c98a5a420d13e16b524fdfe5ce /tools/lib/h5tools_str.c | |
| parent | d17c259a4df5fcfd89cba5ddf877b46be8a40ab5 (diff) | |
| parent | 88ff2b6cb80c66faf5805e1ec0bdcbfda2942a8d (diff) | |
| download | hdf5-5c885f52335525cb218ad3620fd2ff1a008e4962.zip hdf5-5c885f52335525cb218ad3620fd2ff1a008e4962.tar.gz hdf5-5c885f52335525cb218ad3620fd2ff1a008e4962.tar.bz2 | |
Merge remote-tracking branch 'origin/develop' into pio_update
Diffstat (limited to 'tools/lib/h5tools_str.c')
| -rw-r--r-- | tools/lib/h5tools_str.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 6515ecd..5c777a9 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -1101,12 +1101,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_info2_t oi; - char *obj_addr_str = NULL; + char *obj_tok_str = NULL; H5TOOLS_DEBUG("ref_type is H5R_OBJECT1"); if((obj = H5Ropen_object(ref_vp, H5P_DEFAULT, H5P_DEFAULT)) >= 0) { H5Oget_info3(obj, &oi, H5O_INFO_BASIC); - H5Otoken_to_str(obj, &oi.token, &obj_addr_str); + H5Otoken_to_str(obj, &oi.token, &obj_tok_str); } else H5TOOLS_ERROR(NULL, "H5Ropen_object H5R_OBJECT1 failed"); @@ -1137,13 +1137,13 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai /* Print OID */ if(info->obj_hidefileno) - h5tools_str_append(str, info->obj_format, obj_addr_str); + h5tools_str_append(str, info->obj_format, obj_tok_str); else - h5tools_str_append(str, info->obj_format, oi.fileno, obj_addr_str); + h5tools_str_append(str, info->obj_format, oi.fileno, obj_tok_str); - if(obj_addr_str) { - H5free_memory(obj_addr_str); - obj_addr_str = NULL; + if(obj_tok_str) { + H5free_memory(obj_tok_str); + obj_tok_str = NULL; } if(obj >= 0) |