summaryrefslogtreecommitdiffstats
path: root/src/H5HFcache.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-10-16 02:19:11 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-10-16 02:19:11 (GMT)
commit84d6d40b57ac26b73ecde3ed3ee2dad26855b9eb (patch)
tree5680e556dbb0971024bcea8911beb7efebc184c1 /src/H5HFcache.c
parent31683703d9bf394cef27805c50fc89efa29361b9 (diff)
downloadhdf5-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/H5HFcache.c')
-rw-r--r--src/H5HFcache.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 1ba0c02..ed45457 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -28,7 +28,7 @@
/* Module Setup */
/****************/
-#define H5HF_PACKAGE /*suppress error about including H5HFpkg */
+#include "H5HFmodule.h" /* This source code file is part of the H5HF module */
/***********/
@@ -483,7 +483,7 @@ H5HF__cache_hdr_deserialize(const void *_image, size_t len, void *_udata,
size_t size; /* Header size */
uint32_t stored_chksum; /* Stored metadata checksum value */
uint8_t heap_flags; /* Status flags for heap */
- void * ret_value; /* Return value */
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC
@@ -1025,7 +1025,7 @@ H5HF__cache_iblock_deserialize(const void *_image, size_t len, void *_udata,
haddr_t heap_addr; /* Address of heap header in the file */
uint32_t stored_chksum; /* Stored metadata checksum value */
unsigned u; /* Local index variable */
- void * ret_value; /* Return value */
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC
@@ -1869,7 +1869,7 @@ H5HF__cache_dblock_deserialize(const void *_image, size_t len, void *_udata,
H5HF_direct_t *dblock = NULL; /* Direct block info */
const uint8_t *image; /* Pointer into raw data buffer */
haddr_t heap_addr; /* Address of heap header in the file */
- void * ret_value; /* Return value */
+ void * ret_value = NULL; /* Return value */
FUNC_ENTER_STATIC