summaryrefslogtreecommitdiffstats
path: root/src/H5HGcache.c
diff options
context:
space:
mode:
authorJerome Soumagne <jsoumagne@hdfgroup.org>2019-12-09 18:16:52 (GMT)
committerJerome Soumagne <jsoumagne@hdfgroup.org>2019-12-09 18:16:52 (GMT)
commit49fe497201bcefcd9beb01fe8fc2175974b73799 (patch)
tree82ec36c32198122e75c1dfa20e61678b8722f56b /src/H5HGcache.c
parent62e6349eabb00c69fa69aab0fbe34cdc092d072f (diff)
downloadhdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.zip
hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.gz
hdf5-49fe497201bcefcd9beb01fe8fc2175974b73799.tar.bz2
Revert "Merge branch 'hdf5_1_12' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into hdf5_1_12"
This reverts commit 9f9336a5bd541752f472bab4c93da8de89f862cd, reversing changes made to 437a1919e7ba60fe75a33a466d264183a0255319.
Diffstat (limited to 'src/H5HGcache.c')
-rw-r--r--src/H5HGcache.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index 9f6e73f..29e88df 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -205,7 +205,7 @@ static herr_t
H5HG__cache_heap_get_final_load_size(const void *image, size_t image_len,
void *udata, size_t *actual_len)
{
- H5HG_heap_t heap; /* Global heap */
+ H5HG_heap_t heap; /* Global heap */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@@ -217,12 +217,6 @@ H5HG__cache_heap_get_final_load_size(const void *image, size_t image_len,
HDassert(*actual_len == image_len);
HDassert(image_len == H5HG_MINSIZE);
- /* Initialize because GCC 5.5 cannot see that
- * H5HG__hdr_deserialize() initializes.
- *
- * TBD condition on compiler version.
- */
- heap.size = 0;
/* Deserialize the heap's header */
if(H5HG__hdr_deserialize(&heap, (const uint8_t *)image, (const H5F_t *)udata) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, FAIL, "can't decode global heap prefix")