diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 20:43:24 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-19 20:43:24 (GMT) |
| commit | 69adfc23bd542bece0a1bcfb2f987309f93d52b8 (patch) | |
| tree | ffb9f0ed33ead1cc0b740969141d4a19f7471be4 /src/H5HLcache.c | |
| parent | cccd3d26d61348db189ec262548fab26f062a427 (diff) | |
| download | hdf5-69adfc23bd542bece0a1bcfb2f987309f93d52b8.zip hdf5-69adfc23bd542bece0a1bcfb2f987309f93d52b8.tar.gz hdf5-69adfc23bd542bece0a1bcfb2f987309f93d52b8.tar.bz2 | |
[svn-r18042] Description:
Bring r18039 from trunk to 1.8 branch:
Minor code cleanups, to align better w/ongoing metadata journaling
convergence.
Tested on:
Mac OS X/32 10.6.2 (amazon) w/debug
(too minor to require h5committest)
Diffstat (limited to 'src/H5HLcache.c')
| -rw-r--r-- | src/H5HLcache.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/H5HLcache.c b/src/H5HLcache.c index 449e166..6c2b3dc 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -76,6 +76,16 @@ static herr_t H5HL_clear(H5F_t *f, H5HL_t *heap, hbool_t destroy); /* Package Variables */ /*********************/ +/* H5HL inherits cache-like properties from H5AC */ +const H5AC_class_t H5AC_LHEAP[1] = {{ + H5AC_LHEAP_ID, + (H5AC_load_func_t)H5HL_load, + (H5AC_flush_func_t)H5HL_flush, + (H5AC_dest_func_t)H5HL_dest, + (H5AC_clear_func_t)H5HL_clear, + (H5AC_size_func_t)H5HL_size, +}}; + /*****************************/ /* Library Private Variables */ @@ -86,15 +96,6 @@ static herr_t H5HL_clear(H5F_t *f, H5HL_t *heap, hbool_t destroy); /* Local Variables */ /*******************/ -/* H5HL inherits cache-like properties from H5AC */ -const H5AC_class_t H5AC_LHEAP[1] = {{ - H5AC_LHEAP_ID, - (H5AC_load_func_t)H5HL_load, - (H5AC_flush_func_t)H5HL_flush, - (H5AC_dest_func_t)H5HL_dest, - (H5AC_clear_func_t)H5HL_clear, - (H5AC_size_func_t)H5HL_size, -}}; /*------------------------------------------------------------------------- @@ -403,9 +404,9 @@ H5HL_dest(H5F_t *f, H5HL_t *heap) while(heap->freelist) { fl = heap->freelist; heap->freelist = fl->next; - (void)H5FL_FREE(H5HL_free_t, fl); + fl = H5FL_FREE(H5HL_free_t, fl); } /* end while */ - (void)H5FL_FREE(H5HL_t, heap); + heap = H5FL_FREE(H5HL_t, heap); done: FUNC_LEAVE_NOAPI(ret_value) |