diff options
| author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2021-12-08 17:40:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-08 17:40:30 (GMT) |
| commit | 0247538fc5226b0899f00c45adab2a454627de02 (patch) | |
| tree | 2e56201d9a70296920e96e9ba2edb09353ce2d5f /src/H5M.c | |
| parent | 1ca806a04eb28c1b1307fcc804a45e4722ff8563 (diff) | |
| download | hdf5-0247538fc5226b0899f00c45adab2a454627de02.zip hdf5-0247538fc5226b0899f00c45adab2a454627de02.tar.gz hdf5-0247538fc5226b0899f00c45adab2a454627de02.tar.bz2 | |
VFD SWMR: Normalization with develop (#1270)
Brings many October-November changes from develop
Diffstat (limited to 'src/H5M.c')
| -rw-r--r-- | src/H5M.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -533,7 +533,7 @@ H5M__open_api_common(hid_t loc_id, const char *name, hid_t mapl_id, void **token /* Open the map */ if (H5VL_optional(*vol_obj_ptr, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, token_ptr) < 0) HGOTO_ERROR(H5E_MAP, H5E_CANTOPENOBJ, H5I_INVALID_HID, "unable to open map") - map = map_args.create.map; + map = map_args.open.map; /* Register an ID for the map */ if ((ret_value = H5VL_register(H5I_MAP, map, (*vol_obj_ptr)->connector, TRUE)) < 0) @@ -1360,6 +1360,7 @@ H5Miterate(hid_t map_id, hsize_t *idx, hid_t key_mem_type_id, H5M_iterate_t op, map_args.specific.args.iterate.loc_params.type = H5VL_OBJECT_BY_SELF; map_args.specific.args.iterate.loc_params.obj_type = H5I_get_type(map_id); map_args.specific.args.iterate.idx = (idx ? *idx : 0); + map_args.specific.args.iterate.key_mem_type_id = key_mem_type_id; map_args.specific.args.iterate.op = op; map_args.specific.args.iterate.op_data = op_data; vol_cb_args.op_type = H5VL_MAP_SPECIFIC; @@ -1450,6 +1451,7 @@ H5Miterate_by_name(hid_t loc_id, const char *map_name, hsize_t *idx, hid_t key_m map_args.specific.args.iterate.loc_params.loc_data.loc_by_name.name = map_name; map_args.specific.args.iterate.loc_params.loc_data.loc_by_name.lapl_id = lapl_id; map_args.specific.args.iterate.idx = (idx ? *idx : 0); + map_args.specific.args.iterate.key_mem_type_id = key_mem_type_id; map_args.specific.args.iterate.op = op; map_args.specific.args.iterate.op_data = op_data; vol_cb_args.op_type = H5VL_MAP_SPECIFIC; |