diff options
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff_array.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5tools_ref.c | 6 | ||||
| -rw-r--r-- | tools/lib/h5tools_str.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5tools_utils.c | 6 | ||||
| -rw-r--r-- | tools/lib/h5trav.c | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index f852a2d..6da37e2 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -2215,8 +2215,8 @@ hsize_t diff_region(hid_t obj1_id, if (nfound_b && options->m_verbose) { H5O_info_t oi1, oi2; - H5Oget_info(obj1_id, ".", &oi1, H5P_DEFAULT); - H5Oget_info(obj2_id, ".", &oi2, H5P_DEFAULT); + H5Oget_info(obj1_id, &oi1); + H5Oget_info(obj2_id, &oi2); parallel_print("Referenced dataset %lu %lu\n", (unsigned long)oi1.addr, (unsigned long)oi2.addr); diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 2db6d21..d3d6a66 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -71,9 +71,9 @@ hsize_t diff_attr(hid_t loc1_id, hsize_t nfound_total = 0; int cmp=1; - if(H5Oget_info(loc1_id, ".", &oinfo1, H5P_DEFAULT) < 0) + if(H5Oget_info(loc1_id, &oinfo1) < 0) goto error; - if(H5Oget_info(loc2_id, ".", &oinfo2, H5P_DEFAULT) < 0) + if(H5Oget_info(loc2_id, &oinfo2) < 0) goto error; if(oinfo1.num_attrs != oinfo2.num_attrs) diff --git a/tools/lib/h5tools_ref.c b/tools/lib/h5tools_ref.c index 69ea08d..123065b 100644 --- a/tools/lib/h5tools_ref.c +++ b/tools/lib/h5tools_ref.c @@ -134,7 +134,7 @@ ref_path_table_lookup(const char *thepath) /* Get the object info now */ /* (returns failure for dangling soft links) */ - if(H5Oget_info(thefile, thepath, &oi, H5P_DEFAULT) < 0) + if(H5Oget_info_by_name(thefile, thepath, &oi, H5P_DEFAULT) < 0) return HADDR_UNDEF; /* All existing objects in the file had better be in the table */ @@ -300,7 +300,7 @@ fill_ref_path_table_cb(hid_t group, const char *obj_name, const H5L_info_t *linf if(linfo->type == H5L_TYPE_HARD) { H5O_info_t oinfo; - H5Oget_info(group, obj_name, &oinfo, H5P_DEFAULT); + H5Oget_info_by_name(group, obj_name, &oinfo, H5P_DEFAULT); /* Check if the object is already in the path table */ if(!ref_path_table_find(oinfo.addr)) { @@ -369,7 +369,7 @@ fill_ref_path_table(hid_t fid) root_path = HDstrdup("/"); /* Get info for root group */ - H5Oget_info(fid, root_path, &oinfo, H5P_DEFAULT); + H5Oget_info_by_name(fid, root_path, &oinfo, H5P_DEFAULT); /* Insert the root group into the path table (takes ownership of path) */ ref_path_table_put(root_path, oinfo.addr); diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c index 66966d8..80839ce 100644 --- a/tools/lib/h5tools_str.c +++ b/tools/lib/h5tools_str.c @@ -872,7 +872,7 @@ h5tools_str_sprint(h5tools_str_t *str, const h5tool_format_t *info, hid_t contai const char *path; obj = H5Rdereference(container, H5R_OBJECT, vp); - H5Oget_info(obj, ".", &oi, H5P_DEFAULT); + H5Oget_info(obj, &oi); /* Print object type and close object */ switch(oi.type) { diff --git a/tools/lib/h5tools_utils.c b/tools/lib/h5tools_utils.c index fba76ad..cb38e7a 100644 --- a/tools/lib/h5tools_utils.c +++ b/tools/lib/h5tools_utils.c @@ -487,7 +487,7 @@ find_objs_cb(hid_t group, const char *name, const H5L_info_t UNUSED *linfo, void find_objs_t *info = (find_objs_t*)op_data; herr_t ret_value = 0; - if(H5Oget_info(group, name, &oinfo, H5P_DEFAULT) < 0) + if(H5Oget_info_by_name(group, name, &oinfo, H5P_DEFAULT) < 0) ; /* keep going */ else { switch(oinfo.type) { @@ -526,7 +526,7 @@ find_objs_cb(hid_t group, const char *name, const H5L_info_t UNUSED *linfo, void type = H5Dget_type(dset); if(H5Tcommitted(type) > 0) { - H5Oget_info(type, ".", &oinfo, H5P_DEFAULT); + H5Oget_info(type, &oinfo); if(search_obj(info->type_table, oinfo.addr) == NULL) { char *type_name = HDstrdup(tmp); @@ -603,7 +603,7 @@ init_objs(hid_t fid, find_objs_t *info, table_t **group_table, info->dset_table = *dset_table; /* add the root group as an object, it may have hard links to it */ - if(H5Oget_info(fid, "/", &oinfo, H5P_DEFAULT) < 0) + if(H5Oget_info(fid, &oinfo) < 0) return FAIL; else { /* call with an empty string, it appends '/' group separator */ diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index 14c59c4..97de021 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -155,7 +155,7 @@ traverse_cb(hid_t loc_id, const char *link_name, const H5L_info_t *linfo, H5O_info_t oinfo; /* Get information about the object */ - if(H5Oget_info(loc_id, link_name, &oinfo, H5P_DEFAULT) < 0) + if(H5Oget_info_by_name(loc_id, link_name, &oinfo, H5P_DEFAULT) < 0) return(H5_ITER_ERROR); /* If the object has multiple links, add it to the list of addresses @@ -224,7 +224,7 @@ traverse(hid_t file_id, const trav_visitor_t *visitor) trav_ud_traverse_t udata; /* User data for iteration callback */ /* Get info for root group */ - if(H5Oget_info(file_id, "/", &oinfo, H5P_DEFAULT) < 0) + if(H5Oget_info(file_id, &oinfo) < 0) return -1; /* Visit the root group of the file */ |