diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-10 02:33:28 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-10 02:33:28 (GMT) |
commit | 0e673fe2b97bfa6aecd475581a5456ba0b8caaa8 (patch) | |
tree | 9cbfb6c76ba4eec3765dfb86e9caa83bf4d5ea31 /src/H5C.c | |
parent | d4e99c418f4acd61b4c2d9f9404c1d17ba40d465 (diff) | |
download | hdf5-0e673fe2b97bfa6aecd475581a5456ba0b8caaa8.zip hdf5-0e673fe2b97bfa6aecd475581a5456ba0b8caaa8.tar.gz hdf5-0e673fe2b97bfa6aecd475581a5456ba0b8caaa8.tar.bz2 |
[svn-r18542] Description:
Bring new object header pin/unpin & protect/unprotect routines and
split-out object header chunk proxy changes from metadata_journaling branch to
"merging" branch, along with some other minor tweaks to clean up compiler
warnings, etc.
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
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
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5C.c')
-rw-r--r-- | src/H5C.c | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -615,8 +615,7 @@ done: H5SL_close(cache_ptr->slist_ptr); cache_ptr->magic = 0; - H5FL_FREE(H5C_t, cache_ptr); - cache_ptr = NULL; + cache_ptr = H5FL_FREE(H5C_t, cache_ptr); } /* end if */ @@ -931,7 +930,7 @@ H5C_dest_empty(H5C_t * cache_ptr) cache_ptr->magic = 0; - H5FL_FREE(H5C_t, cache_ptr); + cache_ptr = H5FL_FREE(H5C_t, cache_ptr); done: FUNC_LEAVE_NOAPI(ret_value) |