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/H5Rdeprec.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/H5Rdeprec.c')
| -rw-r--r-- | src/H5Rdeprec.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index 1dd97ee..049792e 100644 --- a/src/H5Rdeprec.c +++ b/src/H5Rdeprec.c @@ -34,7 +34,7 @@ #define H5R_PACKAGE /*suppress error about including H5Rpkg */ /* Interface initialization */ -#define H5_INTERFACE_INIT_FUNC H5R_init_deprec_interface +#define H5_INTERFACE_INIT_FUNC H5R__init_deprec_interface /***********/ @@ -48,7 +48,6 @@ #include "H5Rpkg.h" /* References */ -#ifndef H5_NO_DEPRECATED_SYMBOLS /****************/ /* Local Macros */ /****************/ @@ -87,9 +86,9 @@ /*-------------------------------------------------------------------------- NAME - H5R_init_deprec_interface -- Initialize interface-specific information + H5R__init_deprec_interface -- Initialize interface-specific information USAGE - herr_t H5R_init_deprec_interface() + herr_t H5R__init_deprec_interface() RETURNS Non-negative on success/Negative on failure DESCRIPTION @@ -98,15 +97,40 @@ DESCRIPTION --------------------------------------------------------------------------*/ static herr_t -H5R_init_deprec_interface(void) +H5R__init_deprec_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOERR + FUNC_ENTER_STATIC_NOERR FUNC_LEAVE_NOAPI(H5R_init()) -} /* H5R_init_deprec_interface() */ +} /* H5R__init_deprec_interface() */ /*-------------------------------------------------------------------------- +NAME + H5R__term_deprec_interface -- Terminate interface +USAGE + herr_t H5R__term_deprec_interface() +RETURNS + Non-negative on success/Negative on failure +DESCRIPTION + Terminates interface. (Just resets H5_interface_initialize_g + currently). + +--------------------------------------------------------------------------*/ +herr_t +H5R__term_deprec_interface(void) +{ + FUNC_ENTER_PACKAGE_NOERR + + /* Mark closed */ + H5_interface_initialize_g = 0; + + FUNC_LEAVE_NOAPI(0) +} /* H5R__term_deprec_interface() */ + +#ifndef H5_NO_DEPRECATED_SYMBOLS + +/*-------------------------------------------------------------------------- NAME H5Rget_obj_type1 PURPOSE |