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

Switch bool/true/false to hbool_t/TRUE/FALSE in a few places (#229)

Browse Source
This commit is contained in:
Dana Robinson 2020-12-24 07:12:01 -08:00 committed by GitHub
parent 5c9d08a964
commit a6386824c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5Z.c
View File

@ -1014,7 +1014,7 @@ H5Z_ignore_filters(hid_t dcpl_id, const H5T_t *type, const H5S_t *space)
H5O_pline_t pline; /* Object's I/O pipeline information */
H5S_class_t space_class; /* To check class of space */
H5T_class_t type_class; /* To check if type is VL */
bool bad_for_filters = FALSE; /* Suitable to have filters */
hbool_t bad_for_filters = FALSE; /* Suitable to have filters */
htri_t ret_value = FALSE; /* TRUE for ignoring filters */
FUNC_ENTER_NOAPI(FAIL)

2
test/dsets.c
View File

@ -7741,7 +7741,7 @@ static H5_ATTR_CONST long
gcd(long l0, long r0)
{
long magnitude, remainder;
bool negative = ((l0 < 0) != (r0 < 0));
hbool_t negative = ((l0 < 0) != (r0 < 0));
long l = HDlabs(l0), r = HDlabs(r0);
do {

16
test/genall5.c
View File

@ -209,7 +209,7 @@ vrfy_ns_grp_0(hid_t fid, const char *group_name)
HDassert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type);
HDassert(0 == grp_info.nlinks);
HDassert(0 == grp_info.max_corder);
HDassert(false == grp_info.mounted);
HDassert(FALSE == grp_info.mounted);
}
if (pass) {
@ -470,7 +470,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks)
HDassert(H5G_STORAGE_TYPE_COMPACT == grp_info.storage_type);
HDassert(nlinks == grp_info.nlinks);
HDassert(nlinks == grp_info.max_corder);
HDassert(false == grp_info.mounted);
HDassert(FALSE == grp_info.mounted);
}
u = 0;
@ -508,7 +508,7 @@ vrfy_ns_grp_c(hid_t fid, const char *group_name, unsigned nlinks)
failure_mssg = "vrfy_ns_grp_c: H5T_CSET_ASCII != lnk_info.cset";
}
HDassert(ret >= 0);
HDassert(true == lnk_info.corder_valid);
HDassert(TRUE == lnk_info.corder_valid);
HDassert(u == lnk_info.corder);
HDassert(H5T_CSET_ASCII == lnk_info.cset);
@ -881,7 +881,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks)
HDassert(H5G_STORAGE_TYPE_DENSE == grp_info.storage_type);
HDassert(nlinks == grp_info.nlinks);
HDassert(nlinks == grp_info.max_corder);
HDassert(false == grp_info.mounted);
HDassert(FALSE == grp_info.mounted);
}
u = 0;
@ -919,7 +919,7 @@ vrfy_ns_grp_d(hid_t fid, const char *group_name, unsigned nlinks)
failure_mssg = "vrfy_ns_grp_d: H5T_CSET_ASCII != lnk_info.cset";
}
HDassert(ret >= 0);
HDassert(true == lnk_info.corder_valid);
HDassert(TRUE == lnk_info.corder_valid);
HDassert(u == lnk_info.corder);
HDassert(H5T_CSET_ASCII == lnk_info.cset);
@ -1244,7 +1244,7 @@ vrfy_os_grp_0(hid_t fid, const char *group_name)
HDassert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type);
HDassert(0 == grp_info.nlinks);
HDassert(0 == grp_info.max_corder);
HDassert(false == grp_info.mounted);
HDassert(FALSE == grp_info.mounted);
}
if (pass) {
@ -1482,7 +1482,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks)
HDassert(H5G_STORAGE_TYPE_SYMBOL_TABLE == grp_info.storage_type);
HDassert(nlinks == grp_info.nlinks);
HDassert(0 == grp_info.max_corder);
HDassert(false == grp_info.mounted);
HDassert(FALSE == grp_info.mounted);
}
u = 0;
@ -1516,7 +1516,7 @@ vrfy_os_grp_n(hid_t fid, const char *group_name, int proc_num, unsigned nlinks)
failure_mssg = "vrfy_os_grp_n: H5T_CSET_ASCII != lnk_info.cset";
}
HDassert(ret >= 0);
HDassert(false == lnk_info.corder_valid);
HDassert(FALSE == lnk_info.corder_valid);
HDassert(H5T_CSET_ASCII == lnk_info.cset);
if (0 == (u % 2)) {

4
test/s3comms.c
View File

@ -2538,9 +2538,9 @@ test_uriencode(void)
dest = (char *)HDmalloc(sizeof(char) * 15);
HDassert(dest != NULL);
JSVERIFY(FAIL, H5FD_s3comms_uriencode(NULL, "word$", 5, false, &dest_written),
JSVERIFY(FAIL, H5FD_s3comms_uriencode(NULL, "word$", 5, FALSE, &dest_written),
"destination cannot be NULL");
JSVERIFY(FAIL, H5FD_s3comms_uriencode(dest, NULL, 5, false, &dest_written),
JSVERIFY(FAIL, H5FD_s3comms_uriencode(dest, NULL, 5, FALSE, &dest_written),
"source string cannot be NULL");
HDfree(dest);

8
test/titerate.c
View File

@ -54,7 +54,7 @@ typedef struct {
#define DSET_NAME "image"
typedef struct searched_err_t {
char message[256];
bool found;
hbool_t found;
} searched_err_t;
/* Call back function for test_corrupted_attnamelen */
@ -972,7 +972,7 @@ find_err_msg_cb(unsigned H5_ATTR_UNUSED n, const H5E_error2_t *err_desc, void *_
/* If the searched error message is found, stop the iteration */
if (err_desc->desc != NULL && HDstrcmp(err_desc->desc, searched_err->message) == 0) {
searched_err->found = true;
searched_err->found = TRUE;
status = H5_ITER_STOP;
}
@ -1018,14 +1018,14 @@ test_corrupted_attnamelen(void)
if (err_status == -1) {
/* Initialize client data */
HDstrcpy(err_caught.message, err_message);
err_caught.found = false;
err_caught.found = FALSE;
/* Look for the correct error message */
ret = H5Ewalk2(H5E_DEFAULT, H5E_WALK_UPWARD, find_err_msg_cb, &err_caught);
CHECK(ret, FAIL, "H5Ewalk2");
/* Fail if the indicated message is not found */
CHECK(err_caught.found, false, "test_corrupted_attnamelen: Expected error not found");
CHECK(err_caught.found, FALSE, "test_corrupted_attnamelen: Expected error not found");
}
/* Close the dataset and file */

52
testpar/t_pread.c
View File

@ -35,7 +35,7 @@ const char *FILENAMES[NFILENAME + 1] = {"reloc_t_pread_data_file", "reloc_t_prea
#define LIMIT_NPROC 6
hbool_t pass = true;
hbool_t pass = TRUE;
static const char *random_hdf5_text = "Now is the time for all first-time-users of HDF5 to read their \
manual or go thru the tutorials!\n\
While you\'re at it, now is also the time to read up on MPI-IO.";
@ -112,7 +112,7 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
float nextValue;
float * data_slice = NULL;
pass = true;
pass = TRUE;
HDassert(comm != MPI_COMM_NULL);
@ -256,14 +256,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
if (pass) {
if ((dset_id = H5Dcreate2(file_id, "dataset0", H5T_NATIVE_FLOAT, filespace, H5P_DEFAULT, H5P_DEFAULT,
H5P_DEFAULT)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dcreate2() failed.\n";
}
}
if (pass) {
if ((H5Dwrite(dset_id, H5T_NATIVE_FLOAT, memspace, filespace, dxpl_id, data_slice)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dwrite() failed.\n";
}
}
@ -273,14 +273,14 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
if (pass) {
if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pcreate() failed.\n";
}
}
if (pass) {
if ((H5Pset_chunk(dcpl_id, 1, chunk)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pset_chunk() failed.\n";
}
}
@ -289,27 +289,27 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
if ((dset_id_ch = H5Dcreate2(file_id, "dataset0_chunked", H5T_NATIVE_FLOAT, filespace, H5P_DEFAULT,
dcpl_id, H5P_DEFAULT)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dcreate2() failed.\n";
}
}
if (pass) {
if ((H5Dwrite(dset_id_ch, H5T_NATIVE_FLOAT, memspace, filespace, dxpl_id, data_slice)) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dwrite() failed.\n";
}
}
if (pass || (dcpl_id != -1)) {
if (H5Pclose(dcpl_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(dcpl_id) failed.\n";
}
}
if (pass || (dset_id_ch != -1)) {
if (H5Dclose(dset_id_ch) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dclose(dset_id_ch) failed.\n";
}
}
@ -317,49 +317,49 @@ generate_test_file(MPI_Comm comm, int mpi_rank, int group_id)
/* close file, etc. */
if (pass || (dset_id != -1)) {
if (H5Dclose(dset_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dclose(dset_id) failed.\n";
}
}
if (pass || (memspace != -1)) {
if (H5Sclose(memspace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(memspace) failed.\n";
}
}
if (pass || (filespace != -1)) {
if (H5Sclose(filespace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(filespace) failed.\n";
}
}
if (pass || (file_id != -1)) {
if (H5Fclose(file_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Fclose(file_id) failed.\n";
}
}
if (pass || (dxpl_id != -1)) {
if (H5Pclose(dxpl_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(dxpl_id) failed.\n";
}
}
if (pass || (fapl_id != -1)) {
if (H5Pclose(fapl_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(fapl_id) failed.\n";
}
}
if (pass || (fctmpl != -1)) {
if (H5Pclose(fctmpl) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(fctmpl) failed.\n";
}
}
@ -661,14 +661,14 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
if (pass || (memspace != -1)) {
if (H5Sclose(memspace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(memspace) failed.\n";
}
}
if (pass || (filespace != -1)) {
if (H5Sclose(filespace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(filespace) failed.\n";
}
}
@ -859,7 +859,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
if (pass || (filespace != -1)) {
if (H5Sclose(filespace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(filespace) failed.\n";
}
}
@ -956,7 +956,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
if (pass || (memspace != -1)) {
if (H5Sclose(memspace) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Sclose(memspace) failed.\n";
}
}
@ -969,7 +969,7 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
if (pass || (dxpl_id != -1)) {
if (H5Pclose(dxpl_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(dxpl_id) failed.\n";
}
}
@ -978,28 +978,28 @@ test_parallel_read(MPI_Comm comm, int mpi_rank, int mpi_size, int group_id)
/* close file, etc. */
if (pass || (dset_id != -1)) {
if (H5Dclose(dset_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dclose(dset_id) failed.\n";
}
}
if (pass || (dset_id_ch != -1)) {
if (H5Dclose(dset_id_ch) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Dclose(dset_id_ch) failed.\n";
}
}
if (pass || (file_id != -1)) {
if (H5Fclose(file_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Fclose(file_id) failed.\n";
}
}
if (pass || (fapl_id != -1)) {
if (H5Pclose(fapl_id) < 0) {
pass = false;
pass = FALSE;
failure_mssg = "H5Pclose(fapl_id) failed.\n";
}
}

2
tools/src/h5dump/h5dump.c
View File

@ -31,7 +31,7 @@ static h5tools_vol_info_t vol_info_g;
/* Default "anonymous" S3 configuration */
static H5FD_ros3_fapl_t ros3_fa_g = {
1, /* Structure Version */
false, /* Authenticate? */
FALSE, /* Authenticate? */
"", /* AWS Region */
"", /* Access Key ID */
"", /* Secret Access Key */

2
tools/src/h5ls/h5ls.c
View File

@ -2664,7 +2664,7 @@ main(int argc, const char *argv[])
/* Default "anonymous" S3 configuration */
H5FD_ros3_fapl_t ros3_fa = {
1, /* Structure Version */
false, /* Authenticate? */
FALSE, /* Authenticate? */
"", /* AWS Region */
"", /* Access Key ID */
"", /* Secret Access Key */

2
tools/src/h5stat/h5stat.c
View File

@ -122,7 +122,7 @@ static const char *drivername = NULL;
/* Default "anonymous" S3 configuration */
static H5FD_ros3_fapl_t ros3_fa = {
1, /* Structure Version */
false, /* Authenticate? */
FALSE, /* Authenticate? */
"", /* AWS Region */
"", /* Access Key ID */
"", /* Secret Access Key */