diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-10-26 22:27:10 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-10-26 22:27:10 (GMT) |
| commit | ce3d1ec9ea5a7a0627d948687d64dc7e5e76f6cd (patch) | |
| tree | ddf31eb610bea93dbd800e10b30cc7e17bd71b6f /src/H5Fint.c | |
| parent | 171deaa588183b5a3a9d27a5f3f407d398ba53db (diff) | |
| download | hdf5-ce3d1ec9ea5a7a0627d948687d64dc7e5e76f6cd.zip hdf5-ce3d1ec9ea5a7a0627d948687d64dc7e5e76f6cd.tar.gz hdf5-ce3d1ec9ea5a7a0627d948687d64dc7e5e76f6cd.tar.bz2 | |
Eliminate last call to H5VL_native_register, shifting everything over to
the VOL plugin wrapping code.
Diffstat (limited to 'src/H5Fint.c')
| -rw-r--r-- | src/H5Fint.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c index 18b804b..0e35bea 100644 --- a/src/H5Fint.c +++ b/src/H5Fint.c @@ -2176,7 +2176,15 @@ H5F_get_id(H5F_t *file) if(H5I_find_id(file, H5I_FILE, &ret_value) < 0 || H5I_INVALID_HID == ret_value) { /* resurrect the ID - Register an ID with the native driver */ - if((ret_value = H5VL_native_register(H5I_FILE, file, FALSE)) < 0) +{ +void *vol_wrap_ctx = NULL; /* Object wrapping context */ + +/* Retrieve the VOL object wrap context */ +if(H5CX_get_vol_wrap_ctx((void **)&vol_wrap_ctx) < 0) + HGOTO_ERROR(H5E_VOL, H5E_CANTGET, H5I_INVALID_HID, "can't get VOL object wrap context") +HDassert(vol_wrap_ctx); +} + if((ret_value = H5VL_wrap_register(H5I_FILE, file, FALSE)) < 0) HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register group") file->id_exists = TRUE; } /* end if */ |