diff options
author | Dana Robinson <43805+derobins@users.noreply.github.com> | 2023-09-05 21:52:30 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-05 21:52:30 (GMT) |
commit | 8253ab9ebf6a082dc07eb931f27b169d6a45d577 (patch) | |
tree | 47630856491e54f5d28e1608ffa5e2f976dc9c95 /src/H5T.c | |
parent | 920869796031ed4ee9c1fbea8aaccda3592a88b3 (diff) | |
download | hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.zip hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.tar.gz hdf5-8253ab9ebf6a082dc07eb931f27b169d6a45d577.tar.bz2 |
Convert hbool_t --> bool in src (#3496)
* hbool_t --> bool in src
* Does not remove TRUE/FALSE
* Public header files are unchanged
* Public API calls are unchanged
* TRUE/FALSE --> true/false in src
* Add deprecation notice for hbool_t
Diffstat (limited to 'src/H5T.c')
-rw-r--r-- | src/H5T.c | 286 |
1 files changed, 143 insertions, 143 deletions
@@ -251,7 +251,7 @@ { \ H5T_INIT_TYPE_ALLOC_COMMON(H5T_REFERENCE) \ H5T_INIT_TYPE_NUM_COMMON(H5T_ORDER_NONE) \ - dt->shared->force_conv = TRUE; \ + dt->shared->force_conv = true; \ dt->shared->u.atomic.u.r.file = NULL; \ dt->shared->u.atomic.u.r.loc = H5T_LOC_BADLOC; \ dt->shared->u.atomic.u.r.cls = NULL; \ @@ -261,7 +261,7 @@ { \ H5T_INIT_TYPE_REF_COMMON \ dt->shared->u.atomic.u.r.rtype = H5R_OBJECT1; \ - dt->shared->u.atomic.u.r.opaque = FALSE; \ + dt->shared->u.atomic.u.r.opaque = false; \ dt->shared->u.atomic.u.r.version = 0; \ } @@ -269,7 +269,7 @@ { \ H5T_INIT_TYPE_REF_COMMON \ dt->shared->u.atomic.u.r.rtype = H5R_DATASET_REGION1; \ - dt->shared->u.atomic.u.r.opaque = FALSE; \ + dt->shared->u.atomic.u.r.opaque = false; \ dt->shared->u.atomic.u.r.version = 0; \ } @@ -280,7 +280,7 @@ { \ H5T_INIT_TYPE_REF_COMMON \ dt->shared->u.atomic.u.r.rtype = H5R_OBJECT2; \ - dt->shared->u.atomic.u.r.opaque = TRUE; \ + dt->shared->u.atomic.u.r.opaque = true; \ dt->shared->u.atomic.u.r.version = H5R_ENCODE_VERSION; \ dt->shared->version = H5O_DTYPE_VERSION_4; \ } @@ -326,7 +326,7 @@ H5_GLUE3(H5T_INIT_TYPE_, GUTS, _CORE) \ \ /* Register result */ \ - if (((GLOBAL) = H5I_register(H5I_DATATYPE, dt, FALSE)) < 0) \ + if (((GLOBAL) = H5I_register(H5I_DATATYPE, dt, false)) < 0) \ HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype atom"); \ } @@ -349,12 +349,12 @@ static herr_t H5T__set_size(H5T_t *dt, size_t size); static herr_t H5T__close_cb(H5T_t *dt, void **request); static H5T_path_t *H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_conv_func_t *conv); -static hbool_t H5T__detect_vlen_ref(const H5T_t *dt); +static bool H5T__detect_vlen_ref(const H5T_t *dt); static H5T_t *H5T__initiate_copy(const H5T_t *old_dt); static H5T_t *H5T__copy_transient(H5T_t *old_dt); static H5T_t *H5T__copy_all(H5T_t *old_dt); static herr_t H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, - hbool_t set_memory_type, H5T_copy_func_t copyfn); + bool set_memory_type, H5T_copy_func_t copyfn); /*****************************/ /* Library Private Variables */ @@ -612,9 +612,9 @@ H5T__init_inf(void) /* +Inf */ d = (uint8_t *)&H5T_NATIVE_FLOAT_POS_INF_g; - H5T__bit_set(d, dst->u.f.sign, (size_t)1, FALSE); - H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, TRUE); - H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE); + H5T__bit_set(d, dst->u.f.sign, (size_t)1, false); + H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, true); + H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, false); /* Swap the bytes if the machine architecture is big-endian */ if (H5T_ORDER_BE == H5T_native_order_g) { @@ -628,9 +628,9 @@ H5T__init_inf(void) /* -Inf */ d = (uint8_t *)&H5T_NATIVE_FLOAT_NEG_INF_g; - H5T__bit_set(d, dst->u.f.sign, (size_t)1, TRUE); - H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, TRUE); - H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE); + H5T__bit_set(d, dst->u.f.sign, (size_t)1, true); + H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, true); + H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, false); /* Swap the bytes if the machine architecture is big-endian */ if (H5T_ORDER_BE == H5T_native_order_g) { @@ -653,9 +653,9 @@ H5T__init_inf(void) /* +Inf */ d = (uint8_t *)&H5T_NATIVE_DOUBLE_POS_INF_g; - H5T__bit_set(d, dst->u.f.sign, (size_t)1, FALSE); - H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, TRUE); - H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE); + H5T__bit_set(d, dst->u.f.sign, (size_t)1, false); + H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, true); + H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, false); /* Swap the bytes if the machine architecture is big-endian */ if (H5T_ORDER_BE == H5T_native_order_g) { @@ -669,9 +669,9 @@ H5T__init_inf(void) /* -Inf */ d = (uint8_t *)&H5T_NATIVE_DOUBLE_NEG_INF_g; - H5T__bit_set(d, dst->u.f.sign, (size_t)1, TRUE); - H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, TRUE); - H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, FALSE); + H5T__bit_set(d, dst->u.f.sign, (size_t)1, true); + H5T__bit_set(d, dst->u.f.epos, dst->u.f.esize, true); + H5T__bit_set(d, dst->u.f.mpos, dst->u.f.msize, false); /* Swap the bytes if the machine architecture is big-endian */ if (H5T_ORDER_BE == H5T_native_order_g) { @@ -734,8 +734,8 @@ H5T_init(void) H5T_t *ref = NULL; /* Datatype structure for opaque references */ hsize_t dim[1] = {1}; /* Dimension info for array datatype */ herr_t status; - hbool_t copied_dtype = - TRUE; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */ + bool copied_dtype = + true; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */ herr_t ret_value = SUCCEED; /* Return value */ FUNC_ENTER_NOAPI(FAIL) @@ -813,8 +813,8 @@ H5T_init(void) /* herr_t */ H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HERR_g, COPY, native_int, SET, sizeof(herr_t)) - /* hbool_t */ - H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HBOOL_g, COPY, native_uint, SET, sizeof(hbool_t)) + /* bool */ + H5T_INIT_TYPE(OFFSET, H5T_NATIVE_HBOOL_g, COPY, native_uint, SET, sizeof(bool)) /*------------------------------------------------------------ * IEEE Types @@ -955,7 +955,7 @@ H5T_init(void) /* Indicate that the types that are created from here down are allocated * H5FL_ALLOC(), not copied with H5T_copy() */ - copied_dtype = FALSE; + copied_dtype = false; /* Opaque data */ H5T_INIT_TYPE(OPAQ, H5T_NATIVE_OPAQUE_g, ALLOC, -, SET, 1) @@ -1388,7 +1388,7 @@ H5T_init(void) assert(H5P_CLS_DATATYPE_CREATE_g != NULL); /* Register the default datatype creation property list */ - if ((H5P_LST_DATATYPE_CREATE_ID_g = H5P_create_id(H5P_CLS_DATATYPE_CREATE_g, FALSE)) < 0) + if ((H5P_LST_DATATYPE_CREATE_ID_g = H5P_create_id(H5P_CLS_DATATYPE_CREATE_g, false)) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't insert property into class"); } /* end if */ @@ -1535,11 +1535,11 @@ H5T_top_term_package(void) /* Unlock all datatypes, then free them */ /* note that we are ignoring the return value from H5I_iterate() */ /* Also note that we are incrementing 'n' in the callback */ - H5I_iterate(H5I_DATATYPE, H5T__unlock_cb, &n, FALSE); + H5I_iterate(H5I_DATATYPE, H5T__unlock_cb, &n, false); /* Release all datatype IDs */ if (H5I_nmembers(H5I_DATATYPE) > 0) { - (void)H5I_clear_type(H5I_DATATYPE, FALSE, FALSE); + (void)H5I_clear_type(H5I_DATATYPE, false, false); n++; /*H5I*/ } /* end if */ @@ -1753,7 +1753,7 @@ H5Tcreate(H5T_class_t type, size_t size) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to create type"); /* Get an ID for the datatype */ - if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0) + if ((ret_value = H5I_register(H5I_DATATYPE, dt, true)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype ID"); done: @@ -1848,7 +1848,7 @@ H5Tcopy(hid_t obj_id) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5I_INVALID_HID, "unable to copy"); /* Get an ID for the copied datatype */ - if ((ret_value = H5I_register(H5I_DATATYPE, new_dt, TRUE)) < 0) + if ((ret_value = H5I_register(H5I_DATATYPE, new_dt, true)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register datatype atom"); done: @@ -1963,7 +1963,7 @@ done: * * Purpose: Determines if two datatypes are equal. * - * Return: Success: TRUE if equal, FALSE if unequal + * Return: Success: true if equal, false if unequal * * Failure: Negative * @@ -1985,7 +1985,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id) if (NULL == (dt2 = (H5T_t *)H5I_object_verify(type2_id, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype"); - ret_value = (0 == H5T_cmp(dt1, dt2, FALSE)) ? TRUE : FALSE; + ret_value = (0 == H5T_cmp(dt1, dt2, false)) ? true : false; done: FUNC_LEAVE_API(ret_value) @@ -2021,7 +2021,7 @@ H5Tlock(hid_t type_id) if (H5T_STATE_NAMED == dt->shared->state || H5T_STATE_OPEN == dt->shared->state) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to lock named datatype"); - if (H5T_lock(dt, TRUE) < 0) + if (H5T_lock(dt, true) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to lock transient datatype"); done: @@ -2053,7 +2053,7 @@ H5Tget_class(hid_t type_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype"); /* Set return value */ - ret_value = H5T_get_class(dt, FALSE); + ret_value = H5T_get_class(dt, false); done: FUNC_LEAVE_API(ret_value) @@ -2099,7 +2099,7 @@ H5T_get_class(const H5T_t *dt, htri_t internal) * Purpose: Check whether a datatype contains (or is) a certain type of * datatype. * - * Return: TRUE (1) or FALSE (0) on success/Negative on failure + * Return: true (1) or false (0) on success/Negative on failure * *------------------------------------------------------------------------- */ @@ -2119,7 +2119,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5T_NO_CLASS, "not a datatype class"); /* Set return value */ - if ((ret_value = H5T_detect_class(dt, cls, TRUE)) < 0) + if ((ret_value = H5T_detect_class(dt, cls, true)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, H5T_NO_CLASS, "can't get datatype class"); done: @@ -2132,15 +2132,15 @@ done: * Purpose: Check whether a datatype contains (or is) a certain type of * datatype. * - * Return: TRUE (1) or FALSE (0) on success/Negative on failure + * Return: true (1) or false (0) on success/Negative on failure * *------------------------------------------------------------------------- */ htri_t -H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api) +H5T_detect_class(const H5T_t *dt, H5T_class_t cls, bool from_api) { unsigned i; - htri_t ret_value = FALSE; /* Return value */ + htri_t ret_value = false; /* Return value */ FUNC_ENTER_NOAPI_NOERR @@ -2157,7 +2157,7 @@ H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api) /* Check if this type is the correct type */ if (dt->shared->type == cls) - HGOTO_DONE(TRUE); + HGOTO_DONE(true); /* check for types that might have the correct type as a component */ switch (dt->shared->type) { @@ -2167,12 +2167,12 @@ H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api) /* Check if this field's type is the correct type */ if (dt->shared->u.compnd.memb[i].type->shared->type == cls) - HGOTO_DONE(TRUE); + HGOTO_DONE(true); /* Recurse if it's VL, compound, enum or array */ if (H5T_IS_COMPLEX(dt->shared->u.compnd.memb[i].type->shared->type)) if ((nested_ret = H5T_detect_class(dt->shared->u.compnd.memb[i].type, cls, from_api)) != - FALSE) + false) HGOTO_DONE(nested_ret); } /* end for */ break; @@ -2204,7 +2204,7 @@ done: * * Purpose: Check whether a datatype is a variable-length string * - * Return: TRUE (1) or FALSE (0) on success/Negative on failure + * Return: true (1) or false (0) on success/Negative on failure * *------------------------------------------------------------------------- */ @@ -2234,7 +2234,7 @@ done: * * Purpose: Check whether a datatype is a variable-length string * - * Return: TRUE (1) or FALSE (0) on success/Negative on failure + * Return: true (1) or false (0) on success/Negative on failure * *------------------------------------------------------------------------- */ @@ -2357,7 +2357,7 @@ H5Tget_super(hid_t type) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5I_INVALID_HID, "not a datatype"); if (NULL == (super = H5T_get_super(dt))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5I_INVALID_HID, "not a datatype"); - if ((ret_value = H5I_register(H5I_DATATYPE, super, TRUE)) < 0) + if ((ret_value = H5I_register(H5I_DATATYPE, super, true)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, H5I_INVALID_HID, "unable to register parent datatype"); done: @@ -2424,7 +2424,7 @@ H5T__register_int(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T assert(func); /* Set up conversion function wrapper */ - conv_func.is_app = FALSE; + conv_func.is_app = false; conv_func.u.lib_func = func; /* Register conversion */ @@ -2474,7 +2474,7 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con if (H5T_PERS_HARD == pers) { /* Only bother to register the path if it's not a no-op path (for this machine) */ - if (H5T_cmp(src, dst, FALSE)) { + if (H5T_cmp(src, dst, false)) { /* Locate or create a new conversion path */ if (NULL == (new_path = H5T__path_find_real(src, dst, name, conv))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to locate/allocate conversion path"); @@ -2487,7 +2487,7 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con */ for (i = 0; i < H5T_g.npaths; i++) if (new_path != H5T_g.path[i]) - H5T_g.path[i]->cdata.recalc = TRUE; + H5T_g.path[i]->cdata.recalc = true; } /* end if */ } /* end if */ else { @@ -2522,8 +2522,8 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con old_path->dst->shared->type != dst->shared->type) continue; - if ((tmp_sid = H5I_register(H5I_DATATYPE, H5T_copy(old_path->src, H5T_COPY_ALL), FALSE)) < 0 || - (tmp_did = H5I_register(H5I_DATATYPE, H5T_copy(old_path->dst, H5T_COPY_ALL), FALSE)) < 0) + if ((tmp_sid = H5I_register(H5I_DATATYPE, H5T_copy(old_path->src, H5T_COPY_ALL), false)) < 0 || + (tmp_did = H5I_register(H5I_DATATYPE, H5T_copy(old_path->dst, H5T_COPY_ALL), false)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data types for conv query"); memset(&cdata, 0, sizeof cdata); @@ -2556,7 +2556,7 @@ H5T__register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_con NULL == (new_path->dst = H5T_copy(old_path->dst, H5T_COPY_ALL))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to copy data types"); new_path->conv = *conv; - new_path->is_hard = FALSE; + new_path->is_hard = false; new_path->cdata = cdata; /* Replace previous path */ @@ -2660,7 +2660,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, H5T_c HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no conversion function specified"); /* Set up conversion function wrapper */ - conv_func.is_app = TRUE; + conv_func.is_app = true; conv_func.u.app_func = func; /* Go register the function */ @@ -2719,8 +2719,8 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c /* Not a match */ if (((H5T_PERS_SOFT == pers && path->is_hard) || (H5T_PERS_HARD == pers && !path->is_hard)) || - (name && *name && HDstrcmp(name, path->name) != 0) || (src && H5T_cmp(src, path->src, FALSE)) || - (dst && H5T_cmp(dst, path->dst, FALSE)) || (func && func != path->conv.u.app_func)) { + (name && *name && HDstrcmp(name, path->name) != 0) || (src && H5T_cmp(src, path->src, false)) || + (dst && H5T_cmp(dst, path->dst, false)) || (func && func != path->conv.u.app_func)) { /* * Notify all other functions to recalculate private data since some * functions might cache a list of conversion functions. For @@ -2728,7 +2728,7 @@ H5T__unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst, H5T_c * functions for the members, so removing a function should cause * the list to be recalculated to avoid the removed function. */ - path->cdata.recalc = TRUE; + path->cdata.recalc = true; } /* end if */ else { /* Remove from table */ @@ -2860,8 +2860,8 @@ done: * A hard conversion uses compiler's casting; a soft conversion * uses the library's own conversion function. * - * Return: TRUE: hard conversion. - * FALSE: soft conversion. + * Return: true: hard conversion. + * false: soft conversion. * FAIL: failed. * *------------------------------------------------------------------------- @@ -2924,7 +2924,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf, void *backgroun HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data type"); if (H5P_DEFAULT == dxpl_id) dxpl_id = H5P_DATASET_XFER_DEFAULT; - else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER)) + else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset transfer property list"); /* Set DXPL for operation */ @@ -2973,7 +2973,7 @@ H5Treclaim(hid_t type_id, hid_t space_id, hid_t dxpl_id, void *buf) /* Get the default dataset transfer property list if the user didn't provide one */ if (H5P_DEFAULT == dxpl_id) dxpl_id = H5P_DATASET_XFER_DEFAULT; - else if (TRUE != H5P_isa_class(dxpl_id, H5P_DATASET_XFER)) + else if (true != H5P_isa_class(dxpl_id, H5P_DATASET_XFER)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms"); /* Set DXPL for operation */ @@ -3056,7 +3056,7 @@ H5Tdecode(const void *buf) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDECODE, FAIL, "can't decode object"); /* Register the type and return the ID */ - if ((ret_value = H5I_register(H5I_DATATYPE, dt, TRUE)) < 0) + if ((ret_value = H5I_register(H5I_DATATYPE, dt, true)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type"); done: @@ -3094,7 +3094,7 @@ H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTALLOC, FAIL, "can't allocate fake file struct"); /* Find out the size of buffer needed */ - if ((buf_size = H5O_msg_raw_size(f, H5O_DTYPE_ID, TRUE, obj)) == 0) + if ((buf_size = H5O_msg_raw_size(f, H5O_DTYPE_ID, true, obj)) == 0) HGOTO_ERROR(H5E_DATATYPE, H5E_BADSIZE, FAIL, "can't find datatype size"); /* Don't encode if buffer size isn't big enough or buffer is empty */ @@ -3108,7 +3108,7 @@ H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc) *buf++ = H5T_ENCODE_VERSION; /* Encode into user's buffer */ - if (H5O_msg_encode(f, H5O_DTYPE_ID, TRUE, buf, obj) < 0) + if (H5O_msg_encode(f, H5O_DTYPE_ID, true, buf, obj) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode object"); } /* end else */ @@ -3220,7 +3220,7 @@ H5T__create(H5T_class_t type, size_t size) dt->shared->type = type; if (type == H5T_COMPOUND) { - dt->shared->u.compnd.packed = FALSE; /* Start out unpacked */ + dt->shared->u.compnd.packed = false; /* Start out unpacked */ dt->shared->u.compnd.memb_size = 0; } /* end if */ else if (type == H5T_OPAQUE) @@ -3411,7 +3411,7 @@ done: *------------------------------------------------------------------------- */ static herr_t -H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, hbool_t set_memory_type, +H5T__complete_copy(H5T_t *new_dt, const H5T_t *old_dt, H5T_shared_t *reopened_fo, bool set_memory_type, H5T_copy_func_t copyfn) { H5T_t *tmp = NULL; /* Temporary copy of compound field's datatype */ @@ -3716,7 +3716,7 @@ H5T_copy_reopen(H5T_t *old_dt) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, NULL, "unable to reopen named data type"); /* Insert opened named datatype into opened object list for the file */ - if (H5FO_insert(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr, new_dt->shared, FALSE) < 0) + if (H5FO_insert(old_dt->sh_loc.file, old_dt->sh_loc.u.loc.oh_addr, new_dt->shared, false) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, NULL, "can't insert datatype into list of open objects"); @@ -3758,7 +3758,7 @@ H5T_copy_reopen(H5T_t *old_dt) new_dt->shared->state = H5T_STATE_RDONLY; /* Finish making the copy of the datatype */ - if (H5T__complete_copy(new_dt, old_dt, reopened_fo, TRUE, H5T_copy_reopen) < 0) + if (H5T__complete_copy(new_dt, old_dt, reopened_fo, true, H5T_copy_reopen) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "can't complete datatype initialization"); /* Set return value */ @@ -3792,7 +3792,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5T_lock(H5T_t *dt, hbool_t immutable) +H5T_lock(H5T_t *dt, bool immutable) { herr_t ret_value = SUCCEED; /* Return value */ @@ -4032,7 +4032,7 @@ H5T_close(H5T_t *dt) /* Close things down if this is the last reference to the open named datatype */ if (0 == dt->shared->fo_count) { - hbool_t corked; /* Whether the named datatype is corked or not */ + bool corked; /* Whether the named datatype is corked or not */ /* Uncork cache entries with object address tag for named datatype */ if (H5AC_cork(dt->oloc.file, dt->oloc.addr, H5AC__GET_CORKED, &corked) < 0) @@ -4199,7 +4199,7 @@ H5T__set_size(H5T_t *dt, size_t size) * Force conversions (i.e. memory to memory conversions * should duplicate data, not point to the same VL strings) */ - dt->shared->force_conv = TRUE; + dt->shared->force_conv = true; /* Before we mess with the info in the union, extract the * values we need */ @@ -4304,11 +4304,11 @@ H5T_get_size(const H5T_t *dt) * true if and only if the type keeps a pointer to a file VOL * object internally. * - * Return: TRUE/FALSE (never fails) + * Return: true/false (never fails) * *------------------------------------------------------------------------- */ -hbool_t +bool H5T_get_force_conv(const H5T_t *dt) { /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */ @@ -4335,11 +4335,11 @@ H5T_get_force_conv(const H5T_t *dt) *------------------------------------------------------------------------- */ int -H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset) +H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, bool superset) { unsigned *idx1 = NULL, *idx2 = NULL; size_t base_size; - hbool_t swapped; + bool swapped; unsigned u; int tmp; int ret_value = 0; @@ -4399,28 +4399,28 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset) if (dt1->shared->u.enumer.nmembs > 1) { int i; - for (i = (int)dt1->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) { + for (i = (int)dt1->shared->u.compnd.nmembs - 1, swapped = true; swapped && i >= 0; --i) { int j; - for (j = 0, swapped = FALSE; j < i; j++) + for (j = 0, swapped = false; j < i; j++) if (HDstrcmp(dt1->shared->u.compnd.memb[idx1[j]].name, dt1->shared->u.compnd.memb[idx1[j + 1]].name) > 0) { unsigned tmp_idx = idx1[j]; idx1[j] = idx1[j + 1]; idx1[j + 1] = tmp_idx; - swapped = TRUE; + swapped = true; } } - for (i = (int)dt2->shared->u.compnd.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) { + for (i = (int)dt2->shared->u.compnd.nmembs - 1, swapped = true; swapped && i >= 0; --i) { int j; - for (j = 0, swapped = FALSE; j < i; j++) + for (j = 0, swapped = false; j < i; j++) if (HDstrcmp(dt2->shared->u.compnd.memb[idx2[j]].name, dt2->shared->u.compnd.memb[idx2[j + 1]].name) > 0) { unsigned tmp_idx = idx2[j]; idx2[j] = idx2[j + 1]; idx2[j + 1] = tmp_idx; - swapped = TRUE; + swapped = true; } } } /* end if */ @@ -4490,16 +4490,16 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset) idx1[u] = u; if (dt1->shared->u.enumer.nmembs > 1) { int i; - for (i = (int)dt1->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) { + for (i = (int)dt1->shared->u.enumer.nmembs - 1, swapped = true; swapped && i >= 0; --i) { int j; - for (j = 0, swapped = FALSE; j < i; j++) + for (j = 0, swapped = false; j < i; j++) if (HDstrcmp(dt1->shared->u.enumer.name[idx1[j]], dt1->shared->u.enumer.name[idx1[j + 1]]) > 0) { unsigned tmp_idx = idx1[j]; idx1[j] = idx1[j + 1]; idx1[j + 1] = tmp_idx; - swapped = TRUE; + swapped = true; } } } @@ -4508,16 +4508,16 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset) if (dt2->shared->u.enumer.nmembs > 1) { int i; - for (i = (int)dt2->shared->u.enumer.nmembs - 1, swapped = TRUE; swapped && i >= 0; --i) { + for (i = (int)dt2->shared->u.enumer.nmembs - 1, swapped = true; swapped && i >= 0; --i) { int j; - for (j = 0, swapped = FALSE; j < i; j++) + for (j = 0, swapped = false; j < i; j++) if (HDstrcmp(dt2->shared->u.enumer.name[idx2[j]], dt2->shared->u.enumer.name[idx2[j + 1]]) > 0) { unsigned tmp_idx = idx2[j]; idx2[j] = idx2[j + 1]; idx2[j + 1] = tmp_idx; - swapped = TRUE; + swapped = true; } } } @@ -4823,7 +4823,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst) assert(dst->shared); /* Set up conversion function wrapper */ - conv_func.is_app = FALSE; + conv_func.is_app = false; conv_func.u.lib_func = NULL; /* Call the internal routine, with additional parameters */ @@ -4891,7 +4891,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for no-op conversion path"); HDsnprintf(H5T_g.path[0]->name, sizeof(H5T_g.path[0]->name), "no-op"); - H5T_g.path[0]->conv.is_app = FALSE; + H5T_g.path[0]->conv.is_app = false; H5T_g.path[0]->conv.u.lib_func = H5T__conv_noop; H5T_g.path[0]->cdata.command = H5T_CONV_INIT; if (H5T__conv_noop((hid_t)FAIL, (hid_t)FAIL, &(H5T_g.path[0]->cdata), (size_t)0, (size_t)0, (size_t)0, @@ -4902,7 +4902,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co #endif H5E_clear_stack(NULL); /*ignore the error*/ } /* end if */ - H5T_g.path[0]->is_noop = TRUE; + H5T_g.path[0]->is_noop = true; H5T_g.npaths = 1; } /* end if */ @@ -4913,8 +4913,8 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co * Only allow the no-op conversion to occur if no "force conversion" flags * are set */ - if (src->shared->force_conv == FALSE && dst->shared->force_conv == FALSE && - 0 == H5T_cmp(src, dst, TRUE)) { + if (src->shared->force_conv == false && dst->shared->force_conv == false && + 0 == H5T_cmp(src, dst, true)) { table = H5T_g.path[0]; cmp = 0; md = 0; @@ -4927,9 +4927,9 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co while (cmp && lt < rt) { md = (lt + rt) / 2; assert(H5T_g.path[md]); - cmp = H5T_cmp(src, H5T_g.path[md]->src, FALSE); + cmp = H5T_cmp(src, H5T_g.path[md]->src, false); if (0 == cmp) - cmp = H5T_cmp(dst, H5T_g.path[md]->dst, FALSE); + cmp = H5T_cmp(dst, H5T_g.path[md]->dst, false); if (cmp < 0) rt = md; else if (cmp > 0) @@ -4977,10 +4977,10 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co (!table || (table && conv->is_app) || (table && !table->is_hard && !conv->is_app))) { assert(path != table); assert(NULL == path->conv.u.app_func); - if (path->src && (src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0) + if (path->src && (src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), false)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register source conversion type for query"); - if (path->dst && (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0) + if (path->dst && (dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), false)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register destination conversion type for query"); path->cdata.command = H5T_CONV_INIT; @@ -4998,7 +4998,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co H5I_dec_ref(dst_id); src_id = dst_id = -1; path->conv = *conv; - path->is_hard = TRUE; + path->is_hard = true; } /* end if */ /* @@ -5009,14 +5009,14 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co */ assert(path->conv.u.app_func || (src && dst)); for (i = H5T_g.nsoft - 1; i >= 0 && !path->conv.u.app_func; --i) { - hbool_t path_init_error = FALSE; + bool path_init_error = false; if (src->shared->type != H5T_g.soft[i].src || dst->shared->type != H5T_g.soft[i].dst) continue; - if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), FALSE)) < 0) + if ((src_id = H5I_register(H5I_DATATYPE, H5T_copy(path->src, H5T_COPY_ALL), false)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register src conversion type for query"); - if ((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), FALSE)) < 0) + if ((dst_id = H5I_register(H5I_DATATYPE, H5T_copy(path->dst, H5T_COPY_ALL), false)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, NULL, "unable to register dst conversion type for query"); path->cdata.command = H5T_CONV_INIT; @@ -5025,14 +5025,14 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co (size_t)0, NULL, NULL, H5CX_get_dxpl()) < 0) { memset(&(path->cdata), 0, sizeof(H5T_cdata_t)); H5E_clear_stack(NULL); /*ignore the error*/ - path_init_error = TRUE; + path_init_error = true; } /* end if */ } /* end if */ else if ((H5T_g.soft[i].conv.u.lib_func)(src_id, dst_id, &(path->cdata), (size_t)0, (size_t)0, (size_t)0, NULL, NULL) < 0) { memset(&(path->cdata), 0, sizeof(H5T_cdata_t)); H5E_clear_stack(NULL); /*ignore the error*/ - path_init_error = TRUE; + path_init_error = true; } /* end if */ /* Finish operation, if no error */ @@ -5040,7 +5040,7 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co HDstrncpy(path->name, H5T_g.soft[i].name, (size_t)H5T_NAMELEN); path->name[H5T_NAMELEN - 1] = '\0'; path->conv = H5T_g.soft[i].conv; - path->is_hard = FALSE; + path->is_hard = false; } /* end else */ H5I_dec_ref(src_id); H5I_dec_ref(dst_id); @@ -5060,9 +5060,9 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co while (cmp && lt < rt) { md = (lt + rt) / 2; assert(H5T_g.path[md]); - cmp = H5T_cmp(src, H5T_g.path[md]->src, FALSE); + cmp = H5T_cmp(src, H5T_g.path[md]->src, false); if (0 == cmp) - cmp = H5T_cmp(dst, H5T_g.path[md]->dst, FALSE); + cmp = H5T_cmp(dst, H5T_g.path[md]->dst, false); if (cmp < 0) rt = md; else if (cmp > 0) @@ -5126,11 +5126,11 @@ H5T__path_find_real(const H5T_t *src, const H5T_t *dst, const char *name, H5T_co /* Set the flag to indicate both source and destination types are compound types * for the optimization of data reading (in H5Dio.c). - * Make sure that path->are_compounds is only TRUE for compound types. + * Make sure that path->are_compounds is only true for compound types. */ - path->are_compounds = FALSE; - if (H5T_COMPOUND == H5T_get_class(src, TRUE) && H5T_COMPOUND == H5T_get_class(dst, TRUE)) - path->are_compounds = TRUE; + path->are_compounds = false; + if (H5T_COMPOUND == H5T_get_class(src, true) && H5T_COMPOUND == H5T_get_class(dst, true)) + path->are_compounds = true; /* Set return value */ ret_value = path; @@ -5159,18 +5159,18 @@ done: * path in a multi-threaded application if one thread is using * the no-op path when some other thread changes its definition. * - * Return: TRUE/FALSE (can't fail) + * Return: true/false (can't fail) * *------------------------------------------------------------------------- */ -hbool_t +bool H5T_path_noop(const H5T_path_t *p) { FUNC_ENTER_NOAPI_NOINIT_NOERR assert(p); - FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0 == H5T_cmp(p->src, p->dst, FALSE))) + FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0 == H5T_cmp(p->src, p->dst, false))) } /* end H5T_path_noop() */ /*------------------------------------------------------------------------- @@ -5234,8 +5234,8 @@ H5T_path_bkg(const H5T_path_t *p) * library's conversion function from type SRC to type DST * is a hard conversion. * - * Return: TRUE: hard conversion. - * FALSE: soft conversion. + * Return: true: hard conversion. + * false: soft conversion. * FAIL: function failed. * *------------------------------------------------------------------------- @@ -5395,23 +5395,23 @@ done: * * Purpose: Check if a datatype is immutable. * - * Return: TRUE + * Return: true * - * FALSE + * false * *------------------------------------------------------------------------- */ htri_t H5T_is_immutable(const H5T_t *dt) { - htri_t ret_value = FALSE; + htri_t ret_value = false; FUNC_ENTER_NOAPI_NOERR assert(dt); if (dt->shared->state == H5T_STATE_IMMUTABLE) - ret_value = TRUE; + ret_value = true; FUNC_LEAVE_NOAPI(ret_value) } @@ -5421,21 +5421,21 @@ H5T_is_immutable(const H5T_t *dt) * * Purpose: Check if a datatype is named/committed. * - * Return: TRUE/FALSE/FAIL + * Return: true/false/FAIL * *------------------------------------------------------------------------- */ htri_t H5T_is_named(const H5T_t *dt) { - htri_t ret_value = FALSE; + htri_t ret_value = false; FUNC_ENTER_NOAPI_NOERR assert(dt); if (dt->vol_obj) - ret_value = TRUE; + ret_value = true; else ret_value = (H5T_STATE_OPEN == dt->shared->state || H5T_STATE_NAMED == dt->shared->state); @@ -5530,7 +5530,7 @@ H5T_get_ref_type(const H5T_t *dt) * Purpose: Determines if a data type is sensible to store on disk * (i.e. not partially initialized) * - * Return: Success: TRUE, FALSE + * Return: Success: true, false * * Failure: Negative * @@ -5549,17 +5549,17 @@ H5T_is_sensible(const H5T_t *dt) case H5T_COMPOUND: /* Only allow compound datatypes with at least one member to be stored on disk */ if (dt->shared->u.compnd.nmembs > 0) - ret_value = TRUE; + ret_value = true; else - ret_value = FALSE; + ret_value = false; break; case H5T_ENUM: /* Only allow enum datatypes with at least one member to be stored on disk */ if (dt->shared->u.enumer.nmembs > 0) - ret_value = TRUE; + ret_value = true; else - ret_value = FALSE; + ret_value = false; break; case H5T_NO_CLASS: @@ -5575,7 +5575,7 @@ H5T_is_sensible(const H5T_t *dt) case H5T_NCLASSES: default: /* Assume all other datatype are sensible to store on disk */ - ret_value = TRUE; + ret_value = true; break; } /* end switch */ @@ -5595,8 +5595,8 @@ H5T_is_sensible(const H5T_t *dt) RETURNS One of two values on success: - TRUE - If the location of any vlen types changed - FALSE - If the location of any vlen types is the same + true - If the location of any vlen types changed + false - If the location of any vlen types is the same <0 is returned on failure DESCRIPTION Recursively descends any VL or compound datatypes to mark all VL datatypes @@ -5757,8 +5757,8 @@ done: * * Return: * One of two values on success: - * TRUE - If the location of any vlen types changed - * FALSE - If the location of any vlen types is the same + * true - If the location of any vlen types changed + * false - If the location of any vlen types is the same * <0 is returned on failure * *------------------------------------------------------------------------- @@ -5766,7 +5766,7 @@ done: htri_t H5T_is_relocatable(const H5T_t *dt) { - htri_t ret_value = FALSE; + htri_t ret_value = false; FUNC_ENTER_NOAPI_NOERR @@ -5774,8 +5774,8 @@ H5T_is_relocatable(const H5T_t *dt) assert(dt); /* VL and reference datatypes are relocatable */ - if (H5T_detect_class(dt, H5T_VLEN, FALSE) || H5T_detect_class(dt, H5T_REFERENCE, FALSE)) - ret_value = TRUE; + if (H5T_detect_class(dt, H5T_VLEN, false) || H5T_detect_class(dt, H5T_REFERENCE, false)) + ret_value = true; FUNC_LEAVE_NOAPI(ret_value) } /* end H5T_is_relocatable() */ @@ -5786,16 +5786,16 @@ H5T_is_relocatable(const H5T_t *dt) * Purpose: Check whether a datatype contains (or is) a vlen reference * datatype. * - * Return: TRUE (1) or FALSE (0) on success + * Return: true (1) or false (0) on success * (Can't fail) * *------------------------------------------------------------------------- */ -static hbool_t +static bool H5T__detect_vlen_ref(const H5T_t *dt) { unsigned u; /* Local index variable */ - hbool_t ret_value = FALSE; /* Return value */ + bool ret_value = false; /* Return value */ FUNC_ENTER_PACKAGE_NOERR @@ -5805,7 +5805,7 @@ H5T__detect_vlen_ref(const H5T_t *dt) /* Check if this datatype is a vlen reference */ /* TODO currently H5T_STD_REF is always considered as a vlen type */ if (H5T_REFERENCE == dt->shared->type && !dt->shared->u.atomic.u.r.opaque) - HGOTO_DONE(TRUE); + HGOTO_DONE(true); /* Check for types that might have the correct type as a component */ switch (dt->shared->type) { @@ -5814,7 +5814,7 @@ H5T__detect_vlen_ref(const H5T_t *dt) for (u = 0; u < dt->shared->u.compnd.nmembs; u++) /* Recurse on field's datatype */ if (H5T__detect_vlen_ref(dt->shared->u.compnd.memb[u].type)) - HGOTO_DONE(TRUE); + HGOTO_DONE(true); break; case H5T_ARRAY: @@ -5850,8 +5850,8 @@ done: * * Return: * One of two values on success: - * TRUE - If the datatype will be stored in a variable-length form - * FALSE - If the datatype will NOT be stored in a variable-length form + * true - If the datatype will be stored in a variable-length form + * false - If the datatype will NOT be stored in a variable-length form * <0 is returned on failure * *------------------------------------------------------------------------- @@ -5859,7 +5859,7 @@ done: htri_t H5T_is_vl_storage(const H5T_t *dt) { - htri_t ret_value = FALSE; + htri_t ret_value = false; FUNC_ENTER_NOAPI_NOERR @@ -5867,12 +5867,12 @@ H5T_is_vl_storage(const H5T_t *dt) assert(dt); /* VL and region reference datatypes are stored in variable-length form */ - if (H5T_detect_class(dt, H5T_VLEN, FALSE)) - ret_value = TRUE; - else if (H5T_detect_class(dt, H5T_REFERENCE, FALSE)) + if (H5T_detect_class(dt, H5T_VLEN, false)) + ret_value = true; + else if (H5T_detect_class(dt, H5T_REFERENCE, false)) ret_value = H5T__detect_vlen_ref(dt); else - ret_value = FALSE; + ret_value = false; FUNC_LEAVE_NOAPI(ret_value) } /* end H5T_is_vl_storage() */ |