diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-15 03:51:39 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-11-15 03:51:39 (GMT) |
| commit | 218469b0ac56c6a9910b59d6e6b4ebb7c49120db (patch) | |
| tree | 5d9cb062b6f108ad9f8f9cc44ac0a9f62e8e0ab0 /src/H5Otest.c | |
| parent | b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48 (diff) | |
| download | hdf5-218469b0ac56c6a9910b59d6e6b4ebb7c49120db.zip hdf5-218469b0ac56c6a9910b59d6e6b4ebb7c49120db.tar.gz hdf5-218469b0ac56c6a9910b59d6e6b4ebb7c49120db.tar.bz2 | |
[svn-r17894] Description:
Bring r17893 from trunk to 1.8 branch:
Remove old shim H5B2 routines from refactoring, rename new routines to
old routine names and switch all users of the H5B2 interface back to the old
routine names now that the switch to using the more current open -> <operation>
-> pattern is used for all the H5B2 code. This is the final change before
adding a context to the H5B2 client encode/decode callbacks.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Otest.c')
| -rw-r--r-- | src/H5Otest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Otest.c b/src/H5Otest.c index 31bcc86..45ade3a 100644 --- a/src/H5Otest.c +++ b/src/H5Otest.c @@ -198,7 +198,7 @@ H5O_is_attr_empty_test(hid_t oid) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index") /* Retrieve # of records in name index */ - if(H5B2_get_nrec_2(bt2_name, &nattrs) < 0) + if(H5B2_get_nrec(bt2_name, &nattrs) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index") } /* end if */ @@ -285,7 +285,7 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index") /* Retrieve # of records in name index */ - if(H5B2_get_nrec_2(bt2_name, &obj_nattrs) < 0) + if(H5B2_get_nrec(bt2_name, &obj_nattrs) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index") } /* end if */ @@ -367,7 +367,7 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for name index") /* Retrieve # of records in name index */ - if(H5B2_get_nrec_2(bt2_name, name_count) < 0) + if(H5B2_get_nrec(bt2_name, name_count) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from name index") /* Check if there is a creation order index */ @@ -377,7 +377,7 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open v2 B-tree for creation order index") /* Retrieve # of records in creation order index */ - if(H5B2_get_nrec_2(bt2_corder, corder_count) < 0) + if(H5B2_get_nrec(bt2_corder, corder_count) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTCOUNT, FAIL, "unable to retrieve # of records from creation order index") } /* end if */ else |