diff options
Diffstat (limited to 'src/H5VLnative_dataset.c')
| -rw-r--r-- | src/H5VLnative_dataset.c | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/H5VLnative_dataset.c b/src/H5VLnative_dataset.c index 92a2249..a58eb51 100644 --- a/src/H5VLnative_dataset.c +++ b/src/H5VLnative_dataset.c @@ -97,6 +97,16 @@ H5VL__native_dataset_io_setup(size_t count, void *obj[], hid_t mem_type_id[], hi /* Iterate over datasets */ for (i = 0; i < count; i++) { + /* Initialize fields not set here to prevent use of uninitialized */ + memset(&dinfo[i].layout_ops, 0, sizeof(dinfo[i].layout_ops)); + memset(&dinfo[i].io_ops, 0, sizeof(dinfo[i].io_ops)); + memset(&dinfo[i].layout_io_info, 0, sizeof(dinfo[i].layout_io_info)); + memset(&dinfo[i].type_info, 0, sizeof(dinfo[i].type_info)); + dinfo[i].store = NULL; + dinfo[i].layout = NULL; + dinfo[i].nelmts = 0; + dinfo[i].skip_io = false; + /* Set up dset */ dinfo[i].dset = (H5D_t *)obj[i]; assert(dinfo[i].dset); @@ -133,7 +143,7 @@ H5VL__native_dataset_io_setup(size_t count, void *obj[], hid_t mem_type_id[], hi dinfo[i].file_space = dinfo[i].dset->shared->space; /* Copy, but share, selection from property list to dataset's dataspace */ - if (H5S_SELECT_COPY(dinfo[i].file_space, space, TRUE) < 0) + if (H5S_SELECT_COPY(dinfo[i].file_space, space, true) < 0) HGOTO_ERROR(H5E_DATASET, H5E_CANTCOPY, FAIL, "can't copy dataset I/O selection"); } /* end else-if */ else { @@ -173,10 +183,10 @@ H5VL__native_dataset_io_setup(size_t count, void *obj[], hid_t mem_type_id[], hi } /* end else */ /* Check for valid selections */ - if (H5S_SELECT_VALID(dinfo[i].file_space) != TRUE) + if (H5S_SELECT_VALID(dinfo[i].file_space) != true) HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection + offset not within extent for file dataspace"); - if (H5S_SELECT_VALID(dinfo[i].mem_space) != TRUE) + if (H5S_SELECT_VALID(dinfo[i].mem_space) != true) HGOTO_ERROR(H5E_DATASPACE, H5E_BADRANGE, FAIL, "selection + offset not within extent for memory dataspace"); @@ -220,7 +230,7 @@ H5VL__native_dataset_io_cleanup(size_t count, hid_t mem_space_id[], hid_t file_s /* Reset file dataspace selection if it was copied from the property list */ if (H5S_PLIST == file_space_id[i] && dinfo[i].file_space) - if (H5S_select_all(dinfo[i].file_space, TRUE) < 0) + if (H5S_select_all(dinfo[i].file_space, true) < 0) HDONE_ERROR(H5E_DATASET, H5E_CANTRELEASE, FAIL, "unable to release file dataspace selection for H5S_PLIST"); } |