diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-16 15:33:08 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-16 15:33:08 (GMT) |
commit | 66fb0ea64e2c26f36da922b75ce1fed1fa79d123 (patch) | |
tree | 386e6a19505679a365439a4cf7658bb2c8019fde /src/H5G.c | |
parent | c45423a13de0939385a1cdd2eb969a9c478febc0 (diff) | |
download | hdf5-66fb0ea64e2c26f36da922b75ce1fed1fa79d123.zip hdf5-66fb0ea64e2c26f36da922b75ce1fed1fa79d123.tar.gz hdf5-66fb0ea64e2c26f36da922b75ce1fed1fa79d123.tar.bz2 |
[svn-r25050] Description:
Bring r24995 and r24998 from the trunk to the 1.8 branch:
r24995:
Improve checks for NULL buffer from user during H5Dread/H5Dwrite calls.
r24998:
Check in Neil's changes for correctly handling case where library is
reinitialized through a deprecated routine.
Tested on:
Mac OSX/64 10.9.2 (amazon) w/serial & paralle
(change has baked on trunk for >7 days)
Diffstat (limited to 'src/H5G.c')
-rw-r--r-- | src/H5G.c | 23 |
1 files changed, 13 insertions, 10 deletions
@@ -224,16 +224,19 @@ H5G_term_interface(void) FUNC_ENTER_NOAPI_NOINIT_NOERR if(H5_interface_initialize_g) { - if((n = H5I_nmembers(H5I_GROUP))) - H5I_clear_type(H5I_GROUP, FALSE, FALSE); - else { - /* Destroy the group object id group */ - H5I_dec_type_ref(H5I_GROUP); - - /* Mark closed */ - H5_interface_initialize_g = 0; - n = 1; /*H5I*/ - } /* end else */ + if((n = H5I_nmembers(H5I_GROUP))) + H5I_clear_type(H5I_GROUP, FALSE, FALSE); + else { + /* Close deprecated interface */ + n += H5G__term_deprec_interface(); + + /* Destroy the group object id group */ + H5I_dec_type_ref(H5I_GROUP); + + /* Mark closed */ + H5_interface_initialize_g = 0; + n = 1; /*H5I*/ + } /* end else */ } /* end if */ FUNC_LEAVE_NOAPI(n) |