summaryrefslogtreecommitdiffstats
path: root/src/H5HL.c
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2021-03-04 22:06:47 (GMT)
committerGitHub <noreply@github.com>2021-03-04 22:06:47 (GMT)
commit583e9d5c323996ffdcf9534302e865d30f871da4 (patch)
tree9b1188a9b1784b488aa105748505aeba9f405177 /src/H5HL.c
parent7b23ce1686cf3383bb8666f133cf5fa4f6282096 (diff)
downloadhdf5-583e9d5c323996ffdcf9534302e865d30f871da4.zip
hdf5-583e9d5c323996ffdcf9534302e865d30f871da4.tar.gz
hdf5-583e9d5c323996ffdcf9534302e865d30f871da4.tar.bz2
1 10 Merges from develop (#424)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup JNI cleanup * format alignment * Add missing test ref file
Diffstat (limited to 'src/H5HL.c')
-rw-r--r--src/H5HL.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HL.c b/src/H5HL.c
index e277779..50d24c3 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -930,7 +930,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5HL_get_size(H5F_t *f, haddr_t add
H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */
H5HL_prfx_t * prfx = NULL; /* Local heap prefix */
- H5HL_t * heap; /* Heap data structure */
+ H5HL_t * heap = NULL; /* Heap data structure */
/* check arguments */
HDassert(f);
@@ -977,7 +977,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL, H5HL_heapsize(H5F_t *f, haddr_t add
H5HL_cache_prfx_ud_t prfx_udata; /* User data for protecting local heap prefix */
H5HL_prfx_t * prfx = NULL; /* Local heap prefix */
- H5HL_t * heap; /* Heap data structure */
+ H5HL_t * heap = NULL; /* Heap data structure */
/* check arguments */
HDassert(f);