diff options
| author | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2016-03-05 06:24:35 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2016-11-29 23:42:32 (GMT) |
| commit | be538b010197486786bd8fa2a7411f369385c5cc (patch) | |
| tree | 774e797f941a6c3f7da17d34dc1beec84bad5282 /src | |
| parent | 5eb05274cdc6d87e7aa52b6c279faf6f44022a09 (diff) | |
| download | hdf5-be538b010197486786bd8fa2a7411f369385c5cc.zip hdf5-be538b010197486786bd8fa2a7411f369385c5cc.tar.gz hdf5-be538b010197486786bd8fa2a7411f369385c5cc.tar.bz2 | |
Remove loc_id parameter from H5R__get_obj_name
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5R.c | 6 | ||||
| -rw-r--r-- | src/H5Rdeprec.c | 2 | ||||
| -rw-r--r-- | src/H5Rpkg.h | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1667,7 +1667,7 @@ done: *------------------------------------------------------------------------- */ ssize_t -H5R__get_obj_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t loc_id, href_t _ref, +H5R__get_obj_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, href_t _ref, char *name, size_t size) { hid_t file_id = H5I_BADID; /* ID for file that the reference is in */ @@ -1746,8 +1746,8 @@ H5R__get_obj_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t loc_id, href_t _ /* Get object location */ if (!ext_ref) { /* Retrieve file ID for name search */ - if((file_id = H5I_get_file_id(loc_id, FALSE)) < 0) - HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't retrieve file ID") + if((file_id = H5F_get_id(f, FALSE)) < 0) + HGOTO_ERROR(H5E_ATOM, H5E_CANTGET, FAIL, "can't get file ID") /* Get name, length, etc. */ if((ret_value = H5G_get_name_by_addr(file_id, lapl_id, dxpl_id, &oloc, name, size)) < 0) diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index a823b89..c5b561c 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -365,7 +365,7 @@ ssize_t H5Rget_name(hid_t loc_id, H5R_type_t ref_type, const void *_ref, case H5R_OBJECT: case H5R_DATASET_REGION: case H5R_REGION: - if((ret_value = H5R__get_obj_name(file, H5P_DEFAULT, H5AC_ind_dxpl_id, loc_id, *ref_ptr, name, size)) < 0) + if((ret_value = H5R__get_obj_name(file, H5P_DEFAULT, H5AC_ind_dxpl_id, *ref_ptr, name, size)) < 0) HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to determine object path") break; case H5R_ATTR: diff --git a/src/H5Rpkg.h b/src/H5Rpkg.h index 08176ac..ff9acc2 100644 --- a/src/H5Rpkg.h +++ b/src/H5Rpkg.h @@ -74,7 +74,7 @@ H5_DLL hid_t H5R__get_object(H5F_t *file, hid_t dapl_id, hid_t dxpl_id, H5_DLL struct H5S_t *H5R__get_region(H5F_t *file, hid_t dxpl_id, href_t ref); H5_DLL H5A_t *H5R__get_attr(H5F_t *file, hid_t dxpl_id, href_t ref); H5_DLL ssize_t H5R__get_obj_name(H5F_t *file, hid_t lapl_id, hid_t dxpl_id, - hid_t id, href_t ref, char *name, size_t size); + href_t ref, char *name, size_t size); H5_DLL ssize_t H5R__get_attr_name(H5F_t *file, href_t ref, char *name, size_t size); #endif /* _H5Rpkg_H */ |