diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-13 05:42:10 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-12-13 05:42:10 (GMT) |
commit | e9a3da63a4a36c1c7431832cc50f71200b523864 (patch) | |
tree | 22228b9967f3e7ffd25544a297b5e957f0c45158 /src/H5T.c | |
parent | 4b36b8271b59f7f87294735812bfa80404c69f88 (diff) | |
download | hdf5-e9a3da63a4a36c1c7431832cc50f71200b523864.zip hdf5-e9a3da63a4a36c1c7431832cc50f71200b523864.tar.gz hdf5-e9a3da63a4a36c1c7431832cc50f71200b523864.tar.bz2 |
[svn-r28605] Description:
Revisions to normalize revise chunks vs. trunk, plus push dataset metadata
changes into the cache immediately (instead of holding them within the dataset
data structures).
Tested on:
MacOSX/64 10.11.2 (amazon) w/serial & parallel
(h5committest not required on this branch)
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 22 |
1 files changed, 5 insertions, 17 deletions
@@ -3597,19 +3597,6 @@ done: * Programmer: Robb Matzke * Monday, December 8, 1997 * - * Modifications: - * Robb Matzke, 1999-04-27 - * This function fails if the datatype state is IMMUTABLE. - * - * Robb Matzke, 1999-05-20 - * Closes opaque types also. - * - * Pedro Vicente, <pvn@ncsa.uiuc.edu> 22 Aug 2002 - * Added "ID to name" support - * - * Quincey Koziol, 2003-01-06 - * Moved "guts" of function to H5T__free() - * *------------------------------------------------------------------------- */ herr_t @@ -3630,17 +3617,18 @@ H5T_close(H5T_t *dt) if(dt->shared->state == H5T_STATE_OPEN && dt->shared->fo_count == 0) { if(H5AC_cork(dt->oloc.file, dt->oloc.addr, H5AC__GET_CORKED, &corked) < 0) HGOTO_ERROR(H5E_ATOM, H5E_SYSTEM, FAIL, "unable to retrieve an object's cork status") - else if(corked) { + if(corked) { if(H5AC_cork(dt->oloc.file, dt->oloc.addr, H5AC__UNCORK, NULL) < 0) HGOTO_ERROR(H5E_OHDR, H5E_SYSTEM, FAIL, "unable to uncork an object") - } - } + } /* end if */ + } /* end if */ if(H5T__free(dt) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTFREE, FAIL, "unable to free datatype"); dt->shared = H5FL_FREE(H5T_shared_t, dt->shared); - } else { + } /* end if */ + else { /* * If a named type is being closed then close the object header and * remove from the list of open objects in the file. |