diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-08-14 00:00:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2020-08-14 00:00:56 (GMT) |
| commit | 4f9542c3327df06d1c2ae72141ded67b7b52a9bf (patch) | |
| tree | 8190950c9e3d23eb9a208ef67064181da0ddcb63 /src/H5VLnative_object.c | |
| parent | 8dabc3f67fcb80da642a2a1a93825e440a849252 (diff) | |
| parent | 3f46a380e084d83a84783383bdfbbd9a443e9f27 (diff) | |
| download | hdf5-4f9542c3327df06d1c2ae72141ded67b7b52a9bf.zip hdf5-4f9542c3327df06d1c2ae72141ded67b7b52a9bf.tar.gz hdf5-4f9542c3327df06d1c2ae72141ded67b7b52a9bf.tar.bz2 | |
Merge pull request #2739 in HDFFV/hdf5 from namespace_cleanup_01 to develop
* commit '3f46a380e084d83a84783383bdfbbd9a443e9f27':
Correct typos w/HGOTO_DONE & HGOTO_ERROR
Move H5T_vlen_reclaim to package scope
Switch H5VM inline routines back to single underscope and put a comment in their header about this naming
Clean up private / package / static namespace issues (function naming, which header file, FUNC_ENTER / LEAVE, etc). Removed remaining personal email addresses from library source code (still needs cleaned from other directories). Misc. warning, style, and whitespace cleanup.
Diffstat (limited to 'src/H5VLnative_object.c')
| -rw-r--r-- | src/H5VLnative_object.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c index 8f60ac4..bfbbee0 100644 --- a/src/H5VLnative_object.c +++ b/src/H5VLnative_object.c @@ -64,7 +64,7 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ case H5VL_OBJECT_BY_IDX: { /* Open the object */ - if(NULL == (ret_value = H5O_open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, loc_params->loc_data.loc_by_idx.idx_type, + if(NULL == (ret_value = H5O__open_by_idx(&loc, loc_params->loc_data.loc_by_idx.name, loc_params->loc_data.loc_by_idx.idx_type, loc_params->loc_data.loc_by_idx.order, loc_params->loc_data.loc_by_idx.n, opened_type))) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object by index") break; @@ -80,7 +80,7 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ HGOTO_ERROR(H5E_OHDR, H5E_CANTUNSERIALIZE, NULL, "can't deserialize object token into address") /* Open the object */ - if(NULL == (ret_value = H5O_open_by_addr(&loc, addr, opened_type))) + if(NULL == (ret_value = H5O__open_by_addr(&loc, addr, opened_type))) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object by address") break; } @@ -122,8 +122,8 @@ H5VL__native_object_copy(void *src_obj, const H5VL_loc_params_t *loc_params1, co HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object") /* Copy the object */ - if((ret_value = H5O_copy(&src_loc, src_name, &dst_loc, dst_name, ocpypl_id, lcpl_id)) < 0) - HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy object") + if((ret_value = H5O__copy(&src_loc, src_name, &dst_loc, dst_name, ocpypl_id, lcpl_id)) < 0) + HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object") done: FUNC_LEAVE_NOAPI(ret_value) |