diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-10-16 02:19:11 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-10-16 02:19:11 (GMT) |
| commit | 84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb (patch) | |
| tree | 5680e556dbb0971024bcea8911beb7efebc184c1 /src/H5B2int.c | |
| parent | 31683703d9bf394cef27805c50fc89efa29361b9 (diff) | |
| download | hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.zip hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.gz hdf5-84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb.tar.bz2 | |
[svn-r28093] Merge of r27768 and r27774 from trunk
Description:
Complete revamp of package initialization/shutdown mechanism in the library.
Each package now has a single init/term routine.
This new way should avoid packages being re-initialized during library
shutdown and is also be _much_ more proactive about giving feedback for
resource leaks internal to the library.
Introduces a new "module" header file for packages in the library
(e.g src/H5Fmodule.h) which sets up some necessary package configuration macros
for the FUNC_ENTER/LEAVE macros. (The VFL drivers have their own slightly
modified version of this header, src/H5FDdrvr_module.h)
Also cleaned up a bunch of resources leaks all across the library and tests,
along with addressing many warnings, as I encountered them.
Tested on: Ubuntu 15.04 (Linux 3.19 x86_64) gcc 4.9.2
serial and parallel (MPICH 3.1.4)
Diffstat (limited to 'src/H5B2int.c')
| -rw-r--r-- | src/H5B2int.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5B2int.c b/src/H5B2int.c index 7f53264..6c6317b 100644 --- a/src/H5B2int.c +++ b/src/H5B2int.c @@ -28,7 +28,8 @@ /* Module Setup */ /****************/ -#define H5B2_PACKAGE /*suppress error about including H5B2pkg */ +#include "H5B2module.h" /* This source code file is part of the H5B2 module */ + /***********/ /* Headers */ @@ -2603,7 +2604,7 @@ H5B2__protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, void *parent, uint16_t nrec, unsigned flags) { H5B2_leaf_cache_ud_t udata; /* User-data for callback */ - H5B2_leaf_t *ret_value; /* Return value */ + H5B2_leaf_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -2733,7 +2734,7 @@ H5B2__protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, void *parent, uint16_t nrec, uint16_t depth, unsigned flags) { H5B2_internal_cache_ud_t udata; /* User data to pass through to cache 'deserialize' callback */ - H5B2_internal_t *ret_value; /* Return value */ + H5B2_internal_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE |