diff options
| author | David Young <dyoung@hdfgroup.org> | 2019-11-25 23:33:54 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2019-11-25 23:33:54 (GMT) |
| commit | a8892bb42d6f6e4fbc30fae0eb2b957f81c938b9 (patch) | |
| tree | 0ea0f747721993f8b9a5bd9cc475fb25de7c1b8a /src | |
| parent | 5c911d8baf3ee7fe654269088eebdf07f59a8192 (diff) | |
| parent | f907b511d06612dafc7814a7c30f2f3d2b76d52b (diff) | |
| download | hdf5-a8892bb42d6f6e4fbc30fae0eb2b957f81c938b9.zip hdf5-a8892bb42d6f6e4fbc30fae0eb2b957f81c938b9.tar.gz hdf5-a8892bb42d6f6e4fbc30fae0eb2b957f81c938b9.tar.bz2 | |
Merge pull request #2055 in HDFFV/hdf5 from ~DYOUNG/vchoi_fork:add-werror-and-squash-some to develop
* commit 'f907b511d06612dafc7814a7c30f2f3d2b76d52b':
Oops, remove more C99 designated initializers for VS 2010 compatibility.
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Fsuper_cache.c | 3 | ||||
| -rw-r--r-- | src/H5HGcache.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index b7c1dad..ce216a2 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -881,7 +881,7 @@ H5F__cache_drvrinfo_get_final_load_size(const void *_image, size_t image_len, { const uint8_t *image = _image; /* Pointer into raw data buffer */ H5F_drvrinfo_cache_ud_t *udata = (H5F_drvrinfo_cache_ud_t *)_udata; /* User data */ - H5O_drvinfo_t drvrinfo = {.len = 0}; /* Driver info */ + H5O_drvinfo_t drvrinfo; /* Driver info */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC @@ -893,6 +893,7 @@ H5F__cache_drvrinfo_get_final_load_size(const void *_image, size_t image_len, HDassert(*actual_len == image_len); HDassert(image_len == H5F_DRVINFOBLOCK_HDR_SIZE); + drvrinfo.len = 0; /* Deserialize the file driver info's prefix */ if(H5F__drvrinfo_prefix_decode(&drvrinfo, NULL, &image, udata, TRUE) < 0) HGOTO_ERROR(H5E_FILE, H5E_CANTDECODE, FAIL, "can't decode file driver info prefix") diff --git a/src/H5HGcache.c b/src/H5HGcache.c index e3d0f4c..9f6e73f 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 = {.size = 0}; /* Global heap */ + H5HG_heap_t heap; /* Global heap */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_STATIC |