diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-04 11:25:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-12-04 11:25:01 (GMT) |
| commit | 304accfb960d747cc4820ed189de2847e87570ff (patch) | |
| tree | f8f37e777475fa954992ef5aa1573a3138af42db /src/H5Glink.c | |
| parent | 786af4b8d7f0e12e58bc7f1ab1ef0928cae9bd17 (diff) | |
| download | hdf5-304accfb960d747cc4820ed189de2847e87570ff.zip hdf5-304accfb960d747cc4820ed189de2847e87570ff.tar.gz hdf5-304accfb960d747cc4820ed189de2847e87570ff.tar.bz2 | |
[svn-r13015] Description:
Migrate more object header routines to use the H5O_msg_ prefix and put
them into the src/H5Omessage.c code module.
Tested on:
Mac OS X/32 10.4.8 (amazon)
FreeBSD/32 4.11 (sleipnir)
Linux/32 2.4 (heping)
AIX/32 5.? (copper)
Diffstat (limited to 'src/H5Glink.c')
| -rw-r--r-- | src/H5Glink.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Glink.c b/src/H5Glink.c index 23e5f4b..3aa7eb4 100644 --- a/src/H5Glink.c +++ b/src/H5Glink.c @@ -500,7 +500,7 @@ H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk, H5G_name_t grp_path; /* Path for group holding soft link */ /* Make a temporary copy, so that it will not change the info in the cache */ - if(NULL == H5O_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk)) + if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk)) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy message") /* Set up group location for soft link to start in */ @@ -521,12 +521,12 @@ H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk, H5E_clear_stack(NULL); /* Release any information copied for temporary src link */ - H5O_reset(H5O_LINK_ID, &tmp_src_lnk); + H5O_msg_reset(H5O_LINK_ID, &tmp_src_lnk); } /* end else */ } /* end if */ /* Copy src link information to dst link information */ - if(NULL == H5O_copy(H5O_LINK_ID, src_lnk, dst_lnk)) + if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, dst_lnk)) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy message") dst_lnk_init = TRUE; @@ -557,11 +557,11 @@ done: /* Check if we used a temporary src link */ if(src_lnk != _src_lnk) { HDassert(src_lnk == &tmp_src_lnk); - H5O_reset(H5O_LINK_ID, &tmp_src_lnk); + H5O_msg_reset(H5O_LINK_ID, &tmp_src_lnk); } /* end if */ if(ret_value < 0) if(dst_lnk_init) - H5O_reset(H5O_LINK_ID, dst_lnk); + H5O_msg_reset(H5O_LINK_ID, dst_lnk); FUNC_LEAVE_NOAPI(ret_value) } /* end H5G_link_copy_file() */ @@ -713,7 +713,7 @@ H5G_link_release_table(H5G_link_table_t *ltable) if(ltable->nlinks > 0) { /* Free link message information */ for(u = 0; u < ltable->nlinks; u++) - if(H5O_reset(H5O_LINK_ID, &(ltable->lnks[u])) < 0) + if(H5O_msg_reset(H5O_LINK_ID, &(ltable->lnks[u])) < 0) HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link message") /* Free table of links */ |