diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Gdeprec.c | 2 | ||||
| -rw-r--r-- | src/H5Gpublic.h | 8 | ||||
| -rw-r--r-- | src/H5L.c | 24 | ||||
| -rw-r--r-- | src/H5Lpublic.h | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 3814c44..3ee2c2b 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -264,7 +264,6 @@ done: FUNC_LEAVE_API(ret_value) } /* end H5Gopen1() */ -#endif /* H5_NO_DEPRECATED_SYMBOLS */ /*------------------------------------------------------------------------- @@ -310,6 +309,7 @@ H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, const char *new done: FUNC_LEAVE_API(ret_value) } /* end H5Glink() */ +#endif /* H5_NO_DEPRECATED_SYMBOLS */ /*------------------------------------------------------------------------- diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index 8b09ea5..4691e09 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -137,12 +137,10 @@ H5_DLL herr_t H5Gclose(hid_t group_id); * * Use of these functions and variables is deprecated. */ -H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, - const char *new_name); -H5_DLL herr_t H5Gmove(hid_t src_loc_id, const char *src_name, - const char *dst_name); H5_DLL herr_t H5Glink2(hid_t cur_loc_id, const char *cur_name, H5L_type_t type, hid_t new_loc_id, const char *new_name); +H5_DLL herr_t H5Gmove(hid_t src_loc_id, const char *src_name, + const char *dst_name); H5_DLL herr_t H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name); H5_DLL herr_t H5Gunlink(hid_t loc_id, const char *name); @@ -170,6 +168,8 @@ H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs); /* Function prototypes */ H5_DLL hid_t H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint); H5_DLL hid_t H5Gopen1(hid_t loc_id, const char *name); +H5_DLL herr_t H5Glink(hid_t cur_loc_id, H5L_type_t type, const char *cur_name, + const char *new_name); #endif /* H5_NO_DEPRECATED_SYMBOLS */ @@ -466,12 +466,12 @@ done: /*------------------------------------------------------------------------- * Function: H5Lcreate_soft * - * Purpose: Creates a soft link from NEW_NAME to TARGET_PATH. + * Purpose: Creates a soft link from LINK_NAME to LINK_TARGET. * - * TARGET_PATH can be anything and is interpreted at lookup + * LINK_TARGET can be anything and is interpreted at lookup * time relative to the group which contains the final component - * of NEW_NAME. For instance, if TARGET_PATH is `./foo' and - * NEW_NAME is `./x/y/bar' and a request is made for `./x/y/bar' + * of LINK_NAME. For instance, if LINK_TARGET is `./foo' and + * LINK_NAME is `./x/y/bar' and a request is made for `./x/y/bar' * then the actual object looked up is `./x/y/./foo'. * * Return: Non-negative on success/Negative on failure @@ -482,27 +482,27 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Lcreate_soft(const char *target_path, - hid_t cur_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id) +H5Lcreate_soft(const char *link_target, + hid_t link_loc_id, const char *link_name, hid_t lcpl_id, hid_t lapl_id) { - H5G_loc_t cur_loc; /* Group location for new link */ + H5G_loc_t link_loc; /* Group location for new link */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_API(H5Lcreate_soft, FAIL) - H5TRACE5("e", "*si*sii", target_path, cur_loc_id, new_name, lcpl_id, lapl_id); + H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id); /* Check arguments */ - if(H5G_loc(cur_loc_id, &cur_loc) < 0) + if(H5G_loc(link_loc_id, &link_loc) < 0) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") - if(!target_path || !*target_path) + if(!link_target || !*link_target) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no target specified") - if(!new_name || !*new_name) + if(!link_name || !*link_name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no new name specified") if(lcpl_id != H5P_DEFAULT && (TRUE != H5P_isa_class(lcpl_id, H5P_LINK_CREATE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a link creation property list") /* Create the link */ - if(H5L_create_soft(target_path, &cur_loc, new_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0) + if(H5L_create_soft(link_target, &link_loc, link_name, lcpl_id, lapl_id, H5AC_dxpl_id) < 0) HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link") done: diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 679f176..863155e 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -148,8 +148,8 @@ H5_DLL herr_t H5Lcopy(hid_t src_loc, const char *src_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id); H5_DLL herr_t H5Lcreate_hard(hid_t cur_loc, const char *cur_name, hid_t dst_loc, const char *dst_name, hid_t lcpl_id, hid_t lapl_id); -H5_DLL herr_t H5Lcreate_soft(const char *target_path, hid_t cur_loc, - const char *cur_name, hid_t lcpl_id, hid_t lapl_id); +H5_DLL herr_t H5Lcreate_soft(const char *link_target, hid_t link_loc_id, + const char *link_name, hid_t lcpl_id, hid_t lapl_id); H5_DLL herr_t H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id); H5_DLL herr_t H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id); |