diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-09 05:08:21 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2014-04-09 05:08:21 (GMT) |
| commit | 3de25ee2264f80b4a842af10c69893f4e635951f (patch) | |
| tree | f2ffe250f6d1ee0fb377ba69c8c41ade04c09855 /src/H5Rdeprec.c | |
| parent | f32690b53c0872faf9e9ee0d0492cce360f72938 (diff) | |
| download | hdf5-3de25ee2264f80b4a842af10c69893f4e635951f.zip hdf5-3de25ee2264f80b4a842af10c69893f4e635951f.tar.gz hdf5-3de25ee2264f80b4a842af10c69893f4e635951f.tar.bz2 | |
[svn-r24998] Description:
Check in Neil's changes for correctly handling case where library is
reinitialized through a deprecated routine.
Tested on:
Linux 2.4.x/32 (jam)
Diffstat (limited to 'src/H5Rdeprec.c')
| -rw-r--r-- | src/H5Rdeprec.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c index d0c79a8..ea30913 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,7 @@ #include "H5Rpkg.h" /* References */ #include "H5Ppublic.h" /* for using H5P_DATASET_ACCESS_DEFAULT */ -#ifndef H5_NO_DEPRECATED_SYMBOLS + /****************/ /* Local Macros */ /****************/ @@ -87,9 +87,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,13 +98,38 @@ 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 |