diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 03:16:14 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 03:16:14 (GMT) |
| commit | 61817758ddefdfc6f6de628f4ef0f5d509774c4b (patch) | |
| tree | b02297821e9a4a6f35e42a2fa5f9f62015a56404 /src/H5Gcache.c | |
| parent | bacf7149e948c6c33401a9ecb0ad16e60805a9a2 (diff) | |
| download | hdf5-61817758ddefdfc6f6de628f4ef0f5d509774c4b.zip hdf5-61817758ddefdfc6f6de628f4ef0f5d509774c4b.tar.gz hdf5-61817758ddefdfc6f6de628f4ef0f5d509774c4b.tar.bz2 | |
[svn-r18499] Description:
Bring r18498 from trunk to 1.8 branch:
Bring r18497 from metadata journaling "merging" branch to trunk:
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
FreeBSD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5Gcache.c')
| -rw-r--r-- | src/H5Gcache.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/H5Gcache.c b/src/H5Gcache.c index a5805e3..7b4532d 100644 --- a/src/H5Gcache.c +++ b/src/H5Gcache.c @@ -197,7 +197,7 @@ done: if(wb && H5WB_unwrap(wb) < 0) HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer") if(!ret_value) - if(sym && H5G_node_dest(f, sym) < 0) + if(sym && H5G_node_free(sym) < 0) HDONE_ERROR(H5E_SYM, H5E_CANTFREE, NULL, "unable to destroy symbol table node") FUNC_LEAVE_NOAPI(ret_value) @@ -339,10 +339,9 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym) HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to free symbol table node") } /* end if */ - /* Release resources */ - if(sym->entry) - sym->entry = (H5G_entry_t *)H5FL_SEQ_FREE(H5G_entry_t, sym->entry); - sym = H5FL_FREE(H5G_node_t, sym); + /* Destroy symbol table node */ + if(H5G_node_free(sym) < 0) + HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node") done: FUNC_LEAVE_NOAPI(ret_value) |