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

1 files changed, 70 insertions, 71 deletions

diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 67dfb83..0dbcb64 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -87,7 +87,7 @@
             /* Make sure the memory type is not smaller than the file type, otherwise the memory buffer      \
              * won't be big enough to serve as the type conversion buffer */                                 \
             if (mem_type_size >= file_type_size) {                                                           \
-                hbool_t is_contig;                                                                           \
+                bool    is_contig;                                                                           \
                 hsize_t sel_off;                                                                             \
                                                                                                              \
                 /* Check if the space is contiguous */                                                       \
@@ -98,7 +98,7 @@
                  */                                                                                          \
                 if (is_contig) {                                                                             \
                     H5_CHECK_OVERFLOW(sel_off, hsize_t, size_t);                                             \
-                    (PIECE_INFO)->in_place_tconv = TRUE;                                                     \
+                    (PIECE_INFO)->in_place_tconv = true;                                                     \
                     (PIECE_INFO)->buf_off        = (size_t)sel_off * mem_type_size;                          \
                 }                                                                                            \
             }                                                                                                \
@@ -127,8 +127,8 @@ typedef struct H5D_type_info_t {
     /* Computed/derived values */
     size_t                   src_type_size;  /* Size of source type */
     size_t                   dst_type_size;  /* Size of destination type */
-    hbool_t                  is_conv_noop;   /* Whether the type conversion is a NOOP */
-    hbool_t                  is_xform_noop;  /* Whether the data transform is a NOOP */
+    bool                     is_conv_noop;   /* Whether the type conversion is a NOOP */
+    bool                     is_xform_noop;  /* Whether the data transform is a NOOP */
     const H5T_subset_info_t *cmpd_subset;    /* Info related to the compound subset conversion functions */
     H5T_bkg_t                need_bkg;       /* Type of background buf needed */
     size_t                   request_nelmts; /* Requested strip mine */
@@ -142,8 +142,8 @@ typedef struct H5D_shared_t H5D_shared_t;
 /* Function pointers for I/O on particular types of dataset layouts */
 typedef herr_t (*H5D_layout_construct_func_t)(H5F_t *f, H5D_t *dset);
 typedef herr_t (*H5D_layout_init_func_t)(H5F_t *f, const H5D_t *dset, hid_t dapl_id);
-typedef hbool_t (*H5D_layout_is_space_alloc_func_t)(const H5O_storage_t *storage);
-typedef hbool_t (*H5D_layout_is_data_cached_func_t)(const H5D_shared_t *shared_dset);
+typedef bool (*H5D_layout_is_space_alloc_func_t)(const H5O_storage_t *storage);
+typedef bool (*H5D_layout_is_data_cached_func_t)(const H5D_shared_t *shared_dset);
 typedef herr_t (*H5D_layout_io_init_func_t)(struct H5D_io_info_t *io_info, struct H5D_dset_io_info_t *dinfo);
 typedef herr_t (*H5D_layout_mdio_init_func_t)(struct H5D_io_info_t      *io_info,
                                               struct H5D_dset_io_info_t *dinfo);
@@ -225,8 +225,8 @@ typedef struct {
 } H5D_chunk_storage_t;
 
 typedef struct {
-    void    *buf;   /* Buffer for compact dataset */
-    hbool_t *dirty; /* Pointer to dirty flag to mark */
+    void *buf;   /* Buffer for compact dataset */
+    bool *dirty; /* Pointer to dirty flag to mark */
 } H5D_compact_storage_t;
 
 typedef union H5D_storage_t {
@@ -252,7 +252,7 @@ typedef struct H5D_piece_info_t {
     unsigned fspace_shared;  /* Indicate that the file space for a chunk is shared and shouldn't be freed */
     H5S_t   *mspace;         /* Dataspace describing selection in memory corresponding to this chunk */
     unsigned mspace_shared;  /* Indicate that the memory space for a chunk is shared and shouldn't be freed */
-    hbool_t  in_place_tconv; /* Whether to perform type conversion in-place */
+    bool     in_place_tconv; /* Whether to perform type conversion in-place */
     size_t   buf_off;        /* Buffer offset for in-place type conversion */
     struct H5D_dset_io_info_t *dset_info; /* Pointer to dset_info */
 } H5D_piece_info_t;
@@ -279,7 +279,7 @@ typedef struct H5D_dset_io_info_t {
 
     hid_t           mem_type_id; /* memory datatype ID */
     H5D_type_info_t type_info;
-    hbool_t         skip_io; /* Whether to skip I/O for this dataset */
+    bool            skip_io; /* Whether to skip I/O for this dataset */
 } H5D_dset_io_info_t;
 
 /* I/O info for entire I/O operation */
@@ -288,7 +288,7 @@ typedef struct H5D_io_info_t {
     H5F_shared_t *f_sh; /* Pointer to shared file struct that dataset is within */
 #ifdef H5_HAVE_PARALLEL
     MPI_Comm comm;                     /* MPI communicator for file */
-    hbool_t  using_mpi_vfd;            /* Whether the file is using an MPI-based VFD */
+    bool     using_mpi_vfd;            /* Whether the file is using an MPI-based VFD */
 #endif                                 /* H5_HAVE_PARALLEL */
     H5D_md_io_ops_t         md_io_ops; /* Multi dataset I/O operation function pointers */
     H5D_io_op_type_t        op_type;
@@ -307,16 +307,15 @@ typedef struct H5D_io_info_t {
     H5_flexible_const_ptr_t base_maddr;          /* starting mem address */
     H5D_selection_io_mode_t use_select_io;       /* Whether to use selection I/O */
     uint8_t                *tconv_buf;           /* Datatype conv buffer */
-    hbool_t                 tconv_buf_allocated; /* Whether the type conversion buffer was allocated */
+    bool                    tconv_buf_allocated; /* Whether the type conversion buffer was allocated */
     size_t                  tconv_buf_size;      /* Size of type conversion buffer */
     uint8_t                *bkg_buf;             /* Background buffer */
-    hbool_t                 bkg_buf_allocated;   /* Whether the background buffer was allocated */
+    bool                    bkg_buf_allocated;   /* Whether the background buffer was allocated */
     size_t                  bkg_buf_size;        /* Size of background buffer */
     size_t max_tconv_type_size; /* Largest of all source and destination type sizes involved in type
                                    conversion */
-    hbool_t
-        must_fill_bkg; /* Whether any datasets need a background buffer filled with destination contents */
-    hbool_t may_use_in_place_tconv; /* Whether datasets in this I/O could potentially use in-place type
+    bool must_fill_bkg; /* Whether any datasets need a background buffer filled with destination contents */
+    bool may_use_in_place_tconv; /* Whether datasets in this I/O could potentially use in-place type
                                        conversion if the type sizes are compatible with it */
 #ifdef H5_HAVE_PARALLEL
     H5D_mpio_actual_io_mode_t actual_io_mode; /* Actual type of collective or independent I/O */
@@ -380,7 +379,7 @@ typedef struct H5D_chunk_ud_t {
     unsigned    idx_hint;         /* Index of chunk in cache, if present */
     H5F_block_t chunk_block;      /* Offset/length of chunk in file */
     unsigned    filter_mask;      /* Excluded filters */
-    hbool_t     new_unfilt_chunk; /* Whether the chunk just became unfiltered */
+    bool        new_unfilt_chunk; /* Whether the chunk just became unfiltered */
     hsize_t     chunk_idx;        /* Chunk index for EA, FA indexing */
 } H5D_chunk_ud_t;
 
@@ -391,7 +390,7 @@ typedef int (*H5D_chunk_cb_func_t)(const H5D_chunk_rec_t *chunk_rec, void *udata
 typedef herr_t (*H5D_chunk_init_func_t)(const H5D_chk_idx_info_t *idx_info, const H5S_t *space,
                                         haddr_t dset_ohdr_addr);
 typedef herr_t (*H5D_chunk_create_func_t)(const H5D_chk_idx_info_t *idx_info);
-typedef hbool_t (*H5D_chunk_is_space_alloc_func_t)(const H5O_storage_chunk_t *storage);
+typedef bool (*H5D_chunk_is_space_alloc_func_t)(const H5O_storage_chunk_t *storage);
 typedef herr_t (*H5D_chunk_insert_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata,
                                           const H5D_t *dset);
 typedef herr_t (*H5D_chunk_get_addr_func_t)(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata);
@@ -405,13 +404,13 @@ typedef herr_t (*H5D_chunk_copy_setup_func_t)(const H5D_chk_idx_info_t *idx_info
 typedef herr_t (*H5D_chunk_copy_shutdown_func_t)(H5O_storage_chunk_t *storage_src,
                                                  H5O_storage_chunk_t *storage_dst);
 typedef herr_t (*H5D_chunk_size_func_t)(const H5D_chk_idx_info_t *idx_info, hsize_t *idx_size);
-typedef herr_t (*H5D_chunk_reset_func_t)(H5O_storage_chunk_t *storage, hbool_t reset_addr);
+typedef herr_t (*H5D_chunk_reset_func_t)(H5O_storage_chunk_t *storage, bool reset_addr);
 typedef herr_t (*H5D_chunk_dump_func_t)(const H5O_storage_chunk_t *storage, FILE *stream);
 typedef herr_t (*H5D_chunk_dest_func_t)(const H5D_chk_idx_info_t *idx_info);
 
 /* Typedef for grouping chunk I/O routines */
 typedef struct H5D_chunk_ops_t {
-    hbool_t                 can_swim; /* Flag to indicate that the index supports SWMR access */
+    bool                    can_swim; /* Flag to indicate that the index supports SWMR access */
     H5D_chunk_init_func_t   init;     /* Routine to initialize indexing information in memory */
     H5D_chunk_create_func_t create;   /* Routine to create chunk index */
     H5D_chunk_is_space_alloc_func_t
@@ -445,7 +444,7 @@ typedef struct H5D_chunk_map_t {
 
     H5S_t            *single_space;      /* Dataspace for single chunk */
     H5D_piece_info_t *single_piece_info; /* Pointer to single chunk's info */
-    hbool_t           use_single;        /* Whether I/O is on a single element */
+    bool              use_single;        /* Whether I/O is on a single element */
 
     hsize_t           last_index;      /* Index of last chunk operated on */
     H5D_piece_info_t *last_piece_info; /* Pointer to last chunk's info */
@@ -455,7 +454,7 @@ typedef struct H5D_chunk_map_t {
 
 /* Cached information about a particular chunk */
 typedef struct H5D_chunk_cached_t {
-    hbool_t  valid;                    /*whether cache info is valid*/
+    bool     valid;                    /*whether cache info is valid*/
     hsize_t  scaled[H5O_LAYOUT_NDIMS]; /*scaled offset of chunk*/
     haddr_t  addr;                     /*file address of chunk */
     uint32_t nbytes;                   /*size of stored data */
@@ -510,7 +509,7 @@ typedef struct H5D_rdcdc_t {
     haddr_t        sieve_loc;      /* File location (offset) of the data sieve buffer */
     size_t         sieve_size;     /* Size of the data sieve buffer used (in bytes) */
     size_t         sieve_buf_size; /* Size of the data sieve buffer allocated (in bytes) */
-    hbool_t        sieve_dirty;    /* Flag to indicate that the data sieve buffer is dirty */
+    bool           sieve_dirty;    /* Flag to indicate that the data sieve buffer is dirty */
 } H5D_rdcdc_t;
 
 /*
@@ -521,7 +520,7 @@ typedef struct H5D_rdcdc_t {
  */
 struct H5D_shared_t {
     size_t           fo_count;        /* Reference count */
-    hbool_t          closing;         /* Flag to indicate dataset is closing */
+    bool             closing;         /* Flag to indicate dataset is closing */
     hid_t            type_id;         /* ID for dataset's datatype    */
     H5T_t           *type;            /* Datatype for this dataset     */
     H5S_t           *space;           /* Dataspace of this dataset    */
@@ -529,7 +528,7 @@ struct H5D_shared_t {
     hid_t            dapl_id;         /* Dataset access property id */
     H5D_dcpl_cache_t dcpl_cache;      /* Cached DCPL values */
     H5O_layout_t     layout;          /* Data layout                  */
-    hbool_t          checked_filters; /* TRUE if dataset passes can_apply check */
+    bool             checked_filters; /* true if dataset passes can_apply check */
 
     /* Cached dataspace info */
     unsigned ndims;                       /* The dataset's dataspace rank */
@@ -588,7 +587,7 @@ typedef struct H5D_fill_buf_info_t {
     const H5O_fill_t *fill;        /* Pointer to fill value */
     void             *fill_buf;    /* Fill buffer */
     size_t            fill_buf_size;                 /* Size of fill buffer */
-    hbool_t           use_caller_fill_buf;           /* Whether the caller provided the fill buffer */
+    bool              use_caller_fill_buf;           /* Whether the caller provided the fill buffer */
     void             *bkg_buf;                       /* Background conversion buffer */
     size_t            bkg_buf_size;                  /* Size of background buffer */
     H5T_t            *mem_type;                      /* Pointer to memory datatype */
@@ -598,7 +597,7 @@ typedef struct H5D_fill_buf_info_t {
     size_t            mem_elmt_size, file_elmt_size; /* Size of element in memory and on disk */
     size_t            max_elmt_size;                 /* Max. size of memory or file datatype */
     size_t            elmts_per_buf;                 /* # of elements that fit into a buffer */
-    hbool_t has_vlen_fill_type; /* Whether the datatype for the fill value has a variable-length component */
+    bool has_vlen_fill_type; /* Whether the datatype for the fill value has a variable-length component */
 } H5D_fill_buf_info_t;
 
 /*****************************/
@@ -638,11 +637,11 @@ H5_DLL H5D_t  *H5D__open_name(const H5G_loc_t *loc, const char *name, hid_t dapl
 H5_DLL hid_t   H5D__get_space(const H5D_t *dset);
 H5_DLL hid_t   H5D__get_type(const H5D_t *dset);
 H5_DLL herr_t  H5D__get_space_status(const H5D_t *dset, H5D_space_status_t *allocation);
-H5_DLL herr_t  H5D__alloc_storage(H5D_t *dset, H5D_time_alloc_t time_alloc, hbool_t full_overwrite,
+H5_DLL herr_t  H5D__alloc_storage(H5D_t *dset, H5D_time_alloc_t time_alloc, bool full_overwrite,
                                   hsize_t old_dim[]);
 H5_DLL herr_t  H5D__get_storage_size(const H5D_t *dset, hsize_t *storage_size);
 H5_DLL herr_t  H5D__get_chunk_storage_size(H5D_t *dset, const hsize_t *offset, hsize_t *storage_size);
-H5_DLL herr_t  H5D__chunk_index_empty(const H5D_t *dset, hbool_t *empty);
+H5_DLL herr_t  H5D__chunk_index_empty(const H5D_t *dset, bool *empty);
 H5_DLL herr_t  H5D__get_num_chunks(const H5D_t *dset, const H5S_t *space, hsize_t *nchunks);
 H5_DLL herr_t  H5D__get_chunk_info(const H5D_t *dset, const H5S_t *space, hsize_t chk_idx, hsize_t *coord,
                                    unsigned *filter_mask, haddr_t *offset, hsize_t *size);
@@ -686,7 +685,7 @@ H5_DLL herr_t H5D__scatgath_write_select(H5D_io_info_t *io_info);
 
 /* Functions that operate on dataset's layout information */
 H5_DLL herr_t H5D__layout_set_io_ops(const H5D_t *dataset);
-H5_DLL size_t H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include_compact_data);
+H5_DLL size_t H5D__layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, bool include_compact_data);
 H5_DLL herr_t H5D__layout_set_version(H5F_t *f, H5O_layout_t *layout);
 H5_DLL herr_t H5D__layout_set_latest_indexing(H5O_layout_t *layout, const H5S_t *space,
                                               const H5D_dcpl_cache_t *dcpl_cache);
@@ -695,37 +694,37 @@ H5_DLL herr_t H5D__layout_oh_read(H5D_t *dset, hid_t dapl_id, H5P_genplist_t *pl
 H5_DLL herr_t H5D__layout_oh_write(const H5D_t *dataset, H5O_t *oh, unsigned update_flags);
 
 /* Functions that operate on contiguous storage */
-H5_DLL herr_t  H5D__contig_alloc(H5F_t *f, H5O_storage_contig_t *storage);
-H5_DLL hbool_t H5D__contig_is_space_alloc(const H5O_storage_t *storage);
-H5_DLL hbool_t H5D__contig_is_data_cached(const H5D_shared_t *shared_dset);
-H5_DLL herr_t  H5D__contig_fill(H5D_t *dset);
-H5_DLL herr_t  H5D__contig_read(H5D_io_info_t *io_info, H5D_dset_io_info_t *dinfo);
-H5_DLL herr_t  H5D__contig_write(H5D_io_info_t *io_info, H5D_dset_io_info_t *dinfo);
-H5_DLL herr_t  H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f_dst,
-                                H5O_storage_contig_t *storage_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info);
-H5_DLL herr_t  H5D__contig_delete(H5F_t *f, const H5O_storage_t *store);
+H5_DLL herr_t H5D__contig_alloc(H5F_t *f, H5O_storage_contig_t *storage);
+H5_DLL bool   H5D__contig_is_space_alloc(const H5O_storage_t *storage);
+H5_DLL bool   H5D__contig_is_data_cached(const H5D_shared_t *shared_dset);
+H5_DLL herr_t H5D__contig_fill(H5D_t *dset);
+H5_DLL herr_t H5D__contig_read(H5D_io_info_t *io_info, H5D_dset_io_info_t *dinfo);
+H5_DLL herr_t H5D__contig_write(H5D_io_info_t *io_info, H5D_dset_io_info_t *dinfo);
+H5_DLL herr_t H5D__contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src, H5F_t *f_dst,
+                               H5O_storage_contig_t *storage_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info);
+H5_DLL herr_t H5D__contig_delete(H5F_t *f, const H5O_storage_t *store);
 
 /* Functions that operate on chunked dataset storage */
 H5_DLL htri_t H5D__chunk_cacheable(const H5D_io_info_t *io_info, H5D_dset_io_info_t *dset_info, haddr_t caddr,
-                                   hbool_t write_op);
+                                   bool write_op);
 H5_DLL herr_t H5D__chunk_create(const H5D_t *dset /*in,out*/);
 H5_DLL herr_t H5D__chunk_set_info(const H5D_t *dset);
-H5_DLL hbool_t H5D__chunk_is_space_alloc(const H5O_storage_t *storage);
-H5_DLL hbool_t H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset);
-H5_DLL herr_t  H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udata);
-H5_DLL herr_t  H5D__chunk_allocated(const H5D_t *dset, hsize_t *nbytes);
-H5_DLL herr_t  H5D__chunk_allocate(const H5D_t *dset, hbool_t full_overwrite, const hsize_t old_dim[]);
-H5_DLL herr_t  H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old_chunk,
-                                     H5F_block_t *new_chunk, hbool_t *need_insert, const hsize_t *scaled);
-H5_DLL void   *H5D__chunk_mem_alloc(size_t size, void *pline);
-H5_DLL void    H5D__chunk_mem_free(void *chk, void *pline);
-H5_DLL void   *H5D__chunk_mem_xfree(void *chk, const void *pline);
-H5_DLL void   *H5D__chunk_mem_realloc(void *chk, size_t size, const H5O_pline_t *pline);
-H5_DLL herr_t  H5D__chunk_update_old_edge_chunks(H5D_t *dset, hsize_t old_dim[]);
-H5_DLL hbool_t H5D__chunk_is_partial_edge_chunk(unsigned dset_ndims, const uint32_t *chunk_dims,
-                                                const hsize_t *chunk_scaled, const hsize_t *dset_dims);
-H5_DLL herr_t  H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim);
-H5_DLL herr_t  H5D__chunk_set_sizes(H5D_t *dset);
+H5_DLL bool   H5D__chunk_is_space_alloc(const H5O_storage_t *storage);
+H5_DLL bool   H5D__chunk_is_data_cached(const H5D_shared_t *shared_dset);
+H5_DLL herr_t H5D__chunk_lookup(const H5D_t *dset, const hsize_t *scaled, H5D_chunk_ud_t *udata);
+H5_DLL herr_t H5D__chunk_allocated(const H5D_t *dset, hsize_t *nbytes);
+H5_DLL herr_t H5D__chunk_allocate(const H5D_t *dset, bool full_overwrite, const hsize_t old_dim[]);
+H5_DLL herr_t H5D__chunk_file_alloc(const H5D_chk_idx_info_t *idx_info, const H5F_block_t *old_chunk,
+                                    H5F_block_t *new_chunk, bool *need_insert, const hsize_t *scaled);
+H5_DLL void  *H5D__chunk_mem_alloc(size_t size, void *pline);
+H5_DLL void   H5D__chunk_mem_free(void *chk, void *pline);
+H5_DLL void  *H5D__chunk_mem_xfree(void *chk, const void *pline);
+H5_DLL void  *H5D__chunk_mem_realloc(void *chk, size_t size, const H5O_pline_t *pline);
+H5_DLL herr_t H5D__chunk_update_old_edge_chunks(H5D_t *dset, hsize_t old_dim[]);
+H5_DLL bool   H5D__chunk_is_partial_edge_chunk(unsigned dset_ndims, const uint32_t *chunk_dims,
+                                               const hsize_t *chunk_scaled, const hsize_t *dset_dims);
+H5_DLL herr_t H5D__chunk_prune_by_extent(H5D_t *dset, const hsize_t *old_dim);
+H5_DLL herr_t H5D__chunk_set_sizes(H5D_t *dset);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5D__chunk_addrmap(const H5D_t *dset, haddr_t chunk_addr[]);
 #endif /* H5_HAVE_PARALLEL */
@@ -742,7 +741,7 @@ H5_DLL herr_t H5D__chunk_direct_write(H5D_t *dset, uint32_t filters, hsize_t *of
                                       const void *buf);
 H5_DLL herr_t H5D__chunk_direct_read(const H5D_t *dset, hsize_t *offset, uint32_t *filters, void *buf);
 #ifdef H5D_CHUNK_DEBUG
-H5_DLL herr_t H5D__chunk_stats(const H5D_t *dset, hbool_t headers);
+H5_DLL herr_t H5D__chunk_stats(const H5D_t *dset, bool headers);
 #endif /* H5D_CHUNK_DEBUG */
 
 /* format convert */
@@ -755,21 +754,21 @@ H5_DLL herr_t H5D__compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src
                                 H5O_storage_compact_t *storage_dst, H5T_t *src_dtype, H5O_copy_t *cpy_info);
 
 /* Functions that operate on virtual dataset storage */
-H5_DLL herr_t  H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout);
-H5_DLL herr_t  H5D__virtual_copy_layout(H5O_layout_t *layout);
-H5_DLL herr_t  H5D__virtual_set_extent_unlim(const H5D_t *dset);
-H5_DLL herr_t  H5D__virtual_reset_layout(H5O_layout_t *layout);
-H5_DLL herr_t  H5D__virtual_delete(H5F_t *f, H5O_storage_t *storage);
-H5_DLL herr_t  H5D__virtual_copy(H5F_t *f_src, H5O_layout_t *layout_dst);
-H5_DLL herr_t  H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id);
-H5_DLL hbool_t H5D__virtual_is_space_alloc(const H5O_storage_t *storage);
-H5_DLL herr_t  H5D__virtual_hold_source_dset_files(const H5D_t *dset, H5D_virtual_held_file_t **head);
-H5_DLL herr_t  H5D__virtual_refresh_source_dsets(H5D_t *dset);
-H5_DLL herr_t  H5D__virtual_release_source_dset_files(H5D_virtual_held_file_t *head);
+H5_DLL herr_t H5D__virtual_store_layout(H5F_t *f, H5O_layout_t *layout);
+H5_DLL herr_t H5D__virtual_copy_layout(H5O_layout_t *layout);
+H5_DLL herr_t H5D__virtual_set_extent_unlim(const H5D_t *dset);
+H5_DLL herr_t H5D__virtual_reset_layout(H5O_layout_t *layout);
+H5_DLL herr_t H5D__virtual_delete(H5F_t *f, H5O_storage_t *storage);
+H5_DLL herr_t H5D__virtual_copy(H5F_t *f_src, H5O_layout_t *layout_dst);
+H5_DLL herr_t H5D__virtual_init(H5F_t *f, const H5D_t *dset, hid_t dapl_id);
+H5_DLL bool   H5D__virtual_is_space_alloc(const H5O_storage_t *storage);
+H5_DLL herr_t H5D__virtual_hold_source_dset_files(const H5D_t *dset, H5D_virtual_held_file_t **head);
+H5_DLL herr_t H5D__virtual_refresh_source_dsets(H5D_t *dset);
+H5_DLL herr_t H5D__virtual_release_source_dset_files(H5D_virtual_held_file_t *head);
 
 /* Functions that operate on EFL (External File List)*/
-H5_DLL hbool_t H5D__efl_is_space_alloc(const H5O_storage_t *storage);
-H5_DLL herr_t  H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size);
+H5_DLL bool   H5D__efl_is_space_alloc(const H5O_storage_t *storage);
+H5_DLL herr_t H5D__efl_bh_info(H5F_t *f, H5O_efl_t *efl, hsize_t *heap_size);
 
 /* Functions that perform fill value operations on datasets */
 H5_DLL herr_t H5D__fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_type,
@@ -816,7 +815,7 @@ H5_DLL herr_t H5D__free_piece_info(void *item, void *key, void *opdata);
 #ifdef H5D_TESTING
 H5_DLL herr_t H5D__layout_version_test(hid_t did, unsigned *version);
 H5_DLL herr_t H5D__layout_contig_size_test(hid_t did, hsize_t *size);
-H5_DLL herr_t H5D__layout_compact_dirty_test(hid_t did, hbool_t *dirty);
+H5_DLL herr_t H5D__layout_compact_dirty_test(hid_t did, bool *dirty);
 H5_DLL herr_t H5D__layout_idx_type_test(hid_t did, H5D_chunk_index_t *idx_type);
 H5_DLL herr_t H5D__layout_type_test(hid_t did, H5D_layout_t *layout_type);
 H5_DLL herr_t H5D__current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused);