summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-08-14 16:04:42 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-08-14 16:04:42 (GMT)
commit665366d499eb7831d90655c704507c4920313361 (patch)
treebb324f8f1f7bb10b01da9d8007a59d006349a47e /test
parent7de10b48334d0113b1733f145c7d2bb4e9d4f9f1 (diff)
downloadhdf5-665366d499eb7831d90655c704507c4920313361.zip
hdf5-665366d499eb7831d90655c704507c4920313361.tar.gz
hdf5-665366d499eb7831d90655c704507c4920313361.tar.bz2
[svn-r14085] Description:
Refactor H5HF_size() size statistics code for fractal heap to conform to how the rest of the fractal heap routines work. Tested on: FreeBSD/32 6.2 (duty) Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'test')
-rw-r--r--test/fheap.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/test/fheap.c b/test/fheap.c
index 7e82ef4..0556a04 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -2798,7 +2798,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
/* Get an empty heap's size */
empty_heap_size = 0;
- if(H5HF_size(f, dxpl, fh_addr, &empty_heap_size) < 0)
+ if(H5HF_size(fh, dxpl, &empty_heap_size) < 0)
FAIL_STACK_ERROR
if(empty_heap_size == 0)
TEST_ERROR
@@ -2809,7 +2809,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
/* Get the heap's size after inserting one object */
one_heap_size = 0;
- if(H5HF_size(f, dxpl, fh_addr, &one_heap_size) < 0)
+ if(H5HF_size(fh, dxpl, &one_heap_size) < 0)
FAIL_STACK_ERROR
if(one_heap_size <= empty_heap_size)
TEST_ERROR
@@ -2832,20 +2832,13 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
if(NULL == (f = H5I_object(file)))
FAIL_STACK_ERROR
- /* Check the heap's size */
- heap_size = 0;
- if(H5HF_size(f, dxpl, fh_addr, &heap_size) < 0)
- FAIL_STACK_ERROR
- if(heap_size != one_heap_size)
- TEST_ERROR
-
/* Re-open the heap */
if(NULL == (fh = H5HF_open(f, H5P_DATASET_XFER_DEFAULT, fh_addr)))
FAIL_STACK_ERROR
/* Check the heap's size */
heap_size = 0;
- if(H5HF_size(f, dxpl, fh_addr, &heap_size) < 0)
+ if(H5HF_size(fh, dxpl, &heap_size) < 0)
FAIL_STACK_ERROR
if(heap_size != one_heap_size)
TEST_ERROR
@@ -2856,7 +2849,7 @@ test_size(hid_t fapl, H5HF_create_t *cparam)
/* Check the heap's size */
heap_size = 0;
- if(H5HF_size(f, dxpl, fh_addr, &heap_size) < 0)
+ if(H5HF_size(fh, dxpl, &heap_size) < 0)
FAIL_STACK_ERROR
if(heap_size != one_heap_size)
TEST_ERROR