diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-09-19 01:48:50 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-09-19 01:48:50 (GMT) |
| commit | ec53237fb849042b4a5b276a3e66a98ebb3710ee (patch) | |
| tree | b641212c407dc89f0375c93e8b8badbdfff1554f /src/H5Odeprec.c | |
| parent | 44de4ee2e54b84484b099c51c51440b61c4ee465 (diff) | |
| parent | 680cf4d946fd10d50e0f7acdc5bc93f91037fb4f (diff) | |
| download | hdf5-ec53237fb849042b4a5b276a3e66a98ebb3710ee.zip hdf5-ec53237fb849042b4a5b276a3e66a98ebb3710ee.tar.gz hdf5-ec53237fb849042b4a5b276a3e66a98ebb3710ee.tar.bz2 | |
Merge pull request #1244 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop_pull_request to develop
* commit '680cf4d946fd10d50e0f7acdc5bc93f91037fb4f':
Removed 'VOL' versions of FUNC_ENTER macros as well as empty functions orginally intended to support the full SWMR feature.
Diffstat (limited to 'src/H5Odeprec.c')
| -rw-r--r-- | src/H5Odeprec.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/H5Odeprec.c b/src/H5Odeprec.c index 876579d..c73529e 100644 --- a/src/H5Odeprec.c +++ b/src/H5Odeprec.c @@ -31,9 +31,10 @@ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5Opkg.h" /* Object headers */ +#include "H5private.h" /* Generic Functions */ +#include "H5CXprivate.h" /* API Contexts */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5Opkg.h" /* Object headers */ /****************/ @@ -100,8 +101,8 @@ H5Oget_info1(hid_t loc_id, H5O_info_t *oinfo) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no info struct") /* Retrieve the object's information */ - if(H5O__get_info_by_name(&loc, ".", oinfo/*out*/, H5O_INFO_ALL) < 0) - HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get info for object") + if(H5G_loc_info(&loc, ".", oinfo/*out*/, H5O_INFO_ALL) < 0) + HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object info") done: FUNC_LEAVE_API(ret_value) @@ -140,7 +141,7 @@ H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t la HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access property list info") /* Retrieve the object's information */ - if(H5O__get_info_by_name(&loc, name, oinfo/*out*/, H5O_INFO_ALL) < 0) + if(H5G_loc_info(&loc, name, oinfo/*out*/, H5O_INFO_ALL) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get info for object: '%s'", name) done: |