diff options
| author | Quincey Koziol <koziol@koziol.gov> | 2019-08-23 21:54:52 (GMT) |
|---|---|---|
| committer | Jerome Soumagne <jsoumagne@hdfgroup.org> | 2019-10-08 19:30:24 (GMT) |
| commit | bf65652e9b73d66ce2a6c7a44e75e11a602eaa9e (patch) | |
| tree | 92c9bffb7a16fd8fa1264252481c4784b97bb69a /src/H5VLnative_object.c | |
| parent | fa6fdde1bfb8a29cfc86a4b441c49a63f15fd109 (diff) | |
| download | hdf5-bf65652e9b73d66ce2a6c7a44e75e11a602eaa9e.zip hdf5-bf65652e9b73d66ce2a6c7a44e75e11a602eaa9e.tar.gz hdf5-bf65652e9b73d66ce2a6c7a44e75e11a602eaa9e.tar.bz2 | |
Adapt Jerome's "file info" H5VL 'get' query to retrieve container token info.
Remove "by address" location for VOL operations. (Switching to "by token")
Diffstat (limited to 'src/H5VLnative_object.c')
| -rw-r--r-- | src/H5VLnative_object.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/H5VLnative_object.c b/src/H5VLnative_object.c index 49d4b2c..41f96e0 100644 --- a/src/H5VLnative_object.c +++ b/src/H5VLnative_object.c @@ -71,10 +71,10 @@ H5VL__native_object_open(void *obj, const H5VL_loc_params_t *loc_params, H5I_typ break; } - case H5VL_OBJECT_BY_ADDR: + case H5VL_OBJECT_BY_TOKEN: { /* Open the object */ - if(NULL == (ret_value = H5O_open_by_addr(&loc, loc_params->loc_data.loc_by_addr.addr, opened_type))) + if(NULL == (ret_value = H5O_open_by_addr(&loc, *(haddr_t *)loc_params->loc_data.loc_by_token.token, opened_type))) HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object by address") break; } @@ -225,18 +225,6 @@ H5VL__native_object_get(void *obj, const H5VL_loc_params_t *loc_params, H5VL_obj if((*ret = H5G_get_name(&loc, name, size, NULL)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't retrieve object name") } /* end if */ - else if(loc_params->type == H5VL_OBJECT_BY_ADDR) { - H5O_loc_t obj_oloc; /* Object location */ - - /* Initialize the object location */ - H5O_loc_reset(&obj_oloc); - obj_oloc.file = loc.oloc->file; - obj_oloc.addr = loc_params->loc_data.loc_by_addr.addr; - - /* Retrieve object's name */ - if((*ret = H5G_get_name_by_addr(loc.oloc->file, &obj_oloc, name, size)) < 0) - HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't determine object name") - } /* end else-if */ else HGOTO_ERROR(H5E_VOL, H5E_UNSUPPORTED, FAIL, "unknown get_name parameters") break; |