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/H5EAiblock.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/H5EAiblock.c')
| -rw-r--r-- | src/H5EAiblock.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/H5EAiblock.c b/src/H5EAiblock.c index 9920277..734dda0 100644 --- a/src/H5EAiblock.c +++ b/src/H5EAiblock.c @@ -157,7 +157,7 @@ HDfprintf(stderr, "%s: iblock->nsblk_addrs = %Zu\n", FUNC, iblock->nsblk_addrs); CATCH if(!ret_value) - if(iblock && H5EA__iblock_dest(hdr->f, iblock) < 0) + if(iblock && H5EA__iblock_dest(iblock) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block") END_FUNC(PKG) /* end H5EA__iblock_alloc() */ @@ -257,7 +257,7 @@ CATCH H5E_THROW(H5E_CANTFREE, "unable to release extensible array index block") /* Destroy index block */ - if(H5EA__iblock_dest(hdr->f, iblock) < 0) + if(H5EA__iblock_dest(iblock) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array index block") } /* end if */ @@ -432,7 +432,7 @@ END_FUNC(PKG) /* end H5EA__iblock_delete() */ /* ARGSUSED */ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, -H5EA__iblock_dest(H5F_t *f, H5EA_iblock_t *iblock)) +H5EA__iblock_dest(H5EA_iblock_t *iblock)) /* Sanity check */ HDassert(iblock); @@ -440,9 +440,6 @@ H5EA__iblock_dest(H5F_t *f, H5EA_iblock_t *iblock)) /* Check if shared header field has been initialized */ if(iblock->hdr) { - /* Set the shared array header's file context for this operation */ - iblock->hdr->f = f; - /* Check if we've got elements in the index block */ if(iblock->elmts) { /* Free buffer for index block elements */ @@ -473,7 +470,7 @@ H5EA__iblock_dest(H5F_t *f, H5EA_iblock_t *iblock)) } /* end if */ /* Free the index block itself */ - (void)H5FL_FREE(H5EA_iblock_t, iblock); + iblock = H5FL_FREE(H5EA_iblock_t, iblock); CATCH |