diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 05:06:18 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 05:06:18 (GMT) |
| commit | 0611a912634742279a12fe34494cfb239466bc6b (patch) | |
| tree | eedce6c4c954c2015cfc245a5271e58d2e6dfd23 /src/H5FAcache.c | |
| parent | ff1c084a4ff54b6eb50d909b29c6e6b1301d0f8d (diff) | |
| download | hdf5-0611a912634742279a12fe34494cfb239466bc6b.zip hdf5-0611a912634742279a12fe34494cfb239466bc6b.tar.gz hdf5-0611a912634742279a12fe34494cfb239466bc6b.tar.bz2 | |
[svn-r18504] Description:
Streamline & cleanup data structure 'destroy' calls from metadata
client destroy callbacks.
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
Mac OS X/32 10.6.3 (amazon) in debug mode
Diffstat (limited to 'src/H5FAcache.c')
| -rw-r--r-- | src/H5FAcache.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5FAcache.c b/src/H5FAcache.c index 9fa9941..f9bf595 100644 --- a/src/H5FAcache.c +++ b/src/H5FAcache.c @@ -279,7 +279,7 @@ CATCH if(wb && H5WB_unwrap(wb) < 0) H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer") if(!ret_value) - if(hdr && H5FA__cache_hdr_dest(f, hdr) < 0) + if(hdr && H5FA__hdr_dest(hdr) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array header") END_FUNC(STATIC) /* end H5FA__cache_hdr_load() */ @@ -485,7 +485,6 @@ CATCH END_FUNC(STATIC) /* end H5FA__cache_hdr_dest() */ - /*------------------------------------------------------------------------- * Function: H5FA__cache_dblock_load @@ -614,7 +613,7 @@ CATCH if(wb && H5WB_unwrap(wb) < 0) H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer") if(!ret_value) - if(dblock && H5FA__cache_dblock_dest(f, dblock) < 0) + if(dblock && H5FA__dblock_dest(dblock) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block") END_FUNC(STATIC) /* end H5FA__cache_dblock_load() */ @@ -833,7 +832,7 @@ H5FA__cache_dblock_dest(H5F_t *f, H5FA_dblock_t *dblock)) } /* end if */ /* Release the data block */ - if(H5FA__dblock_dest(f, dblock) < 0) + if(H5FA__dblock_dest(dblock) < 0) H5E_THROW(H5E_CANTFREE, "can't free fixed array data block") CATCH @@ -941,7 +940,7 @@ CATCH if(wb && H5WB_unwrap(wb) < 0) H5E_THROW(H5E_CLOSEERROR, "can't close wrapped buffer") if(!ret_value) - if(dblk_page && H5FA__cache_dblk_page_dest(f, dblk_page) < 0) + if(dblk_page && H5FA__dblk_page_dest(dblk_page) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy fixed array data block page") END_FUNC(STATIC) /* end H5FA__cache_dblk_page_load() */ |