mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-01-18 15:15:56 +08:00
Merge pull request #2795 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr2020:hdf5_bmr2020_addrsani to develop
* commit '5352b1dbc92313d91d3502dd8352352abe8749a7': Fixed typo Fix HDFFV-11101
This commit is contained in:
commit
3f5382bb62
@ -98,7 +98,7 @@ int main () {
|
|||||||
|
|
||||||
for (i=0; i<numfilt; i++) {
|
for (i=0; i<numfilt; i++) {
|
||||||
nelmts = 0;
|
nelmts = 0;
|
||||||
filter_type = H5Pget_filter2 (plist_id, 0, &flags, &nelmts, NULL, 0, NULL,
|
filter_type = H5Pget_filter2 (plist_id, i, &flags, &nelmts, NULL, 0, NULL,
|
||||||
&filter_info);
|
&filter_info);
|
||||||
printf ("Filter Type: ");
|
printf ("Filter Type: ");
|
||||||
switch (filter_type) {
|
switch (filter_type) {
|
||||||
|
@ -2645,6 +2645,10 @@ H5MF_settle_raw_data_fsm(H5F_t *f, hbool_t *fsm_settled)
|
|||||||
HDassert(f->shared);
|
HDassert(f->shared);
|
||||||
HDassert(fsm_settled);
|
HDassert(fsm_settled);
|
||||||
|
|
||||||
|
/* Initialize structs */
|
||||||
|
HDmemset(&fsinfo, 0, sizeof(fsinfo));
|
||||||
|
HDmemset(&fs_stat, 0, sizeof(fs_stat));
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Only need to settle things if we are persisting free space and
|
* Only need to settle things if we are persisting free space and
|
||||||
* the private property in f->shared->null_fsm_addr is not enabled.
|
* the private property in f->shared->null_fsm_addr is not enabled.
|
||||||
|
@ -11334,6 +11334,9 @@ test_bt2_hdr_fd(const char *env_h5_driver, hid_t fapl)
|
|||||||
|
|
||||||
TESTING("Version 2 B-tree chunk index header flush dependencies handled correctly");
|
TESTING("Version 2 B-tree chunk index header flush dependencies handled correctly");
|
||||||
|
|
||||||
|
/* Initialize struct */
|
||||||
|
HDmemset(&info, 0, sizeof(info));
|
||||||
|
|
||||||
/* Skip this test if SWMR I/O is not supported for the VFD specified
|
/* Skip this test if SWMR I/O is not supported for the VFD specified
|
||||||
* by the environment variable.
|
* by the environment variable.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user