diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-28 13:11:38 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-01-28 13:11:38 (GMT) |
| commit | 3360c3af0c100ac4d3a2fe2865f34661da862ec5 (patch) | |
| tree | 9caf7dba62679504aa39ec02ebb72d8b8b5a848d /src/H5HGcache.c | |
| parent | 5b4d3279099e7e4fad6e0092c77aa93dfd35d616 (diff) | |
| download | hdf5-3360c3af0c100ac4d3a2fe2865f34661da862ec5.zip hdf5-3360c3af0c100ac4d3a2fe2865f34661da862ec5.tar.gz hdf5-3360c3af0c100ac4d3a2fe2865f34661da862ec5.tar.bz2 | |
[svn-r18175] Description:
Bring r17986:18172 from trunk to revise_chunks branch.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5HGcache.c')
| -rw-r--r-- | src/H5HGcache.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5HGcache.c b/src/H5HGcache.c index ee318aa..b7a701a 100644 --- a/src/H5HGcache.c +++ b/src/H5HGcache.c @@ -75,16 +75,6 @@ static herr_t H5HG_size(const H5F_t *f, const H5HG_heap_t *heap, size_t *size_pt /* Package Variables */ /*********************/ - -/*****************************/ -/* Library Private Variables */ -/*****************************/ - - -/*******************/ -/* Local Variables */ -/*******************/ - /* H5HG inherits cache-like properties from H5AC */ const H5AC_class_t H5AC_GHEAP[1] = {{ H5AC_GHEAP_ID, @@ -97,6 +87,16 @@ const H5AC_class_t H5AC_GHEAP[1] = {{ }}; +/*****************************/ +/* Library Private Variables */ +/*****************************/ + + +/*******************/ +/* Local Variables */ +/*******************/ + + /*------------------------------------------------------------------------- * Function: H5HG_load @@ -381,7 +381,7 @@ H5HG_dest(H5F_t *f, H5HG_heap_t *heap) heap->chunk = H5FL_BLK_FREE(gheap_chunk, heap->chunk); if(heap->obj) heap->obj = H5FL_SEQ_FREE(H5HG_obj_t, heap->obj); - (void)H5FL_FREE(H5HG_heap_t, heap); + heap = H5FL_FREE(H5HG_heap_t, heap); done: FUNC_LEAVE_NOAPI(ret_value) |