mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Minor renaming in h5dump (addr --> token)

Browse Source
This commit is contained in:
Dana Robinson 2020-03-27 17:17:00 -07:00
parent c66ce89383
commit 2dd6075c7a
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/src/h5dump/h5dump_ddl.c
View File

@ -816,14 +816,14 @@ dump_group(hid_t gid, const char *name)
/* dump unamed type in root group */
for(u = 0; u < type_table->nobjs; u++)
if(!type_table->objs[u].recorded) {
char *obj_addr_str = NULL;
char *obj_tok_str = NULL;
dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
type = H5Dget_type(dset);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_addr_str);
HDsprintf(type_name, "#%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
HDsprintf(type_name, "#%s", obj_tok_str);
H5free_memory(obj_tok_str);
dump_function_table->dump_named_datatype_function(type, type_name);
H5Tclose(type);
@ -1258,11 +1258,11 @@ dump_fcontents(hid_t fid)
for (u = 0; u < type_table->nobjs; u++) {
if (!type_table->objs[u].recorded) {
char *obj_addr_str = NULL;
char *obj_tok_str = NULL;
H5Otoken_to_str(fid, &type_table->objs[u].obj_token, &obj_addr_str);
PRINTSTREAM(rawoutstream, " %-10s /#%s\n", "datatype", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(fid, &type_table->objs[u].obj_token, &obj_tok_str);
PRINTSTREAM(rawoutstream, " %-10s /#%s\n", "datatype", obj_tok_str);
H5free_memory(obj_tok_str);
}
}
}
@ -1914,12 +1914,12 @@ handle_datatypes(hid_t fid, const char *type, void H5_ATTR_UNUSED * data, int pe
char name[128];
if(!type_table->objs[idx].recorded) {
char *obj_addr_string = NULL;
char *obj_tok_str = NULL;
/* unamed datatype */
H5Otoken_to_str(fid, &type_table->objs[idx].obj_token, &obj_addr_string);
HDsprintf(name, "/#%s", obj_addr_string);
H5free_memory(obj_addr_string);
H5Otoken_to_str(fid, &type_table->objs[idx].obj_token, &obj_tok_str);
HDsprintf(name, "/#%s", obj_tok_str);
H5free_memory(obj_tok_str);
if(!HDstrcmp(name, real_name))
break;

36
tools/src/h5dump/h5dump_xml.c
View File

@ -578,7 +578,7 @@ int
xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen)
{
H5O_token_t obj_token;
char *obj_addr_str = NULL;
char *obj_tok_str = NULL;
int lookup_ret;
if (outlen < 22) return 1;
@ -591,9 +591,9 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
if (gen) {
ref_path_table_gen_fake(str, &obj_token);
H5Otoken_to_str(loc_id, &obj_token, &obj_addr_str);
HDsprintf(outstr, "xid_%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
HDsprintf(outstr, "xid_%s", obj_tok_str);
H5free_memory(obj_tok_str);
return 0;
}
@ -606,9 +606,9 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
if (gen) {
ref_path_table_gen_fake(str, &obj_token);
H5Otoken_to_str(loc_id, &obj_token, &obj_addr_str);
HDsprintf(outstr, "xid_%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
HDsprintf(outstr, "xid_%s", obj_tok_str);
H5free_memory(obj_tok_str);
return 0;
}
@ -618,9 +618,9 @@ xml_name_to_XID(hid_t loc_id, const char *str, char *outstr, int outlen, int gen
}
}
H5Otoken_to_str(loc_id, &obj_token, &obj_addr_str);
HDsprintf(outstr, "xid_%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(loc_id, &obj_token, &obj_tok_str);
HDsprintf(outstr, "xid_%s", obj_tok_str);
H5free_memory(obj_tok_str);
return 0;
}
@ -2659,14 +2659,14 @@ xml_dump_group(hid_t gid, const char *name)
/* Very special case: dump unamed type in root group */
for(u = 0; u < type_table->nobjs; u++) {
if(!type_table->objs[u].recorded) {
char *obj_addr_str = NULL;
char *obj_tok_str = NULL;
dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
type = H5Dget_type(dset);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_addr_str);
HDsprintf(type_name, "#%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
HDsprintf(type_name, "#%s", obj_tok_str);
H5free_memory(obj_tok_str);
dump_function_table->dump_named_datatype_function(type, type_name);
H5Tclose(type);
@ -2747,14 +2747,14 @@ xml_dump_group(hid_t gid, const char *name)
/* Very special case: dump unamed type in root group */
for(u = 0; u < type_table->nobjs; u++) {
if(!type_table->objs[u].recorded) {
char *obj_addr_str = NULL;
char *obj_tok_str = NULL;
dset = H5Dopen2(gid, type_table->objs[u].objname, H5P_DEFAULT);
type = H5Dget_type(dset);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_addr_str);
HDsprintf(type_name, "#%s", obj_addr_str);
H5free_memory(obj_addr_str);
H5Otoken_to_str(dset, &type_table->objs[u].obj_token, &obj_tok_str);
HDsprintf(type_name, "#%s", obj_tok_str);
H5free_memory(obj_tok_str);
dump_function_table->dump_named_datatype_function(type, type_name);
H5Tclose(type);