diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-03-12 02:38:08 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-03-12 02:38:08 (GMT) |
| commit | a64589450e5b41dc55b1c6f2e42e837fb0c72bba (patch) | |
| tree | 1171b47d4ac3aadeaa87b1df69a95c9ee3054c9d /src/H5Gtest.c | |
| parent | e6b818134e24b1d4d99a612218e0a50ffa08bd28 (diff) | |
| download | hdf5-a64589450e5b41dc55b1c6f2e42e837fb0c72bba.zip hdf5-a64589450e5b41dc55b1c6f2e42e837fb0c72bba.tar.gz hdf5-a64589450e5b41dc55b1c6f2e42e837fb0c72bba.tar.bz2 | |
[svn-r13498] Description:
Eliminate storing # of links in "link info" message, regenerate it
when the object is opened instead.
Tested on:
FreeBSD/32 6.2 (duty)
Mac OS X/32 10.4.8 (amazon)
Diffstat (limited to 'src/H5Gtest.c')
| -rw-r--r-- | src/H5Gtest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Gtest.c b/src/H5Gtest.c index b0b4d52..2921bf0 100644 --- a/src/H5Gtest.c +++ b/src/H5Gtest.c @@ -133,11 +133,11 @@ H5G_is_empty_test(hid_t gid) HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found") /* Get the link info */ - if(NULL == H5O_msg_read(&(grp->oloc), H5O_LINFO_ID, &linfo, H5AC_dxpl_id)) + if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id)) HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if(H5F_addr_defined(linfo.link_fheap_addr)) + if(H5F_addr_defined(linfo.fheap_addr)) HGOTO_DONE(FALSE) if(H5F_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE(FALSE) @@ -343,11 +343,11 @@ H5G_is_new_dense_test(hid_t gid) H5O_linfo_t linfo; /* Link info message */ /* Get the link info */ - if(NULL == H5O_msg_read(&(grp->oloc), H5O_LINFO_ID, &linfo, H5AC_dxpl_id)) + if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id)) HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if(!H5F_addr_defined(linfo.link_fheap_addr)) + if(!H5F_addr_defined(linfo.fheap_addr)) HGOTO_DONE(FALSE) if(!H5F_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE(FALSE) @@ -393,11 +393,11 @@ H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group") /* Get the link info */ - if(NULL == H5O_msg_read(&(grp->oloc), H5O_LINFO_ID, &linfo, H5AC_dxpl_id)) + if(NULL == H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id)) HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info") /* Check for 'dense' link storage file addresses being defined */ - if(!H5F_addr_defined(linfo.link_fheap_addr)) + if(!H5F_addr_defined(linfo.fheap_addr)) HGOTO_DONE(FAIL) if(!H5F_addr_defined(linfo.name_bt2_addr)) HGOTO_DONE(FAIL) |