diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-08-21 18:44:27 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-08-21 18:44:27 (GMT) |
| commit | 563665c894c5cbe292907c609cc058b224f6ce57 (patch) | |
| tree | 47db5be394aafe14dd0de5fca748ceea6dbf2f7e /src | |
| parent | 0bbf92da01ec9d19bd498a9eb7f92c46b4b469ac (diff) | |
| parent | 7af1fa67d6d2e441c72504ed9144576a797e1e3a (diff) | |
| download | hdf5-563665c894c5cbe292907c609cc058b224f6ce57.zip hdf5-563665c894c5cbe292907c609cc058b224f6ce57.tar.gz hdf5-563665c894c5cbe292907c609cc058b224f6ce57.tar.bz2 | |
Merge branch 'feature/vfd_swmr' into multi
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Fsuper_cache.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index d1227d0..0ea9080 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -1233,9 +1233,11 @@ H5F__cache_superblock_refresh(H5F_t *f, void * _thing, const void * _image, * Allow this. */ UINT32DECODE(image, status_flags); - if ( ( status_flags != sblock->status_flags ) && - ( status_flags != 0 ) ) - HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "unexpected status_flags") + if (status_flags != sblock->status_flags && status_flags != 0) { + HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, + "read status_flags %" PRIx32 " expected %" PRIx32, + status_flags, sblock->status_flags) + } /* * If the superblock version # is greater than 0, read in the indexed @@ -1308,9 +1310,11 @@ H5F__cache_superblock_refresh(H5F_t *f, void * _thing, const void * _image, /* If the file has closed, the status flags will be zero. * Allow this. */ - if ( ( status_flags != sblock->status_flags ) && - ( status_flags != 0 ) ) - HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, "unexpected status_flags") + if (status_flags != sblock->status_flags && status_flags != 0) { + HGOTO_ERROR(H5E_FILE, H5E_BADVALUE, FAIL, + "read status_flags %" PRIx32 " expected %" PRIx32, + status_flags, sblock->status_flags) + } /* Base, superblock extension, end of file & root group object * header addresses |