Switch to hbool_t and TRUE/FALSE in library code

4 files changed, 38 insertions, 38 deletions

diff --git a/src/H5FDvfd_swmr.c b/src/H5FDvfd_swmr.c
index bc82be5..3a7a5c5 100644
--- a/src/H5FDvfd_swmr.c
+++ b/src/H5FDvfd_swmr.c
@@ -64,7 +64,7 @@ typedef struct H5FD_vfd_swmr_t {
                                                 /* and to FALSE otherwise.    */
                                                 /* Used for sanity checking.  */
     H5F_vfd_swmr_config_t config;
-    bool writer;                            /* True iff configured to write.
+    hbool_t writer;                         /* True iff configured to write.
                                              * All methods on a write-mode
                                              * SWMR VFD instance are passed
                                              * to the lower VFD instance.
@@ -263,7 +263,7 @@ static herr_t
 H5FD__swmr_reader_open(H5FD_vfd_swmr_t *file)
 {
     h5_retry_t retry;
-    bool do_try;                             /* more tries remain */
+    hbool_t do_try;                         /* more tries remain */
     herr_t      ret_value = SUCCEED;
     FUNC_ENTER_STATIC
 
@@ -555,7 +555,7 @@ H5FD_vfd_swmr_dedup(H5FD_t *_self, H5FD_t *_other, hid_t fapl)
         H5FD_vfd_swmr_t *other = (H5FD_vfd_swmr_t *)_other;
         H5P_genplist_t *plist;
         H5F_vfd_swmr_config_t *config;
-        bool equal_configs;
+        hbool_t equal_configs;
 
         if (H5FD_cmp(self->hdf5_file_lf, other->hdf5_file_lf) != 0)
             return _other;
@@ -843,7 +843,7 @@ H5FD_vfd_swmr_read(H5FD_t *_file, H5FD_mem_t type,
     target_page = addr / fs_page_size;
 
     entry = vfd_swmr_pageno_to_mdf_idx_entry(index, num_entries, target_page,
-        false);
+        FALSE);
 
     if (entry == NULL) {
          /* Cannot find addr in index, read from the underlying hdf5 file */
@@ -1083,7 +1083,7 @@ done:
 static herr_t
 H5FD__vfd_swmr_load_hdr_and_idx(H5FD_vfd_swmr_t *file, hbool_t open)
 {
-    bool do_try;
+    hbool_t do_try;
     h5_retry_t retry;
     H5FD_vfd_swmr_md_header md_header;      /* Metadata file header, take 1 */
     H5FD_vfd_swmr_md_header md_header_two;  /* Metadata file header, take 2 */
diff --git a/src/H5FDvfd_swmr_private.h b/src/H5FDvfd_swmr_private.h
index feb75c9..551adaa 100644
--- a/src/H5FDvfd_swmr_private.h
+++ b/src/H5FDvfd_swmr_private.h
@@ -74,10 +74,10 @@ H5_DLL herr_t H5F_update_vfd_swmr_metadata_file(struct H5F_t *f,
 H5_DLL herr_t H5F_vfd_swmr_writer__delay_write(struct H5F_shared_t *, uint64_t,
     uint64_t *);
 H5_DLL herr_t H5F_vfd_swmr_writer__prep_for_flush_or_close(struct H5F_t *f);
-herr_t H5F_vfd_swmr_process_eot_queue(bool);
-H5_DLL herr_t H5F_vfd_swmr_writer_end_of_tick(struct H5F_t *f, bool);
+herr_t H5F_vfd_swmr_process_eot_queue(hbool_t);
+H5_DLL herr_t H5F_vfd_swmr_writer_end_of_tick(struct H5F_t *f, hbool_t);
 H5_DLL herr_t H5F_vfd_swmr_writer__dump_index(struct H5F_shared_t *);
-H5_DLL herr_t H5F_vfd_swmr_reader_end_of_tick(struct H5F_t *f, bool);
+H5_DLL herr_t H5F_vfd_swmr_reader_end_of_tick(struct H5F_t *f, hbool_t);
 
 H5_DLL herr_t H5F_vfd_swmr_remove_entry_eot(struct H5F_t *f);
 H5_DLL herr_t H5F_vfd_swmr_insert_entry_eot(struct H5F_t *f);
diff --git a/src/H5Fvfd_swmr.c b/src/H5Fvfd_swmr.c
index b408e54..1ff9ef7 100644
--- a/src/H5Fvfd_swmr.c
+++ b/src/H5Fvfd_swmr.c
@@ -412,7 +412,7 @@ H5F_update_vfd_swmr_metadata_file(H5F_t *f, uint32_t num_entries,
     haddr_t md_addr;                        /* Address in the metadata file */
     uint32_t i;                             /* Local index variable */
     herr_t ret_value = SUCCEED;             /* Return value */
-    bool queue_was_nonempty;
+    hbool_t queue_was_nonempty;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -612,7 +612,7 @@ H5F_vfd_swmr_writer__delay_write(H5F_shared_t *shared, uint64_t page,
         ie_ptr = NULL;
     } else {
         ie_ptr = vfd_swmr_pageno_to_mdf_idx_entry(idx,
-            shared->mdf_idx_entries_used, page, false);
+            shared->mdf_idx_entries_used, page, FALSE);
     }
 
     if (ie_ptr == NULL)
@@ -678,7 +678,7 @@ H5F_vfd_swmr_writer__prep_for_flush_or_close(H5F_t *f)
      * tick so as to avoid attempts to flush entries on the page buffer 
      * tick list that were modified during the current tick.
      */
-    if ( H5F_vfd_swmr_writer_end_of_tick(f, true) < 0 )
+    if ( H5F_vfd_swmr_writer_end_of_tick(f, TRUE) < 0 )
 
         HGOTO_ERROR(H5E_FILE, H5E_SYSTEM, FAIL, \
                     "H5F_vfd_swmr_writer_end_of_tick() failed.")
@@ -789,7 +789,7 @@ clean_shadow_index(H5F_t *f, uint32_t nentries,
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_vfd_swmr_writer_end_of_tick(H5F_t *f, bool wait_for_reader)
+H5F_vfd_swmr_writer_end_of_tick(H5F_t *f, hbool_t wait_for_reader)
 {
     H5F_shared_t *shared = f->shared;
     uint32_t idx_entries_added = 0;
@@ -798,7 +798,7 @@ H5F_vfd_swmr_writer_end_of_tick(H5F_t *f, bool wait_for_reader)
     uint32_t idx_ent_not_in_tl = 0;
     uint32_t idx_ent_not_in_tl_flushed = 0;
     herr_t ret_value = SUCCEED;              /* Return value */
-    bool incr_tick = false;
+    hbool_t incr_tick = FALSE;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -810,7 +810,7 @@ H5F_vfd_swmr_writer_end_of_tick(H5F_t *f, bool wait_for_reader)
             wait_for_reader))
         goto update_eot;
 
-    incr_tick = true;
+    incr_tick = TRUE;
 
     /* 1) If requested, flush all raw data to the HDF5 file.
      *
@@ -1047,7 +1047,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_vfd_swmr_reader_end_of_tick(H5F_t *f, bool entering_api)
+H5F_vfd_swmr_reader_end_of_tick(H5F_t *f, hbool_t entering_api)
 {
     uint64_t tmp_tick_num = 0;
     H5FD_vfd_swmr_idx_entry_t * tmp_mdf_idx;
@@ -1940,7 +1940,7 @@ H5F__vfd_swmr_writer__wait_a_tick(H5F_t *f)
 
         HGOTO_ERROR(H5E_FILE, H5E_SYSTEM, FAIL, "HDnanosleep() failed.")
         
-    if ( H5F_vfd_swmr_writer_end_of_tick(f, false) < 0 )
+    if ( H5F_vfd_swmr_writer_end_of_tick(f, FALSE) < 0 )
 
         HGOTO_ERROR(H5E_FILE, H5E_SYSTEM, FAIL, \
                     "H5F_vfd_swmr_writer_end_of_tick() failed.")
@@ -1952,7 +1952,7 @@ done:
 } /* H5F__vfd_swmr_writer__wait_a_tick() */
 
 herr_t
-H5F_vfd_swmr_process_eot_queue(bool entering_api)
+H5F_vfd_swmr_process_eot_queue(hbool_t entering_api)
 {
     struct timespec now;
     eot_queue_entry_t *first_head, *head;
@@ -1981,7 +1981,7 @@ H5F_vfd_swmr_process_eot_queue(bool entering_api)
         if (timespeccmp(&head->end_of_tick, &shared->end_of_tick, <)) {
             H5F_vfd_swmr_update_entry_eot(head);
         } else if (shared->vfd_swmr_writer) {
-            if (H5F_vfd_swmr_writer_end_of_tick(f, false) < 0)
+            if (H5F_vfd_swmr_writer_end_of_tick(f, FALSE) < 0)
                 HGOTO_ERROR(H5E_FUNC, H5E_CANTSET, FAIL,
                             "end of tick error for VFD SWMR writer");
         } else if (H5F_vfd_swmr_reader_end_of_tick(f, entering_api) < 0) {
diff --git a/src/H5PB.c b/src/H5PB.c
index 12de5b4..66e0687 100644
--- a/src/H5PB.c
+++ b/src/H5PB.c
@@ -89,7 +89,7 @@ static herr_t H5PB__create_new_page(H5PB_t *pb_ptr, haddr_t addr, size_t size,
 
 static void H5PB__deallocate_page(H5PB_entry_t *entry_ptr);
 
-static herr_t H5PB__evict_entry(H5F_shared_t *, H5PB_entry_t *, bool, bool);
+static herr_t H5PB__evict_entry(H5F_shared_t *, H5PB_entry_t *, hbool_t, hbool_t);
 
 static herr_t H5PB__flush_entry(H5F_shared_t *, H5PB_t *, H5PB_entry_t *);
 
@@ -760,7 +760,7 @@ H5PB_dest(H5F_shared_t *shared)
                                     "Can't flush entry")
                 }
 
-                if ( H5PB__evict_entry(shared, evict_ptr, TRUE, true) < 0 )
+                if ( H5PB__evict_entry(shared, evict_ptr, TRUE, TRUE) < 0 )
 
                     HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                                 "forced eviction failed")
@@ -1453,13 +1453,13 @@ done:
  * this routine performs an O(n) copy of index entries.
  */
 static int
-shadow_idx_entry_remove(H5F_shared_t *shared, uint64_t page, bool only_mark)
+shadow_idx_entry_remove(H5F_shared_t *shared, uint64_t page, hbool_t only_mark)
 {
     ptrdiff_t i;
     H5FD_vfd_swmr_idx_entry_t *entry;
 
     entry = vfd_swmr_pageno_to_mdf_idx_entry(shared->mdf_idx,
-        shared->mdf_idx_entries_used, page, false);
+        shared->mdf_idx_entries_used, page, FALSE);
 
     if (entry == NULL)
         return 0;
@@ -1471,7 +1471,7 @@ shadow_idx_entry_remove(H5F_shared_t *shared, uint64_t page, bool only_mark)
     }
 
     if (only_mark) {
-        entry->garbage = true;
+        entry->garbage = TRUE;
         return 0;
     }
 
@@ -1590,11 +1590,11 @@ H5PB_remove_entry(H5F_shared_t *shared, haddr_t addr)
             HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                         "mark entry clean failed")
 
-        if ( H5PB__evict_entry(shared, entry_ptr, TRUE, false) < 0 )
+        if ( H5PB__evict_entry(shared, entry_ptr, TRUE, FALSE) < 0 )
 
             HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, "forced eviction failed")
 
-        HDassert(!shared->vfd_swmr_writer || vfd_swmr_pageno_to_mdf_idx_entry(shared->mdf_idx, shared->mdf_idx_entries_used, page, false) == NULL);
+        HDassert(!shared->vfd_swmr_writer || vfd_swmr_pageno_to_mdf_idx_entry(shared->mdf_idx, shared->mdf_idx_entries_used, page, FALSE) == NULL);
     }
 
 done:
@@ -1924,7 +1924,7 @@ H5PB_vfd_swmr__release_delayed_writes(H5F_shared_t *shared)
                 HGOTO_ERROR(H5E_PAGEBUF, H5E_WRITEERROR, FAIL, \
                             "flush of mpmde failed")
 
-            if ( H5PB__evict_entry(shared, entry_ptr, TRUE, false) < 0 )
+            if ( H5PB__evict_entry(shared, entry_ptr, TRUE, FALSE) < 0 )
 
                 HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                             "eviction of mpmde failed")
@@ -2003,7 +2003,7 @@ H5PB_vfd_swmr__release_tick_list(H5F_shared_t *shared)
                     HGOTO_ERROR(H5E_PAGEBUF, H5E_WRITEERROR, FAIL, \
                                 "flush of mpmde failed")
 
-                if ( H5PB__evict_entry(shared, entry_ptr, TRUE, false) < 0 )
+                if ( H5PB__evict_entry(shared, entry_ptr, TRUE, FALSE) < 0 )
 
                     HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                                 "eviction of mpmde failed")
@@ -2217,7 +2217,7 @@ H5PB_vfd_swmr__update_index(H5F_t *f,
         /* see if the shadow index already contains an entry for *entry. */
 
         ie_ptr = vfd_swmr_pageno_to_mdf_idx_entry(idx,
-            shared->mdf_idx_entries_used, target_page, false);
+            shared->mdf_idx_entries_used, target_page, FALSE);
 
         if ( ie_ptr == NULL ) { /* alloc new entry in the metadata file index*/
             uint32_t new_index_entry_index;
@@ -2245,8 +2245,8 @@ H5PB_vfd_swmr__update_index(H5F_t *f,
             /* ie_ptr->clean                initialized below */
             /* ie_ptr->tick_of_last_flush   initialized below */
             ie_ptr->delayed_flush        = entry->delay_write_until;
-            ie_ptr->moved_to_lower_file  = false;
-            ie_ptr->garbage              = false;
+            ie_ptr->moved_to_lower_file  = FALSE;
+            ie_ptr->garbage              = FALSE;
             ie_ptr->length               = (uint32_t)entry->size;
 
         } else {
@@ -2271,7 +2271,7 @@ H5PB_vfd_swmr__update_index(H5F_t *f,
         ie_ptr->entry_ptr            = entry->image_ptr;
         ie_ptr->tick_of_last_change  = tick_num;
         HDassert(entry->is_dirty);
-        ie_ptr->clean                = false;
+        ie_ptr->clean                = FALSE;
         ie_ptr->tick_of_last_flush = 0;
     }
 
@@ -3147,8 +3147,8 @@ H5PB__deallocate_page(H5PB_entry_t *entry_ptr)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5PB__evict_entry(H5F_shared_t *shared, H5PB_entry_t *entry_ptr, bool force,
-    bool only_mark)
+H5PB__evict_entry(H5F_shared_t *shared, H5PB_entry_t *entry_ptr, hbool_t force,
+    hbool_t only_mark)
 {
     H5PB_t *pb_ptr = shared->pb_ptr;
     herr_t ret_value = SUCCEED;    /* Return value */
@@ -3643,7 +3643,7 @@ H5PB__make_space(H5F_shared_t *shared, H5PB_t *pb_ptr, H5FD_mem_t inserted_type)
 
             evict_ptr = search_ptr;
             search_ptr = search_ptr->prev;
-            if ( H5PB__evict_entry(shared, evict_ptr, FALSE, false) < 0 )
+            if ( H5PB__evict_entry(shared, evict_ptr, FALSE, FALSE) < 0 )
 
                 HGOTO_ERROR(H5E_PAGEBUF, H5E_WRITEERROR, FAIL, \
                             "Can't evict entry")
@@ -4108,7 +4108,7 @@ H5PB__read_meta(H5F_shared_t *shared, H5FD_mem_t type, haddr_t addr,
                         HDassert( ! ( entry_ptr->is_dirty ) );
 
                         if ( H5PB__evict_entry(shared, entry_ptr, 
-                                               TRUE, false) < 0 )
+                                               TRUE, FALSE) < 0 )
 
                             HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                                         "forced eviction failed (1)")
@@ -4692,7 +4692,7 @@ H5PB__write_meta(H5F_shared_t *shared, H5FD_mem_t type, haddr_t addr,
 
             entry_ptr->image_ptr = H5MM_xfree(entry_ptr->image_ptr);
             entry_ptr->image_ptr = new_image;
-            entry_ptr->is_mpmde = true;
+            entry_ptr->is_mpmde = TRUE;
             entry_ptr->size = size;
 
             if (entry_ptr->modified_this_tick)
@@ -4769,7 +4769,7 @@ H5PB__write_meta(H5F_shared_t *shared, H5FD_mem_t type, haddr_t addr,
      * already present.
      */
     if (pb_ptr->vfd_swmr_writer && !entry_ptr->modified_this_tick) {
-        entry_ptr->modified_this_tick = true;
+        entry_ptr->modified_this_tick = TRUE;
         H5PB__INSERT_IN_TL(pb_ptr, entry_ptr, FAIL)
     }
 
@@ -4924,7 +4924,7 @@ H5PB__write_raw(H5F_shared_t *shared, H5FD_mem_t type, haddr_t addr,
                         HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                                     "mark entry clean failed")
 
-                    if (H5PB__evict_entry(shared, entry_ptr, TRUE, false) < 0)
+                    if (H5PB__evict_entry(shared, entry_ptr, TRUE, FALSE) < 0)
 
                         HGOTO_ERROR(H5E_PAGEBUF, H5E_SYSTEM, FAIL, \
                                     "forced eviction failed (1)")