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/H5FAdblkpage.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/H5FAdblkpage.c')
| -rw-r--r-- | src/H5FAdblkpage.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5FAdblkpage.c b/src/H5FAdblkpage.c index a1bd90e..2291063 100644 --- a/src/H5FAdblkpage.c +++ b/src/H5FAdblkpage.c @@ -280,7 +280,6 @@ END_FUNC(PKG) /* end H5FA__dblk_page_unprotect() */ * *------------------------------------------------------------------------- */ -/* ARGSUSED */ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5FA__dblk_page_dest(H5FA_dblk_page_t *dblk_page)) @@ -293,8 +292,7 @@ H5FA__dblk_page_dest(H5FA_dblk_page_t *dblk_page)) /* Check if buffer for data block page elements has been initialized */ if(dblk_page->elmts) { /* Free buffer for data block page elements */ - (void) H5FL_BLK_FREE(page_elmts, dblk_page->elmts); - dblk_page->elmts = NULL; + dblk_page->elmts = H5FL_BLK_FREE(page_elmts, dblk_page->elmts); } /* end if */ /* Decrement reference count on shared info */ @@ -304,7 +302,7 @@ H5FA__dblk_page_dest(H5FA_dblk_page_t *dblk_page)) } /* end if */ /* Free the data block page itself */ - (void)H5FL_FREE(H5FA_dblk_page_t, dblk_page); + dblk_page = H5FL_FREE(H5FA_dblk_page_t, dblk_page); CATCH |