mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove hbool_t/TRUE/FALSE from java (#3145)

Browse Source 
Replaces with bool/true/false
This commit is contained in:
Dana Robinson 2023-06-16 07:30:56 -07:00 committed by GitHub
parent 546d79dad7
commit 41b474bf4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/jni/h5Constants.c
View File

@ -2035,7 +2035,7 @@ Java_hdf_hdf5lib_HDF5Constants_H5O_1TOKEN_1UNDEF(JNIEnv *env, jclass cls)
H5O_token_t undef_token = H5O_TOKEN_UNDEF;
/* TODO: Can be optimized by keeping a global reference to the undefined token class */
return create_H5O_token_t(env, &undef_token, FALSE);
return create_H5O_token_t(env, &undef_token, false);
}
JNIEXPORT jlong JNICALL

2
java/src/jni/h5Imp.c
View File

@ -191,7 +191,7 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5is_1library_1threadsafe(JNIEnv *env, jclass clss)
{
hbool_t is_ts = false;
bool is_ts = false;
UNUSED(clss);

8
java/src/jni/h5dImp.c
View File

@ -1394,7 +1394,7 @@ H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid
H5T_class_t tclass;
jstring jstr;
h5str_t h5str;
hbool_t close_mem_space = FALSE;
bool close_mem_space = false;
size_t typeSize;
size_t i;
hid_t mem_space = mem_sid;
@ -1413,7 +1413,7 @@ H5DreadVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_sid
*/
if ((mem_space = H5Dget_space(did)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
close_mem_space = TRUE;
close_mem_space = true;
if (H5Sselect_all(mem_space) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -1632,7 +1632,7 @@ H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_si
{
const char *utf8 = NULL;
jstring jstr = NULL;
hbool_t close_mem_space = FALSE;
bool close_mem_space = false;
size_t typeSize;
size_t i;
hid_t mem_space = mem_sid;
@ -1649,7 +1649,7 @@ H5DwriteVL_asstr(JNIEnv *env, hid_t did, hid_t tid, hid_t mem_sid, hid_t file_si
*/
if ((mem_space = H5Dget_space(did)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
close_mem_space = TRUE;
close_mem_space = true;
if (H5Sselect_all(mem_space) < 0)
H5_LIBRARY_ERROR(ENVONLY);

18
java/src/jni/h5fImp.c
View File

@ -688,8 +688,8 @@ Java_hdf_hdf5lib_H5_H5Fget_1mdc_1logging_1status(JNIEnv *env, jclass clss, jlong
{
jboolean *mdc_logging_status_ptr = NULL;
jboolean isCopy;
hbool_t is_enabled;
hbool_t is_currently_logging;
bool is_enabled;
bool is_currently_logging;
jsize size;
UNUSED(clss);
@ -729,14 +729,14 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id, jboolean minimize)
{
hbool_t minimize_val;
herr_t retVal = FAIL;
bool minimize_val;
herr_t retVal = FAIL;
UNUSED(clss);
minimize_val = (minimize == JNI_TRUE) ? TRUE : FALSE;
minimize_val = (minimize == JNI_TRUE) ? true : false;
if ((retVal = H5Fset_dset_no_attrs_hint((hid_t)file_id, (hbool_t)minimize_val)) < 0)
if ((retVal = H5Fset_dset_no_attrs_hint((hid_t)file_id, (bool)minimize_val)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:
@ -752,14 +752,14 @@ JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong file_id)
{
jboolean bval = JNI_FALSE;
hbool_t minimize = FALSE;
bool minimize = false;
UNUSED(clss);
if (H5Fget_dset_no_attrs_hint((hid_t)file_id, (hbool_t *)&minimize) < 0)
if (H5Fget_dset_no_attrs_hint((hid_t)file_id, (bool *)&minimize) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (minimize == TRUE)
if (minimize == true)
bval = JNI_TRUE;
done:

2
java/src/jni/h5iImp.c
View File

@ -327,7 +327,7 @@ Java_hdf_hdf5lib_H5_H5Iclear_1type(JNIEnv *env, jclass clss, jint type, jboolean
{
UNUSED(clss);
if (H5Iclear_type((H5I_type_t)type, (hbool_t)force) < 0)
if (H5Iclear_type((H5I_type_t)type, (bool)force) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:

2
java/src/jni/h5jni.h
View File

@ -355,7 +355,7 @@ extern jobject get_enum_object(JNIEnv *env, const char *enum_class_name, jint en
extern jobject create_H5G_info_t(JNIEnv *env, H5G_info_t group_info);
/* implemented at h5oimp.c */
extern jobject create_H5O_token_t(JNIEnv *env, const H5O_token_t *token, hbool_t is_critical_pinning);
extern jobject create_H5O_token_t(JNIEnv *env, const H5O_token_t *token, bool is_critical_pinning);
#ifdef __cplusplus
} /* end extern "C" */

14
java/src/jni/h5lImp.c
View File

@ -277,7 +277,7 @@ done:
JNIEXPORT jobject JNICALL
Java_hdf_hdf5lib_H5_H5Lget_1info(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
{
H5L_info2_t infobuf = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {{{0}}}};
H5L_info2_t infobuf = {H5L_TYPE_ERROR, false, -1, H5T_CSET_ERROR, {{{0}}}};
const char *linkName = NULL;
jvalue args[5];
herr_t status = FAIL;
@ -302,7 +302,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1info(JNIEnv *env, jclass clss, jlong loc_id, jstring
jobject token;
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.u.token, FALSE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.u.token, false)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
args[0].i = infobuf.type;
@ -340,7 +340,7 @@ JNIEXPORT jobject JNICALL
Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
jint index_field, jint order, jlong link_n, jlong access_id)
{
H5L_info2_t infobuf = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {{{0}}}};
H5L_info2_t infobuf = {H5L_TYPE_ERROR, false, -1, H5T_CSET_ERROR, {{{0}}}};
const char *groupName = NULL;
jvalue args[5];
herr_t status = FAIL;
@ -367,7 +367,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id
jobject token;
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.u.token, FALSE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.u.token, false)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
args[0].i = infobuf.type;
@ -454,7 +454,7 @@ JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
jobjectArray link_value, jlong access_id)
{
H5L_info2_t infobuf = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {{{0}}}};
H5L_info2_t infobuf = {H5L_TYPE_ERROR, false, -1, H5T_CSET_ERROR, {{{0}}}};
const char *file_name = NULL;
const char *obj_name = NULL;
const char *linkName = NULL;
@ -544,7 +544,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_i
jint index_field, jint order, jlong link_n,
jobjectArray link_value, jlong access_id)
{
H5L_info2_t infobuf = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {{{0}}}};
H5L_info2_t infobuf = {H5L_TYPE_ERROR, false, -1, H5T_CSET_ERROR, {{{0}}}};
const char *file_name = NULL;
const char *obj_name = NULL;
const char *grpName = NULL;
@ -706,7 +706,7 @@ H5L_iterate_cb(hid_t g_id, const char *name, const H5L_info2_t *info, void *cb_d
jobject token;
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(CBENVONLY, &info->u.token, FALSE)))
if (NULL == (token = create_H5O_token_t(CBENVONLY, &info->u.token, false)))
CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
args[0].i = info->type;

14
java/src/jni/h5oImp.c
View File

@ -45,7 +45,7 @@ static herr_t H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *in
* Create a java object of hdf.hdf5lib.structs.H5O_token_t.
*/
jobject
create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, hbool_t is_critical_pinning)
create_H5O_token_t(JNIEnv *envptr, const H5O_token_t *token, bool is_critical_pinning)
{
jbyteArray tokenByteBuf;
jboolean token_buf_is_copy;
@ -193,7 +193,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1info(JNIEnv *env, jclass clss, jlong loc_id, jint fi
if ((status = H5Oget_info3((hid_t)loc_id, &infobuf, (unsigned)fields)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, FALSE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, false)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
args[0].j = (jlong)infobuf.fileno;
@ -241,7 +241,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1name(JNIEnv *env, jclass clss, jlong loc_i
H5_LIBRARY_ERROR(ENVONLY);
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, FALSE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, false)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
args[0].j = (jlong)infobuf.fileno;
@ -293,7 +293,7 @@ Java_hdf_hdf5lib_H5_H5Oget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id
H5_LIBRARY_ERROR(ENVONLY);
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, FALSE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &infobuf.token, false)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
args[0].j = (jlong)infobuf.fileno;
@ -580,7 +580,7 @@ H5O_iterate_cb(hid_t g_id, const char *name, const H5O_info2_t *info, void *cb_d
CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(CBENVONLY, &info->token, FALSE)))
if (NULL == (token = create_H5O_token_t(CBENVONLY, &info->token, false)))
CHECK_JNI_EXCEPTION(CBENVONLY, JNI_FALSE);
args[0].j = (jlong)info->fileno;
@ -1037,14 +1037,14 @@ JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Oare_1mdc_1flushes_1disabled(JNIEnv *env, jclass clss, jlong loc_id)
{
jboolean bval = JNI_FALSE;
hbool_t is_disabled = FALSE;
bool is_disabled = false;
UNUSED(clss);
if (H5Oare_mdc_flushes_disabled((hid_t)loc_id, &is_disabled) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (is_disabled == TRUE)
if (is_disabled == true)
bval = JNI_TRUE;
done:

14
java/src/jni/h5pDCPLImp.c
View File

@ -219,14 +219,14 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong dcpl_id, jboolean minimize)
{
hbool_t minimize_val;
herr_t retVal = FAIL;
bool minimize_val;
herr_t retVal = FAIL;
UNUSED(clss);
minimize_val = (JNI_TRUE == minimize) ? TRUE : FALSE;
minimize_val = (JNI_TRUE == minimize) ? true : false;
if ((retVal = H5Pset_dset_no_attrs_hint((hid_t)dcpl_id, (hbool_t)minimize_val)) < 0)
if ((retVal = H5Pset_dset_no_attrs_hint((hid_t)dcpl_id, (bool)minimize_val)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:
@ -241,15 +241,15 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlong dcpl_id)
{
hbool_t minimize = FALSE;
bool minimize = false;
jboolean bval = JNI_FALSE;
UNUSED(clss);
if (H5Pget_dset_no_attrs_hint((hid_t)dcpl_id, (hbool_t *)&minimize) < 0)
if (H5Pget_dset_no_attrs_hint((hid_t)dcpl_id, (bool *)&minimize) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (minimize == TRUE)
if (minimize == true)
bval = JNI_TRUE;
done:

8
java/src/jni/h5pDXPLImp.c
View File

@ -171,17 +171,17 @@ done:
JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1preserve(JNIEnv *env, jclass clss, jlong plist, jboolean status)
{
hbool_t st = JNI_FALSE;
herr_t retVal = FAIL;
bool st = JNI_FALSE;
herr_t retVal = FAIL;
UNUSED(clss);
if (JNI_TRUE == status)
st = TRUE;
st = true;
else if (JNI_FALSE == status)
st = false;
else
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_preserve: status not TRUE or FALSE");
H5_BAD_ARGUMENT_ERROR(ENVONLY, "H5Pset_preserve: status not true or false");
if ((retVal = H5Pset_preserve((hid_t)plist, st)) < 0)
H5_LIBRARY_ERROR(ENVONLY);

52
java/src/jni/h5pFAPLImp.c
View File

@ -109,7 +109,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id,
UNUSED(clss);
if ((retVal = H5Pset_fapl_core((hid_t)fapl_id, (size_t)increment, (hbool_t)backing_store)) < 0)
if ((retVal = H5Pset_fapl_core((hid_t)fapl_id, (size_t)increment, (bool)backing_store)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:
@ -145,7 +145,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1core(JNIEnv *env, jclass clss, jlong fapl_id,
long long inc_temp = *incArray;
size_t inc_t = (size_t)inc_temp;
if ((status = H5Pget_fapl_core((hid_t)fapl_id, &inc_t, (hbool_t *)backArray)) < 0)
if ((status = H5Pget_fapl_core((hid_t)fapl_id, &inc_t, (bool *)backArray)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
*incArray = (jlong)inc_t;
@ -656,7 +656,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin
}
if ((status = H5Pset_fapl_multi((hid_t)tid, (const H5FD_mem_t *)themapArray, (const hid_t *)thefaplArray,
mName, (const haddr_t *)theaddrArray, (hbool_t)relax)) < 0)
mName, (const haddr_t *)theaddrArray, (bool)relax)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (memb_name && mName) {
@ -745,7 +745,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1fapl_1multi(JNIEnv *env, jclass clss, jlong tid, jin
H5_OUT_OF_MEMORY_ERROR(ENVONLY, "H5Pget_fapl_multi: memory allocation failed");
if ((status = H5Pget_fapl_multi((hid_t)tid, (H5FD_mem_t *)themapArray, (hid_t *)thefaplArray, mName,
(haddr_t *)theaddrArray, (hbool_t *)&relax)) < 0)
(haddr_t *)theaddrArray, (bool *)&relax)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
if (memb_name && mName) {
@ -928,7 +928,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1fapl_1ros3(JNIEnv *env, jclass clss, jlong fapl_id,
HDmemset(instance.secret_key, 0, H5FD_ROS3_MAX_SECRET_KEY_LEN + 1);
if (instance.aws_region[0] != '\0' && instance.secret_id[0] != '\0' && instance.secret_key[0] != '\0')
instance.authenticate = TRUE;
instance.authenticate = true;
if (H5Pset_fapl_ros3((hid_t)fapl_id, &instance) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -1327,14 +1327,14 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1evict_1on_1close(JNIEnv *env, jclass clss, jlong fapl_id, jboolean evict_on_close)
{
hbool_t evict_on_close_val = FALSE;
herr_t retVal = FAIL;
bool evict_on_close_val = false;
herr_t retVal = FAIL;
UNUSED(clss);
evict_on_close_val = (evict_on_close == JNI_TRUE) ? TRUE : FALSE;
evict_on_close_val = (evict_on_close == JNI_TRUE) ? true : false;
if ((retVal = H5Pset_evict_on_close((hid_t)fapl_id, (hbool_t)evict_on_close_val)) < 0)
if ((retVal = H5Pset_evict_on_close((hid_t)fapl_id, (bool)evict_on_close_val)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:
@ -1349,15 +1349,15 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1evict_1on_1close(JNIEnv *env, jclass clss, jlong fapl_id)
{
hbool_t evict_on_close_val = FALSE;
bool evict_on_close_val = false;
jboolean bval = JNI_FALSE;
UNUSED(clss);
if (H5Pget_evict_on_close((hid_t)fapl_id, (hbool_t *)&evict_on_close_val) < 0)
if (H5Pget_evict_on_close((hid_t)fapl_id, (bool *)&evict_on_close_val) < 0)
H5_LIBRARY_ERROR(ENVONLY);
bval = (evict_on_close_val == TRUE) ? JNI_TRUE : JNI_FALSE;
bval = (evict_on_close_val == true) ? JNI_TRUE : JNI_FALSE;
done:
return bval;
@ -1372,13 +1372,13 @@ JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id, jboolean use_file_locking,
jboolean ignore_when_disabled)
{
hbool_t use_file_locking_val = TRUE;
hbool_t ignore_when_disabled_val = TRUE;
bool use_file_locking_val = true;
bool ignore_when_disabled_val = true;
UNUSED(clss);
use_file_locking_val = (use_file_locking == JNI_TRUE) ? TRUE : FALSE;
ignore_when_disabled_val = (ignore_when_disabled == JNI_TRUE) ? TRUE : FALSE;
use_file_locking_val = (use_file_locking == JNI_TRUE) ? true : false;
ignore_when_disabled_val = (ignore_when_disabled == JNI_TRUE) ? true : false;
if (H5Pset_file_locking((hid_t)fapl_id, use_file_locking_val, ignore_when_disabled_val) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -1395,8 +1395,8 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id)
{
hbool_t use_file_locking_val = TRUE;
hbool_t unused = TRUE;
bool use_file_locking_val = true;
bool unused = true;
jboolean bval = JNI_FALSE;
UNUSED(clss);
@ -1404,7 +1404,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1use_1file_1locking(JNIEnv *env, jclass clss, jlong f
if (H5Pget_file_locking((hid_t)fapl_id, &use_file_locking_val, &unused) < 0)
H5_LIBRARY_ERROR(ENVONLY);
bval = (use_file_locking_val == TRUE) ? JNI_TRUE : JNI_FALSE;
bval = (use_file_locking_val == true) ? JNI_TRUE : JNI_FALSE;
done:
return bval;
@ -1418,8 +1418,8 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking(JNIEnv *env, jclass clss, jlong fapl_id)
{
hbool_t ignore_when_disabled_val = TRUE;
hbool_t unused = TRUE;
bool ignore_when_disabled_val = true;
bool unused = true;
jboolean bval = JNI_FALSE;
UNUSED(clss);
@ -1427,7 +1427,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1ignore_1disabled_1file_1locking(JNIEnv *env, jclass
if (H5Pget_file_locking((hid_t)fapl_id, &unused, &ignore_when_disabled_val) < 0)
H5_LIBRARY_ERROR(ENVONLY);
bval = (ignore_when_disabled_val == TRUE) ? JNI_TRUE : JNI_FALSE;
bval = (ignore_when_disabled_val == true) ? JNI_TRUE : JNI_FALSE;
done:
return bval;
@ -1794,8 +1794,8 @@ Java_hdf_hdf5lib_H5_H5Pset_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fa
PIN_JAVA_STRING(ENVONLY, location, locStr, NULL, "H5Pset_mdc_log_options: location string not pinned");
if ((retVal = H5Pset_mdc_log_options((hid_t)fapl_id, (hbool_t)is_enabled, locStr,
(hbool_t)start_on_access)) < 0)
if ((retVal = H5Pset_mdc_log_options((hid_t)fapl_id, (bool)is_enabled, locStr, (bool)start_on_access)) <
0)
H5_LIBRARY_ERROR(ENVONLY);
done:
@ -1814,8 +1814,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1mdc_1log_1options(JNIEnv *env, jclass clss, jlong fa
{
jboolean isCopy;
jboolean *mdc_log_options_ptr = NULL;
hbool_t is_enabled;
hbool_t start_on_access;
bool is_enabled;
bool start_on_access;
ssize_t status = -1;
size_t location_size;
jsize arrLen;

8
java/src/jni/h5pFCPLImp.c
View File

@ -294,7 +294,7 @@ Java_hdf_hdf5lib_H5_H5Pset_1file_1space_1strategy(JNIEnv *env, jclass clss, jlon
{
UNUSED(clss);
if (H5Pset_file_space_strategy((hid_t)fcpl_id, (H5F_fspace_strategy_t)strategy, (hbool_t)persist,
if (H5Pset_file_space_strategy((hid_t)fcpl_id, (H5F_fspace_strategy_t)strategy, (bool)persist,
(hsize_t)threshold) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -325,7 +325,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy(JNIEnv *env, jclass clss, jlon
PIN_LONG_ARRAY(ENVONLY, threshold, thresholdArray, &isCopy,
"H5Pget_file_space: threshold not pinned");
if ((status = H5Pget_file_space_strategy((hid_t)fcpl_id, &thestrategy, (hbool_t *)persistArray,
if ((status = H5Pget_file_space_strategy((hid_t)fcpl_id, &thestrategy, (bool *)persistArray,
(hsize_t *)thresholdArray)) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -346,8 +346,8 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1file_1space_1strategy_1persist(JNIEnv *env, jclass clss, jlong fcpl_id)
{
hbool_t persist = FALSE;
herr_t status = FAIL;
bool persist = false;
herr_t status = FAIL;
UNUSED(clss);

8
java/src/jni/h5pOCPLImp.c
View File

@ -77,11 +77,11 @@ done:
JNIEXPORT void JNICALL
Java_hdf_hdf5lib_H5_H5Pset_1obj_1track_1times(JNIEnv *env, jclass clss, jlong objplid, jboolean track_times)
{
hbool_t track = FALSE;
bool track = false;
UNUSED(clss);
track = (JNI_TRUE == track_times) ? 1 : 0;
track = (JNI_TRUE == track_times) ? true : false;
if (H5Pset_obj_track_times((hid_t)objplid, track) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -98,7 +98,7 @@ done:
JNIEXPORT jboolean JNICALL
Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times(JNIEnv *env, jclass clss, jlong objplid)
{
hbool_t track_times = FALSE;
bool track_times = false;
jboolean retVal = JNI_FALSE;
UNUSED(clss);
@ -106,7 +106,7 @@ Java_hdf_hdf5lib_H5_H5Pget_1obj_1track_1times(JNIEnv *env, jclass clss, jlong ob
if (H5Pget_obj_track_times((hid_t)objplid, &track_times) < 0)
H5_LIBRARY_ERROR(ENVONLY);
retVal = (track_times == TRUE) ? JNI_TRUE : JNI_FALSE;
retVal = (track_times == true) ? JNI_TRUE : JNI_FALSE;
done:
return retVal;

24
java/src/jni/h5util.c
View File

@ -1952,8 +1952,8 @@ done:
* Purpose: Recursive check for variable length string of a datatype.
*
* Return:
* TRUE : type contains any variable length string
* FALSE : type doesn't contain any variable length string
* true : type contains any variable length string
* false : type doesn't contain any variable length string
* Negative value: error occur
*
*-------------------------------------------------------------------------
@ -2871,8 +2871,8 @@ h5str_dump_region_attribute(JNIEnv *env, h5str_t *str, hid_t region_id)
}
/* Check if we have VL data in the dataset's datatype */
if (h5str_detect_vlen(type_id) == TRUE)
vl_data = TRUE;
if (h5str_detect_vlen(type_id) == true)
vl_data = true;
if (!(size = H5Tget_size(type_id))) {
ret_value = FAIL;
@ -3290,8 +3290,8 @@ done:
*
* Purpose: Recursive check for variable length string of a datatype.
*
* Return: TRUE : type contains any variable length string
* FALSE : type doesn't contain any variable length string
* Return: true : type contains any variable length string
* false : type doesn't contain any variable length string
* Negative value: failed
*-------------------------------------------------------------------------
*/
@ -3299,10 +3299,10 @@ htri_t
H5Tdetect_variable_str(hid_t tid)
{
H5T_class_t tclass = -1;
htri_t ret = FALSE;
htri_t ret = false;
ret = H5Tis_variable_str(tid);
if ((ret == TRUE) || (ret < 0))
if ((ret == true) || (ret < 0))
goto done;
tclass = H5Tget_class(tid);
@ -3314,7 +3314,7 @@ H5Tdetect_variable_str(hid_t tid)
goto done;
}
ret = H5Tdetect_variable_str(btid);
if ((ret == TRUE) || (ret < 0)) {
if ((ret == true) || (ret < 0)) {
H5Tclose(btid);
goto done;
}
@ -3334,7 +3334,7 @@ H5Tdetect_variable_str(hid_t tid)
hid_t mtid = H5Tget_member_type(tid, u);
ret = H5Tdetect_variable_str(mtid);
if ((ret == TRUE) || (ret < 0)) {
if ((ret == true) || (ret < 0)) {
H5Tclose(mtid);
goto done;
}
@ -3708,7 +3708,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1full(JNIEnv *env, jclass clss, jlong loc_
} /* end if */
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &tokens[i], TRUE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &tokens[i], true)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
ENVPTR->SetObjectArrayElement(ENVONLY, oToken, i, token);
@ -3796,7 +3796,7 @@ Java_hdf_hdf5lib_H5_H5Gget_1obj_1info_1max(JNIEnv *env, jclass clss, jlong loc_i
}
/* Create an H5O_token_t object */
if (NULL == (token = create_H5O_token_t(ENVONLY, &tokens[i], TRUE)))
if (NULL == (token = create_H5O_token_t(ENVONLY, &tokens[i], true)))
CHECK_JNI_EXCEPTION(ENVONLY, JNI_FALSE);
ENVPTR->SetObjectArrayElement(ENVONLY, oToken, i, token);