mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-02-11 16:01:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use C99 designated initializers, they're not compatible with

Browse Source 
Visual Studio 2010.
This commit is contained in:
David Young 2019-11-25 15:43:56 -06:00
parent edd5297143
commit f2f8a554e6
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/H5Fsuper_cache.c
View File

@ -349,11 +349,7 @@ H5F__cache_superblock_get_final_load_size(const void *_image, size_t image_len,
{
const uint8_t *image = _image; /* Pointer into raw data buffer */
H5F_superblock_cache_ud_t *udata = (H5F_superblock_cache_ud_t *)_udata; /* User data */
/* Temporary file superblock, initialized because GCC 5.5 does not
* realize that H5F__superblock_prefix_decode() initializes it.
* TBD condition on compiler version.
*/
H5F_super_t sblock = {.super_vers = 0, .sizeof_addr = 0, .sizeof_size = 0};
H5F_super_t sblock; /* Temporary file superblock */
htri_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@ -365,6 +361,15 @@ H5F__cache_superblock_get_final_load_size(const void *_image, size_t image_len,
HDassert(*actual_len == image_len);
HDassert(image_len >= H5F_SUPERBLOCK_FIXED_SIZE + 6);
/* Initialize because GCC 5.5 does not realize that
* H5F__superblock_prefix_decode() initializes it.
*
* TBD condition on compiler version.
*/
sblock.super_vers = 0;
sblock.sizeof_addr = 0;
sblock.sizeof_size = 0;
/* Deserialize the file superblock's prefix */
if(H5F__superblock_prefix_decode(&sblock, &image, udata, TRUE) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTDECODE, FAIL, "can't decode file superblock prefix")

13
src/H5HFcache.c
View File

@ -406,12 +406,7 @@ static herr_t
H5HF__cache_hdr_get_final_load_size(const void *_image, size_t image_len,
void *_udata, size_t *actual_len)
{
/* Temporary fractal heap header, initialized because GCC 5.5 does
* not realize that the H5HF__hdr_prefix_decode() call is sufficient
* to initialize. GCC 8 is clever enough to see that the variable
* is initialized. TBD condition on compiler version.
*/
H5HF_hdr_t hdr = {.filter_len = 0};
H5HF_hdr_t hdr; /* Temporary fractal heap header */
const uint8_t *image = (const uint8_t *)_image; /* Pointer into into supplied image */
H5HF_hdr_cache_ud_t *udata = (H5HF_hdr_cache_ud_t *)_udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
@ -424,6 +419,12 @@ H5HF__cache_hdr_get_final_load_size(const void *_image, size_t image_len,
HDassert(actual_len);
HDassert(*actual_len == image_len);
/* Initialize because GCC 5.5 does not realize that the
* H5HF__hdr_prefix_decode() call is sufficient to initialize.
* GCC 8 is clever enough to see that the variable is initialized.
* TBD condition on compiler version.
*/
hdr.filter_len = 0;
/* Deserialize the fractal heap header's prefix */
if(H5HF__hdr_prefix_decode(&hdr, &image) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTDECODE, FAIL, "can't decode fractal heap header prefix")

12
src/H5HGcache.c
View File

@ -205,11 +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)
{
/* Global heap, initialized because GCC 5.5 cannot see that
* H5HG__hdr_deserialize() initializes. TBD condition on compiler
* version.
*/
H5HG_heap_t heap = {.size = 0};
H5HG_heap_t heap = {.size = 0}; /* Global heap */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_STATIC
@ -221,6 +217,12 @@ 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")