diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 01:48:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 01:48:23 (GMT) |
| commit | bacf7149e948c6c33401a9ecb0ad16e60805a9a2 (patch) | |
| tree | 8e4a2b205b7bbed025d6b58066f55a8e21c920d4 /src/H5B2hdr.c | |
| parent | 2b8896eea1636e62ee6cbdd8bc6344b18c704566 (diff) | |
| download | hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.zip hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.tar.gz hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.tar.bz2 | |
[svn-r18495] Description:
Bring r18494 from trunk to 1.8 branch:
Bring r18491 from metadata journaling "merging" branch to trunk:
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
FreeBSD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5B2hdr.c')
| -rw-r--r-- | src/H5B2hdr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index 668bce4..a219859 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -519,7 +519,7 @@ H5B2_hdr_free(H5B2_hdr_t *hdr) /* Free the B-tree node buffer */ if(hdr->page) - (void)H5FL_BLK_FREE(node_page, hdr->page); + hdr->page = H5FL_BLK_FREE(node_page, hdr->page); /* Free the array of offsets into the native key block */ if(hdr->nat_off) @@ -544,7 +544,7 @@ H5B2_hdr_free(H5B2_hdr_t *hdr) } /* end if */ /* Free B-tree header info */ - (void)H5FL_FREE(H5B2_hdr_t, hdr); + hdr = H5FL_FREE(H5B2_hdr_t, hdr); done: FUNC_LEAVE_NOAPI(ret_value) |