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/H5Oefl.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/H5Oefl.c')
-rw-r--r-- | src/H5Oefl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Oefl.c b/src/H5Oefl.c index a6b51e6..149c8b2 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -18,7 +18,7 @@ * Tuesday, November 25, 1997 */ -#define H5O_PACKAGE /*suppress error about including H5Opkg */ +#include "H5Omodule.h" /* This source code file is part of the H5O module */ #include "H5private.h" /* Generic Functions */ @@ -96,8 +96,8 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, int version; const char *s = NULL; H5HL_t *heap; - size_t u; /* Local index variable */ - void *ret_value; /* Return value */ + size_t u; /* Local index variable */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT @@ -445,9 +445,9 @@ H5O_efl_copy_file(H5F_t H5_ATTR_UNUSED *file_src, void *mesg_src, H5F_t *file_ds { H5O_efl_t *efl_src = (H5O_efl_t *) mesg_src; H5O_efl_t *efl_dst = NULL; - H5HL_t *heap = NULL; /* Pointer to local heap for EFL file names */ + H5HL_t *heap = NULL; /* Pointer to local heap for EFL file names */ size_t idx, size, name_offset, heap_size; - void *ret_value; /* Return value */ + void *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, H5AC__COPIED_TAG, NULL) |