diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2018-09-21 17:42:06 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2018-09-21 17:42:06 (GMT) |
| commit | 5c99d4e4df67699b81f1323e27a4df935d90e465 (patch) | |
| tree | a9bdbb4c2350a82806aa801bcc86982a32aff9d9 /src/H5Cimage.c | |
| parent | f03758613a6ec83e5ddd664590d162ccc888f13e (diff) | |
| parent | 1c8916ca0e9fe3447efe205094a2b5d3d5ccf8f6 (diff) | |
| download | hdf5-5c99d4e4df67699b81f1323e27a4df935d90e465.zip hdf5-5c99d4e4df67699b81f1323e27a4df935d90e465.tar.gz hdf5-5c99d4e4df67699b81f1323e27a4df935d90e465.tar.bz2 | |
Merge pull request #1252 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:develop to develop
* commit '1c8916ca0e9fe3447efe205094a2b5d3d5ccf8f6':
Normalization with vol_integration (misc internal and datatype)
Diffstat (limited to 'src/H5Cimage.c')
| -rw-r--r-- | src/H5Cimage.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Cimage.c b/src/H5Cimage.c index 26b6506..bdab1a3 100644 --- a/src/H5Cimage.c +++ b/src/H5Cimage.c @@ -1139,22 +1139,22 @@ H5C__load_cache_image(H5F_t *f) */ if(H5F_addr_defined(cache_ptr->image_addr)) { /* Sanity checks */ - HDassert(cache_ptr->image_len > 0); + HDassert(cache_ptr->image_len > 0); HDassert(cache_ptr->image_buffer == NULL); - /* Allocate space for the image */ + /* Allocate space for the image */ if(NULL == (cache_ptr->image_buffer = H5MM_malloc(cache_ptr->image_len + 1))) HGOTO_ERROR(H5E_CACHE, H5E_CANTALLOC, FAIL, "memory allocation failed for cache image buffer") - /* Load the image from file */ - if(H5C__read_cache_image(f, cache_ptr) < 0) + /* Load the image from file */ + if(H5C__read_cache_image(f, cache_ptr) < 0) HGOTO_ERROR(H5E_CACHE, H5E_READERROR, FAIL, "Can't read metadata cache image block") - /* Reconstruct cache contents, from image */ - if(H5C__reconstruct_cache_contents(f, cache_ptr) < 0) + /* Reconstruct cache contents, from image */ + if(H5C__reconstruct_cache_contents(f, cache_ptr) < 0) HGOTO_ERROR(H5E_CACHE, H5E_CANTDECODE, FAIL, "Can't reconstruct cache contents from image block") - /* Free the image buffer */ + /* Free the image buffer */ cache_ptr->image_buffer = H5MM_xfree(cache_ptr->image_buffer); /* Update stats -- must do this now, as we are about |