diff options
Diffstat (limited to 'src/H5VLint.c')
| -rw-r--r-- | src/H5VLint.c | 110 |
1 files changed, 54 insertions, 56 deletions
diff --git a/src/H5VLint.c b/src/H5VLint.c index 9cf55c9..b7f6e5e 100644 --- a/src/H5VLint.c +++ b/src/H5VLint.c @@ -86,8 +86,7 @@ typedef struct { static herr_t H5VL__free_cls(H5VL_class_t *cls, void **request); static int H5VL__get_connector_cb(void *obj, hid_t id, void *_op_data); static void *H5VL__wrap_obj(void *obj, H5I_type_t obj_type); -static H5VL_object_t *H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, - hbool_t wrap_obj); +static H5VL_object_t *H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, bool wrap_obj); static void *H5VL__object(hid_t id, H5I_type_t obj_type); static herr_t H5VL__free_vol_wrapper(H5VL_wrap_ctx_t *vol_wrap_ctx); @@ -244,7 +243,7 @@ H5VL_term_package(void) else { if (H5I_nmembers(H5I_VOL) > 0) { /* Unregister all VOL connectors */ - (void)H5I_clear_type(H5I_VOL, TRUE, FALSE); + (void)H5I_clear_type(H5I_VOL, true, false); n++; } /* end if */ else { @@ -395,25 +394,25 @@ H5VL__set_def_conn(void) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't check if VOL connector already registered"); else if (connector_is_registered) { /* Retrieve the ID of the already-registered VOL connector */ - if ((connector_id = H5VL__get_connector_id_by_name(tok, FALSE)) < 0) + if ((connector_id = H5VL__get_connector_id_by_name(tok, false)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTGET, FAIL, "can't get VOL connector ID"); } /* end else-if */ else { /* Check for VOL connectors that ship with the library */ if (!HDstrcmp(tok, "native")) { connector_id = H5VL_NATIVE; - if (H5I_inc_ref(connector_id, FALSE) < 0) + if (H5I_inc_ref(connector_id, false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINC, FAIL, "can't increment VOL connector refcount"); } /* end if */ else if (!HDstrcmp(tok, "pass_through")) { connector_id = H5VL_PASSTHRU; - if (H5I_inc_ref(connector_id, FALSE) < 0) + if (H5I_inc_ref(connector_id, false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINC, FAIL, "can't increment VOL connector refcount"); } /* end else-if */ else { /* Register the VOL connector */ /* (NOTE: No provisions for vipl_id currently) */ - if ((connector_id = H5VL__register_connector_by_name(tok, TRUE, H5P_VOL_INITIALIZE_DEFAULT)) < + if ((connector_id = H5VL__register_connector_by_name(tok, true, H5P_VOL_INITIALIZE_DEFAULT)) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTREGISTER, FAIL, "can't register connector"); } /* end else */ @@ -434,7 +433,7 @@ H5VL__set_def_conn(void) H5VL_def_conn_s.connector_info = NULL; /* Increment the ref count on the default connector */ - if (H5I_inc_ref(H5VL_def_conn_s.connector_id, FALSE) < 0) + if (H5I_inc_ref(H5VL_def_conn_s.connector_id, false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINC, FAIL, "can't increment VOL connector refcount"); } /* end else */ @@ -524,10 +523,10 @@ done: *------------------------------------------------------------------------- */ static H5VL_object_t * -H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t wrap_obj) +H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, bool wrap_obj) { H5VL_object_t *new_vol_obj = NULL; /* Pointer to new VOL object */ - hbool_t conn_rc_incr = FALSE; /* Whether the VOL connector refcount has been incremented */ + bool conn_rc_incr = false; /* Whether the VOL connector refcount has been incremented */ H5VL_object_t *ret_value = NULL; /* Return value */ FUNC_ENTER_PACKAGE @@ -555,7 +554,7 @@ H5VL__new_vol_obj(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t /* Bump the reference count on the VOL connector */ H5VL_conn_inc_rc(vol_connector); - conn_rc_incr = TRUE; + conn_rc_incr = true; /* If this is a datatype, we have to hide the VOL object under the H5T_t pointer */ if (H5I_DATATYPE == type) { @@ -598,7 +597,7 @@ H5VL_conn_copy(H5VL_connector_prop_t *connector_prop) /* Copy the connector ID & info, if there is one */ if (connector_prop->connector_id > 0) { /* Increment the reference count on connector ID and copy connector info */ - if (H5I_inc_ref(connector_prop->connector_id, FALSE) < 0) + if (H5I_inc_ref(connector_prop->connector_id, false) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINC, FAIL, "unable to increment ref count on VOL connector ID"); @@ -676,7 +675,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t app_ref) +H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_connector, bool app_ref) { H5VL_object_t *vol_obj = NULL; /* VOL object wrapper for library object */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -689,7 +688,7 @@ H5VL_register(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t app_ /* Set up VOL object for the passed-in data */ /* (Does not wrap object, since it's from a VOL callback) */ - if (NULL == (vol_obj = H5VL__new_vol_obj(type, object, vol_connector, FALSE))) + if (NULL == (vol_obj = H5VL__new_vol_obj(type, object, vol_connector, false))) HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "can't create VOL object"); /* Register VOL object as _object_ type, for future object API calls */ @@ -719,7 +718,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_connector, hbool_t app_ref, +H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_connector, bool app_ref, hid_t existing_id) { H5VL_object_t *new_vol_obj = NULL; /* Pointer to new VOL object */ @@ -733,7 +732,7 @@ H5VL_register_using_existing_id(H5I_type_t type, void *object, H5VL_t *vol_conne /* Set up VOL object for the passed-in data */ /* (Wraps object, since it's a library object) */ - if (NULL == (new_vol_obj = H5VL__new_vol_obj(type, object, vol_connector, TRUE))) + if (NULL == (new_vol_obj = H5VL__new_vol_obj(type, object, vol_connector, true))) HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, FAIL, "can't create VOL object"); /* Call the underlying H5I function to complete the registration */ @@ -759,7 +758,7 @@ H5VL_new_connector(hid_t connector_id) { H5VL_class_t *cls = NULL; /* VOL connector class */ H5VL_t *connector = NULL; /* New VOL connector struct */ - hbool_t conn_id_incr = FALSE; /* Whether the VOL connector ID has been incremented */ + bool conn_id_incr = false; /* Whether the VOL connector ID has been incremented */ H5VL_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -773,9 +772,9 @@ H5VL_new_connector(hid_t connector_id) HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, NULL, "can't allocate VOL connector struct"); connector->cls = cls; connector->id = connector_id; - if (H5I_inc_ref(connector->id, FALSE) < 0) + if (H5I_inc_ref(connector->id, false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINC, NULL, "unable to increment ref count on VOL connector"); - conn_id_incr = TRUE; + conn_id_incr = true; /* Set return value */ ret_value = connector; @@ -808,7 +807,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_register_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id, hbool_t app_ref) +H5VL_register_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id, bool app_ref) { H5VL_t *connector = NULL; /* VOL connector struct */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -891,7 +890,7 @@ H5VL_create_object_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id) { H5VL_class_t *cls = NULL; /* VOL connector class */ H5VL_t *connector = NULL; /* VOL connector struct */ - hbool_t conn_id_incr = FALSE; /* Whether the VOL connector ID has been incremented */ + bool conn_id_incr = false; /* Whether the VOL connector ID has been incremented */ H5VL_object_t *ret_value = NULL; /* Return value */ FUNC_ENTER_NOAPI(NULL) @@ -905,13 +904,13 @@ H5VL_create_object_using_vol_id(H5I_type_t type, void *obj, hid_t connector_id) HGOTO_ERROR(H5E_VOL, H5E_CANTALLOC, NULL, "can't allocate VOL info struct"); connector->cls = cls; connector->id = connector_id; - if (H5I_inc_ref(connector->id, FALSE) < 0) + if (H5I_inc_ref(connector->id, false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTINC, NULL, "unable to increment ref count on VOL connector"); - conn_id_incr = TRUE; + conn_id_incr = true; /* Set up VOL object for the passed-in data */ /* (Wraps object, since it's a library object) */ - if (NULL == (ret_value = H5VL__new_vol_obj(type, obj, connector, TRUE))) + if (NULL == (ret_value = H5VL__new_vol_obj(type, obj, connector, true))) HGOTO_ERROR(H5E_VOL, H5E_CANTCREATE, NULL, "can't create VOL object"); done: @@ -1059,7 +1058,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_object_is_native(const H5VL_object_t *obj, hbool_t *is_native) +H5VL_object_is_native(const H5VL_object_t *obj, bool *is_native) { const H5VL_class_t *cls; /* VOL connector class structs for object */ const H5VL_class_t *native_cls; /* Native VOL connector class structs */ @@ -1102,7 +1101,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_file_is_same(const H5VL_object_t *vol_obj1, const H5VL_object_t *vol_obj2, hbool_t *same_file) +H5VL_file_is_same(const H5VL_object_t *vol_obj1, const H5VL_object_t *vol_obj2, bool *same_file) { const H5VL_class_t *cls1; /* VOL connector class struct for first object */ const H5VL_class_t *cls2; /* VOL connector class struct for second object */ @@ -1130,7 +1129,7 @@ H5VL_file_is_same(const H5VL_object_t *vol_obj1, const H5VL_object_t *vol_obj2, /* If the connector classes are different, the files are different */ if (cmp_value) - *same_file = FALSE; + *same_file = false; else { void *obj2; /* Terminal object for second file */ H5VL_file_specific_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -1167,7 +1166,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__register_connector(const void *_cls, hbool_t app_ref, hid_t vipl_id) +H5VL__register_connector(const void *_cls, bool app_ref, hid_t vipl_id) { const H5VL_class_t *cls = (const H5VL_class_t *)_cls; H5VL_class_t *saved = NULL; @@ -1221,7 +1220,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__register_connector_by_class(const H5VL_class_t *cls, hbool_t app_ref, hid_t vipl_id) +H5VL__register_connector_by_class(const H5VL_class_t *cls, bool app_ref, hid_t vipl_id) { H5VL_get_connector_ud_t op_data; /* Callback info for connector search */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1255,7 +1254,7 @@ H5VL__register_connector_by_class(const H5VL_class_t *cls, hbool_t app_ref, hid_ op_data.found_id = H5I_INVALID_HID; /* Check if connector is already registered */ - if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, TRUE) < 0) + if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, true) < 0) HGOTO_ERROR(H5E_VOL, H5E_BADITER, H5I_INVALID_HID, "can't iterate over VOL IDs"); /* Increment the ref count on the existing VOL connector ID, if it's already registered */ @@ -1290,7 +1289,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__register_connector_by_name(const char *name, hbool_t app_ref, hid_t vipl_id) +H5VL__register_connector_by_name(const char *name, bool app_ref, hid_t vipl_id) { H5VL_get_connector_ud_t op_data; /* Callback info for connector search */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1347,7 +1346,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__register_connector_by_value(H5VL_class_value_t value, hbool_t app_ref, hid_t vipl_id) +H5VL__register_connector_by_value(H5VL_class_value_t value, bool app_ref, hid_t vipl_id) { H5VL_get_connector_ud_t op_data; /* Callback info for connector search */ hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1404,7 +1403,7 @@ htri_t H5VL__is_connector_registered_by_name(const char *name) { H5VL_get_connector_ud_t op_data; /* Callback info for connector search */ - htri_t ret_value = FALSE; /* Return value */ + htri_t ret_value = false; /* Return value */ FUNC_ENTER_PACKAGE @@ -1414,12 +1413,12 @@ H5VL__is_connector_registered_by_name(const char *name) op_data.found_id = H5I_INVALID_HID; /* Find connector with name */ - if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, TRUE) < 0) + if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, true) < 0) HGOTO_ERROR(H5E_VOL, H5E_BADITER, FAIL, "can't iterate over VOL connectors"); /* Found a connector with that name */ if (op_data.found_id != H5I_INVALID_HID) - ret_value = TRUE; + ret_value = true; done: FUNC_LEAVE_NOAPI(ret_value) @@ -1441,7 +1440,7 @@ htri_t H5VL__is_connector_registered_by_value(H5VL_class_value_t value) { H5VL_get_connector_ud_t op_data; /* Callback info for connector search */ - htri_t ret_value = FALSE; /* Return value */ + htri_t ret_value = false; /* Return value */ FUNC_ENTER_PACKAGE @@ -1451,12 +1450,12 @@ H5VL__is_connector_registered_by_value(H5VL_class_value_t value) op_data.found_id = H5I_INVALID_HID; /* Find connector with value */ - if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, TRUE) < 0) + if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, true) < 0) HGOTO_ERROR(H5E_VOL, H5E_BADITER, FAIL, "can't iterate over VOL connectors"); /* Found a connector with that name */ if (op_data.found_id != H5I_INVALID_HID) - ret_value = TRUE; + ret_value = true; done: FUNC_LEAVE_NOAPI(ret_value) @@ -1473,7 +1472,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__get_connector_id(hid_t obj_id, hbool_t is_api) +H5VL__get_connector_id(hid_t obj_id, bool is_api) { H5VL_object_t *vol_obj = NULL; hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1504,7 +1503,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__get_connector_id_by_name(const char *name, hbool_t is_api) +H5VL__get_connector_id_by_name(const char *name, bool is_api) { hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1534,7 +1533,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL__get_connector_id_by_value(H5VL_class_value_t value, hbool_t is_api) +H5VL__get_connector_id_by_value(H5VL_class_value_t value, bool is_api) { hid_t ret_value = H5I_INVALID_HID; /* Return value */ @@ -1578,7 +1577,7 @@ H5VL__peek_connector_id_by_name(const char *name) op_data.found_id = H5I_INVALID_HID; /* Find connector with name */ - if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, TRUE) < 0) + if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, true) < 0) HGOTO_ERROR(H5E_VOL, H5E_BADITER, H5I_INVALID_HID, "can't iterate over VOL connectors"); /* Set return value */ @@ -1614,7 +1613,7 @@ H5VL__peek_connector_id_by_value(H5VL_class_value_t value) op_data.found_id = H5I_INVALID_HID; /* Find connector with value */ - if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, TRUE) < 0) + if (H5I_iterate(H5I_VOL, H5VL__get_connector_cb, &op_data, true) < 0) HGOTO_ERROR(H5E_VOL, H5E_BADITER, H5I_INVALID_HID, "can't iterate over VOL connectors"); /* Set return value */ @@ -2118,7 +2117,7 @@ H5VL_finish_lib_state(void) FUNC_ENTER_NOAPI(FAIL) /* Pop the API context off the stack */ - if (H5CX_pop(FALSE) < 0) + if (H5CX_pop(false) < 0) HGOTO_ERROR(H5E_VOL, H5E_CANTRESET, FAIL, "can't pop API context"); done: @@ -2388,7 +2387,7 @@ done: *------------------------------------------------------------------------- */ hid_t -H5VL_wrap_register(H5I_type_t type, void *obj, hbool_t app_ref) +H5VL_wrap_register(H5I_type_t type, void *obj, bool app_ref) { H5VL_wrap_ctx_t *vol_wrap_ctx = NULL; /* Object wrapping context */ void *new_obj; /* Newly wrapped object */ @@ -2411,7 +2410,7 @@ H5VL_wrap_register(H5I_type_t type, void *obj, hbool_t app_ref) */ if (type == H5I_DATATYPE) if (vol_wrap_ctx->connector->id == H5VL_NATIVE) - if (TRUE == H5T_already_vol_managed((const H5T_t *)obj)) + if (true == H5T_already_vol_managed((const H5T_t *)obj)) HGOTO_ERROR(H5E_VOL, H5E_BADTYPE, H5I_INVALID_HID, "can't wrap an uncommitted datatype"); /* Wrap the object with VOL connector info */ @@ -2435,7 +2434,7 @@ done: * Note: Matching the connector's name / value, but the connector * having an incompatible version is not an error, but means * that the connector isn't a "match". Setting the SUCCEED - * value to FALSE and not failing for that case allows the + * value to false and not failing for that case allows the * plugin framework to keep looking for other DLLs that match * and have a compatible version. * @@ -2444,7 +2443,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t *success) +H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, bool *success) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2459,7 +2458,7 @@ H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t * if (key->vol.kind == H5VL_GET_CONNECTOR_BY_NAME) { /* Check if plugin name matches VOL connector class name */ if (cls->name && !HDstrcmp(cls->name, key->vol.u.name)) - *success = TRUE; + *success = true; } /* end if */ else { /* Sanity check */ @@ -2467,12 +2466,12 @@ H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t * /* Check if plugin value matches VOL connector class value */ if (cls->value == key->vol.u.value) - *success = TRUE; + *success = true; } /* end else */ /* Connector is a match, but might not be a compatible version */ if (*success && cls->version != H5VL_VERSION) - *success = FALSE; + *success = false; FUNC_LEAVE_NOAPI(ret_value) } /* end H5VL_check_plugin_load() */ @@ -2487,7 +2486,7 @@ H5VL_check_plugin_load(const H5VL_class_t *cls, const H5PL_key_t *key, hbool_t * *------------------------------------------------------------------------- */ void -H5VL__is_default_conn(hid_t fapl_id, hid_t connector_id, hbool_t *is_default) +H5VL__is_default_conn(hid_t fapl_id, hid_t connector_id, bool *is_default) { FUNC_ENTER_PACKAGE_NOERR @@ -2581,7 +2580,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_setup_acc_args(hid_t loc_id, const H5P_libclass_t *libclass, hbool_t is_collective, hid_t *acspl_id, +H5VL_setup_acc_args(hid_t loc_id, const H5P_libclass_t *libclass, bool is_collective, hid_t *acspl_id, H5VL_object_t **vol_obj, H5VL_loc_params_t *loc_params) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2652,7 +2651,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5VL_setup_name_args(hid_t loc_id, const char *name, hbool_t is_collective, hid_t lapl_id, +H5VL_setup_name_args(hid_t loc_id, const char *name, bool is_collective, hid_t lapl_id, H5VL_object_t **vol_obj, H5VL_loc_params_t *loc_params) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2698,8 +2697,7 @@ done: */ herr_t H5VL_setup_idx_args(hid_t loc_id, const char *name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n, - hbool_t is_collective, hid_t lapl_id, H5VL_object_t **vol_obj, - H5VL_loc_params_t *loc_params) + bool is_collective, hid_t lapl_id, H5VL_object_t **vol_obj, H5VL_loc_params_t *loc_params) { herr_t ret_value = SUCCEED; /* Return value */ |