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

4 files changed, 15 insertions, 15 deletions

diff --git a/test/dsets.c b/test/dsets.c
index 4f2f75a..e7527a8 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -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 {
diff --git a/test/genall5.c b/test/genall5.c
index 41fd86a..8965304 100644
--- a/test/genall5.c
+++ b/test/genall5.c
@@ -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)) {
diff --git a/test/s3comms.c b/test/s3comms.c
index 36f6f49..48f11c5 100644
--- a/test/s3comms.c
+++ b/test/s3comms.c
@@ -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);
diff --git a/test/titerate.c b/test/titerate.c
index 0b20d8d..d0e7ca7 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -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 */