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/H5EAsblock.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/H5EAsblock.c')
| -rw-r--r-- | src/H5EAsblock.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/H5EAsblock.c b/src/H5EAsblock.c index c6a4306..44c0a02 100644 --- a/src/H5EAsblock.c +++ b/src/H5EAsblock.c @@ -170,7 +170,7 @@ HDfprintf(stderr, "%s: hdr->dblk_page_nelmts = %Zu, sblock->ndblks = %Zu, sblock CATCH if(!ret_value) - if(sblock && H5EA__sblock_dest(hdr->f, sblock) < 0) + if(sblock && H5EA__sblock_dest(sblock) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array super block") END_FUNC(PKG) /* end H5EA__sblock_alloc() */ @@ -253,7 +253,7 @@ CATCH H5E_THROW(H5E_CANTFREE, "unable to release extensible array super block") /* Destroy super block */ - if(H5EA__sblock_dest(hdr->f, sblock) < 0) + if(H5EA__sblock_dest(sblock) < 0) H5E_THROW(H5E_CANTFREE, "unable to destroy extensible array super block") } /* end if */ @@ -407,7 +407,7 @@ END_FUNC(PKG) /* end H5EA__sblock_delete() */ /* ARGSUSED */ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, -H5EA__sblock_dest(H5F_t *f, H5EA_sblock_t *sblock)) +H5EA__sblock_dest(H5EA_sblock_t *sblock)) /* Sanity check */ HDassert(sblock); @@ -418,9 +418,6 @@ HDfprintf(stderr, "%s: sblock->hdr->dblk_page_nelmts = %Zu, sblock->ndblks = %Zu /* Check if shared header field has been initialized */ if(sblock->hdr) { - /* Set the shared array header's file context for this operation */ - sblock->hdr->f = f; - /* Free buffer for super block data block addresses, if there are any */ if(sblock->dblk_addrs) sblock->dblk_addrs = H5FL_SEQ_FREE(haddr_t, sblock->dblk_addrs); @@ -438,7 +435,7 @@ HDfprintf(stderr, "%s: sblock->hdr->dblk_page_nelmts = %Zu, sblock->ndblks = %Zu } /* end if */ /* Free the super block itself */ - (void)H5FL_FREE(H5EA_sblock_t, sblock); + sblock = H5FL_FREE(H5EA_sblock_t, sblock); CATCH |