diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2018-10-25 23:32:13 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2018-10-25 23:32:13 (GMT) |
| commit | 4a328957243ca7502a4c4966d6598498be43e3cd (patch) | |
| tree | b46c66d7532db54cdf010b577b9bdfcd9b2dbc8c /src/H5VLnative.c | |
| parent | 0df6e44a6e68da1614cf80b50ed7b208edaa5df7 (diff) | |
| parent | 47f30b474bdc498c20bd6d2a0ba7e8947ab389f0 (diff) | |
| download | hdf5-4a328957243ca7502a4c4966d6598498be43e3cd.zip hdf5-4a328957243ca7502a4c4966d6598498be43e3cd.tar.gz hdf5-4a328957243ca7502a4c4966d6598498be43e3cd.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into stackable_vol
Diffstat (limited to 'src/H5VLnative.c')
| -rw-r--r-- | src/H5VLnative.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5VLnative.c b/src/H5VLnative.c index d071b3a..b67caa6 100644 --- a/src/H5VLnative.c +++ b/src/H5VLnative.c @@ -40,8 +40,8 @@ #include "H5Rpkg.h" /* References */ #include "H5SMprivate.h" /* Shared Object Header Messages */ #include "H5Tpkg.h" /* Datatypes */ -#include "H5VLprivate.h" /* VOL plugins */ -#include "H5VLnative.h" /* Native VOL plugin */ +#include "H5VLprivate.h" /* VOL drivers */ +#include "H5VLnative_private.h" /* Native VOL plugin */ /* * The VOL plugin identification number. @@ -221,8 +221,8 @@ H5VL_native_init(hid_t vipl_id) /* Register the native VOL plugin, if it isn't already */ if(NULL == H5I_object_verify(H5VL_NATIVE_ID_g, H5I_VOL)) - if((H5VL_NATIVE_ID_g = H5VL_register((const H5VL_class_t *)&H5VL_native_cls_g, TRUE, vipl_id)) < 0) - HGOTO_ERROR(H5E_ATOM, H5E_CANTINSERT, H5I_INVALID_HID, "can't create ID for native VOL plugin") + if((H5VL_NATIVE_ID_g = H5VL_register_plugin((const H5VL_class_t *)&H5VL_native_cls_g, TRUE, vipl_id)) < 0) + HGOTO_ERROR(H5E_VOL, H5E_CANTINSERT, H5I_INVALID_HID, "can't create ID for native VOL plugin") /* Set return value */ ret_value = H5VL_NATIVE_ID_g; @@ -388,7 +388,7 @@ done: *--------------------------------------------------------------------------- */ hid_t -H5VL_native_register(H5I_type_t type, void *obj, hbool_t app_ref) +H5VL_native_register(H5I_type_t type, const void *obj, hbool_t app_ref) { hid_t ret_value = H5I_INVALID_HID; @@ -405,7 +405,7 @@ H5VL_native_register(H5I_type_t type, void *obj, hbool_t app_ref) HDassert(0 && "H5VL_native_register"); /* Get an ID for the object */ - if((ret_value = H5VL_object_register(obj, type, H5VL_NATIVE_ID_g, app_ref)) < 0) + if((ret_value = H5VL_register_using_vol_id(type, obj, H5VL_NATIVE_ID_g, app_ref)) < 0) HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to get an ID for the object") done: |