diff options
| author | Jacob Smith <jake.smith@hdfgroup.org> | 2018-12-12 23:27:27 (GMT) |
|---|---|---|
| committer | Jacob Smith <jake.smith@hdfgroup.org> | 2018-12-12 23:27:27 (GMT) |
| commit | 911b8e8fc21df6ace6b8132263101ac25019efe7 (patch) | |
| tree | fc53b0432dcd651b647f72bf76090cb64571009c | |
| parent | ea7332525010ef75e27ce5800cf65dd91ba43576 (diff) | |
| parent | 5a38ab71be7d31768e8d3ffbeee4859baf1eee54 (diff) | |
| download | hdf5-911b8e8fc21df6ace6b8132263101ac25019efe7.zip hdf5-911b8e8fc21df6ace6b8132263101ac25019efe7.tar.gz hdf5-911b8e8fc21df6ace6b8132263101ac25019efe7.tar.bz2 | |
Merge branch 'dset_ohdr_minimize' of https://bitbucket.hdfgroup.org/scm/~jake.smith/hdf5 into dset_ohdr_minimize
Incorporate a few housekeeping changes and one fix.
| -rw-r--r-- | src/H5Dint.c | 5 | ||||
| -rw-r--r-- | test/tsohm.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index b980223..793b3ed 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -1021,11 +1021,6 @@ H5D__update_oh_info(H5F_t *file, H5D_t *dset, hid_t dapl_id) if(NULL == (oh = H5O_pin(oloc))) HGOTO_ERROR(H5E_DATASET, H5E_CANTPIN, FAIL, "unable to pin dataset object header") -#if 0 - HDprintf("DATATYPE SIZE: %lu\n", - H5O_msg_size_oh(file, oh, H5O_DTYPE_ID, type, 0)); -#endif /* TESTING DEBUG */ - /* Write the dataspace header message */ if(H5S_append(file, oh, dset->shared->space) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to update dataspace header message") diff --git a/test/tsohm.c b/test/tsohm.c index 2df389e..32ac1e5 100644 --- a/test/tsohm.c +++ b/test/tsohm.c @@ -3494,7 +3494,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) * Macro: TSOHM_EDH_VERIFY_SPACES * * Purpose: Encapsulate a common pattern - * Open, read-verity, and close the dataspaces for datasets 1-3 + * Open, read-verify, and close the dataspaces for datasets 1-3 * * Programmer: Jacob Smith * 2018 November 5 @@ -3570,7 +3570,7 @@ verify_dataset_extension(hid_t fcpl_id, hbool_t close_reopen) } \ if ((n) > 2) { \ dset3_id = H5Dopen2(file_id, "dataset3", H5P_DEFAULT); \ - CHECK_I(dset2_id, "H5Dopen2"); \ + CHECK_I(dset3_id, "H5Dopen2"); \ } \ } /* define TSOHM_EDH_CLOSE_REOPEN_FILE_AND_DSETS */ |