diff options
author | Quincey Koziol <koziol@koziol.gov> | 2020-06-30 13:52:49 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@koziol.gov> | 2020-06-30 13:52:49 (GMT) |
commit | c005b8f52bf38dedadbb870b619fc6901f18dc41 (patch) | |
tree | 79f2024991147ccce15d55d3b8d23ed4e5953c13 /src | |
parent | c5258211e7ad24671ccd12889d3cbae3e2e5fe67 (diff) | |
parent | 267ff9065ba9f42fec05cdcae0caa90536a04392 (diff) | |
download | hdf5-c005b8f52bf38dedadbb870b619fc6901f18dc41.zip hdf5-c005b8f52bf38dedadbb870b619fc6901f18dc41.tar.gz hdf5-c005b8f52bf38dedadbb870b619fc6901f18dc41.tar.bz2 |
Merge remote-tracking branch 'origin/develop' into monotonic_timer
Diffstat (limited to 'src')
-rw-r--r-- | src/H5Fsuper.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c index e5d4cde..9fd2831 100644 --- a/src/H5Fsuper.c +++ b/src/H5Fsuper.c @@ -897,7 +897,13 @@ H5F__super_read(H5F_t *f, H5P_genplist_t *fa_plist, hbool_t initial_read) } else { if(H5F__super_ext_remove_msg(f, H5O_FSINFO_ID) < 0) + { +#if 1 /* bug fix test code -- tidy this up if all goes well */ /* JRM */ + f->shared->sblock = NULL; +#endif /* JRM */ + HGOTO_ERROR(H5E_FILE, H5E_CANTDELETE, FAIL, "error in removing message from superblock extension") + } if(H5F__super_ext_write_msg(f, H5O_FSINFO_ID, &fsinfo, TRUE, H5O_MSG_FLAG_MARK_IF_UNKNOWN) < 0) HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "error in writing fsinfo message to superblock extension") |