summaryrefslogtreecommitdiffstats
path: root/src/H5Gname.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-30 22:56:15 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-30 22:56:15 (GMT)
commitb969dce6e5625dd9d9f9cc42717a1b2027fdeeb1 (patch)
treeae2f2b4b6b417831b35f14c4e12e4bcc7971b636 /src/H5Gname.c
parentc136b81140106231e471b334bc5248611cec04e6 (diff)
downloadhdf5-b969dce6e5625dd9d9f9cc42717a1b2027fdeeb1.zip
hdf5-b969dce6e5625dd9d9f9cc42717a1b2027fdeeb1.tar.gz
hdf5-b969dce6e5625dd9d9f9cc42717a1b2027fdeeb1.tar.bz2
[svn-r14224] Description:
Change H5Literate -> H5Literate_by_name and add simpler form of H5Literate, to bring this routine into alignment with the other new API routines. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'src/H5Gname.c')
-rw-r--r--src/H5Gname.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 2bc0174..e341ee7 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -53,6 +53,7 @@ typedef struct H5G_names_t {
typedef struct H5G_ref_path_iter_t {
/* In */
hid_t file; /* File id where it came from */
+ hid_t lapl_id; /* LAPL for operations */
hid_t dxpl_id; /* DXPL for operations */
hbool_t is_root_group; /* Flag to indicate that the root group is being looked at */
const H5O_loc_t *loc; /* The location of the object we're looking for */
@@ -437,7 +438,8 @@ H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t dxpl_id)
+H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t lapl_id,
+ hid_t dxpl_id)
{
H5G_loc_t loc; /* Object location */
ssize_t ret_value = FAIL;
@@ -466,7 +468,7 @@ H5G_get_name(hid_t id, char *name/*out*/, size_t size, hid_t dxpl_id)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve file ID")
/* Search for name of object */
- if((len = H5G_get_refobj_name(file, dxpl_id, loc.oloc, name, size)) < 0) {
+ if((len = H5G_get_refobj_name(file, lapl_id, dxpl_id, loc.oloc, name, size)) < 0) {
H5I_dec_ref(file);
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't determine name")
} /* end if */
@@ -1149,7 +1151,7 @@ H5G_refname_iterator(hid_t group, const char *name, const H5L_info_t *link_info,
lnk_op.op_type = H5G_LINK_OP_APP;
lnk_op.u.app_op = H5G_refname_iterator;
- ret_value = H5G_obj_iterate(udata->file, udata->container, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, &last_obj, &lnk_op, udata, udata->dxpl_id);
+ ret_value = H5G_obj_iterate(udata->file, udata->container, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, &last_obj, &lnk_op, udata, udata->lapl_id, udata->dxpl_id);
/* If we didn't find the object, truncate the name to not include group name anymore */
if(!ret_value)
@@ -1211,7 +1213,7 @@ H5G_free_ref_path_node(void *item, void UNUSED *key, void UNUSED *operator_data/
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_get_refobj_name(hid_t file, hid_t dxpl_id, const H5O_loc_t *loc,
+H5G_get_refobj_name(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *loc,
char *name, size_t size)
{
H5G_ref_path_iter_t udata; /* User data for iteration */
@@ -1231,6 +1233,7 @@ H5G_get_refobj_name(hid_t file, hid_t dxpl_id, const H5O_loc_t *loc,
/* Set up user data for iterator */
udata.file = file;
+ udata.lapl_id = lapl_id;
udata.dxpl_id = dxpl_id;
udata.is_root_group = TRUE;
if(NULL == (udata.container = H5MM_strdup("")))