From 3b47e2d227d07ef061e0ad583e1e4f50e0c4b92d Mon Sep 17 00:00:00 2001 From: Dana Robinson <43805+derobins@users.noreply.github.com> Date: Mon, 15 Sep 2025 15:36:22 -0700 Subject: [PATCH] Remove hbool_t from the public API (#5802) * Remove hbool_t from the public API This was previously removed from the source code, but the API calls retained hbool_t in the public API calls. This commit removes hbool_t from the public APIs. hbool_t is retained as a typedef for bool in H5public.h so existing code doesn't break. --- HDF5Examples/C/H5PAR/ph5_filtered_writes.c | 3 +- .../C/H5PAR/ph5_filtered_writes_no_sel.c | 5 +- HDF5Examples/C/H5PAR/ph5_subfiling.c | 3 +- bin/trace | 1 - c++/src/C2Cppfunction_map.htm | 12 ++--- c++/src/H5DxferProp.cpp | 2 +- c++/src/H5FaccProp.cpp | 8 ++-- c++/src/H5FaccProp.h | 8 ++-- c++/src/H5FcreatProp.cpp | 5 +- c++/src/H5FcreatProp.h | 4 +- c++/src/H5Location.cpp | 4 +- c++/src/H5Location.h | 4 +- c++/test/tfile.cpp | 4 +- c++/test/tlinks.cpp | 12 ++--- doxygen/dox/MetadataCachingInHDF5.dox | 32 ++++++------- doxygen/dox/ModifiedRegionWrites.dox | 8 ++-- doxygen/dox/ThreadSafe.dox | 6 +-- doxygen/dox/VOLConnGuide.dox | 16 +++---- doxygen/dox/file-locking.dox | 2 +- doxygen/examples/H5_examples.c | 2 +- hl/src/H5DS.c | 2 +- hl/src/H5DSpublic.h | 2 +- hl/src/H5LT.c | 2 +- hl/src/H5LTpublic.h | 2 +- java/src/hdf/hdf5lib/H5.java | 30 ++++++------ release_docs/RELEASE.txt | 13 ++++++ src/H5A.c | 4 +- src/H5ACpublic.h | 20 ++++---- src/H5Aint.c | 2 +- src/H5Apublic.h | 14 +++--- src/H5E.c | 4 +- src/H5ES.c | 6 +-- src/H5ESpublic.h | 6 +-- src/H5Epublic.h | 4 +- src/H5F.c | 6 +-- src/H5FD.c | 6 +-- src/H5FDcore.c | 8 ++-- src/H5FDcore.h | 4 +- src/H5FDdevelop.h | 14 +++--- src/H5FDmpio.h | 2 +- src/H5FDmulti.c | 4 +- src/H5FDmulti.h | 4 +- src/H5FDros3.h | 4 +- src/H5FDsplitter.h | 2 +- src/H5Fdeprec.c | 2 +- src/H5Fmodule.h | 2 +- src/H5Fmpi.c | 2 +- src/H5Fpublic.h | 12 ++--- src/H5Gdeprec.c | 2 +- src/H5Gpublic.h | 5 +- src/H5I.c | 2 +- src/H5Ipublic.h | 2 +- src/H5L.c | 2 +- src/H5Lpublic.h | 8 ++-- src/H5M.c | 2 +- src/H5Mpublic.h | 4 +- src/H5Opublic.h | 2 +- src/H5Pdcpl.c | 4 +- src/H5Pdxpl.c | 6 +-- src/H5Pfapl.c | 22 ++++----- src/H5Pfcpl.c | 8 ++-- src/H5Pocpl.c | 4 +- src/H5Ppkg.h | 4 +- src/H5Ppublic.h | 46 +++++++++---------- src/H5Tdevelop.h | 2 +- src/H5VL.c | 2 +- src/H5VLconnector.h | 16 +++---- src/H5VLnative.h | 16 +++---- src/H5VLpublic.h | 2 +- src/H5public.h | 10 ++-- 70 files changed, 254 insertions(+), 241 deletions(-) diff --git a/HDF5Examples/C/H5PAR/ph5_filtered_writes.c b/HDF5Examples/C/H5PAR/ph5_filtered_writes.c index c631696c82c..c7b0d98de70 100644 --- a/HDF5Examples/C/H5PAR/ph5_filtered_writes.c +++ b/HDF5Examples/C/H5PAR/ph5_filtered_writes.c @@ -26,6 +26,7 @@ * if one is needed. */ +#include #include #include "hdf5.h" @@ -102,7 +103,7 @@ fill_databuf(hsize_t start[], hsize_t count[], hsize_t stride[], C_DATATYPE *dat static void cleanup(char *filename) { - hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1; + bool do_cleanup = getenv(HDF5_NOCLEANUP) ? false : true; if (do_cleanup) MPI_File_delete(filename, MPI_INFO_NULL); diff --git a/HDF5Examples/C/H5PAR/ph5_filtered_writes_no_sel.c b/HDF5Examples/C/H5PAR/ph5_filtered_writes_no_sel.c index 280df1c42d6..73e7247d1b3 100644 --- a/HDF5Examples/C/H5PAR/ph5_filtered_writes_no_sel.c +++ b/HDF5Examples/C/H5PAR/ph5_filtered_writes_no_sel.c @@ -27,6 +27,7 @@ * if one is needed. */ +#include #include #include "hdf5.h" @@ -102,7 +103,7 @@ fill_databuf(hsize_t start[], hsize_t count[], hsize_t stride[], C_DATATYPE *dat static void cleanup(char *filename) { - hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1; + bool do_cleanup = getenv(HDF5_NOCLEANUP) ? false : true; if (do_cleanup) MPI_File_delete(filename, MPI_INFO_NULL); @@ -125,7 +126,7 @@ write_dataset_some_no_sel(hid_t file_id, hid_t dxpl_id) hsize_t start[EXAMPLE_DSET_DIMS]; hsize_t stride[EXAMPLE_DSET_DIMS]; hsize_t count[EXAMPLE_DSET_DIMS]; - hbool_t no_selection; + bool no_selection; hid_t dset_id = H5I_INVALID_HID; hid_t dcpl_id = H5I_INVALID_HID; hid_t file_dataspace = H5I_INVALID_HID; diff --git a/HDF5Examples/C/H5PAR/ph5_subfiling.c b/HDF5Examples/C/H5PAR/ph5_subfiling.c index 0ea08d99dbe..755192f227c 100644 --- a/HDF5Examples/C/H5PAR/ph5_subfiling.c +++ b/HDF5Examples/C/H5PAR/ph5_subfiling.c @@ -27,6 +27,7 @@ * is needed. */ +#include #include #include "hdf5.h" @@ -51,7 +52,7 @@ typedef int EXAMPLE_DSET_C_DATATYPE; static void cleanup(char *filename, hid_t fapl_id) { - hbool_t do_cleanup = getenv(HDF5_NOCLEANUP) ? 0 : 1; + bool do_cleanup = getenv(HDF5_NOCLEANUP) ? false : true; if (do_cleanup) H5Fdelete(filename, fapl_id); diff --git a/bin/trace b/bin/trace index fd344a25a2b..806fd8fc687 100755 --- a/bin/trace +++ b/bin/trace @@ -40,7 +40,6 @@ $Source = ""; "H5A_info_t" => "Ai", "H5A_operator1_t" => "Ao", "H5A_operator2_t" => "AO", - "hbool_t" => "b", "bool" => "b", "H5AC_cache_config_t" => "Cc", "H5AC_cache_image_config_t" => "CC", diff --git a/c++/src/C2Cppfunction_map.htm b/c++/src/C2Cppfunction_map.htm index a6e0ef09b22..439d9fbbdd2 100644 --- a/c++/src/C2Cppfunction_map.htm +++ b/c++/src/C2Cppfunction_map.htm @@ -5323,7 +5323,7 @@ normal'>

void FileAccPropList::setCore (size_t increment, hbool_t + normal'>void FileAccPropList::setCore (size_t increment, bool backing_store)

void FileAccPropList::getCore (size_t& increment, hbool_t& + normal'>void FileAccPropList::getCore (size_t& increment, bool& backing_store)

void CommonFG::getObjinfo( const char* name, hbool_t follow_link, + normal'>void CommonFG::getObjinfo( const char* name, bool follow_link, H5G_stat_t& statbuf )

void CommonFG::getObjinfo( const H5std_string& name, hbool_t + normal'>void CommonFG::getObjinfo( const H5std_string& name, bool follow_link, H5G_stat_t& statbuf )

void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t - strategy, hbool_t persist, hsize_t threshold)

+ strategy, bool persist, hsize_t threshold)

void FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t& strategy, - hbool_t& persist, hsize_t& threshold)

+ bool& persist, hsize_t& threshold)

\code - herr_t (*opt_query)(void *obj, H5VL_subclass_t cls, int opt_type, hbool_t *supported); + herr_t (*opt_query)(void *obj, H5VL_subclass_t cls, int opt_type, bool *supported); \endcode @@ -3519,7 +3519,7 @@ typedef struct H5VL_blob_specific_args_t { /* H5VL_BLOB_ISNULL */ struct { - hbool_t *isnull; /* Whether blob ID is "null" (OUT) */ + bool *isnull; /* Whether blob ID is "null" (OUT) */ } is_null; /* H5VL_BLOB_SETNULL */ diff --git a/doxygen/dox/file-locking.dox b/doxygen/dox/file-locking.dox index c4509616910..d087a736609 100644 --- a/doxygen/dox/file-locking.dox +++ b/doxygen/dox/file-locking.dox @@ -182,7 +182,7 @@ environment variable. \section sec_filelock_funcset H5Pset_file_locking This #H5Pset_file_locking API call can be used to override the configure defaults. It takes -#hbool_t parameters for both the file locking and "ignore file locks when +Boolean parameters for both the file locking and "ignore file locks when disabled on the file system" parameters. The values set here can be overridden by the file locking environment variable. diff --git a/doxygen/examples/H5_examples.c b/doxygen/examples/H5_examples.c index ef52ed000d9..28dbec332ff 100644 --- a/doxygen/examples/H5_examples.c +++ b/doxygen/examples/H5_examples.c @@ -34,7 +34,7 @@ main(void) { __label__ fail_read; unsigned majnum, minnum, relnum; - hbool_t flag; + bool flag; // retrieve the library version if (H5get_libversion(&majnum, &minnum, &relnum) < 0) { diff --git a/hl/src/H5DS.c b/hl/src/H5DS.c index cb250f555df..f40042607fb 100644 --- a/hl/src/H5DS.c +++ b/hl/src/H5DS.c @@ -32,7 +32,7 @@ static herr_t H5DS_is_reserved(hid_t did, bool *is_reserved); *------------------------------------------------------------------------- */ herr_t -H5DSwith_new_ref(hid_t obj_id, hbool_t *with_new_ref) +H5DSwith_new_ref(hid_t obj_id, bool *with_new_ref) { bool config_flag = false; bool native = false; diff --git a/hl/src/H5DSpublic.h b/hl/src/H5DSpublic.h index 75b6d77acb6..15b76a83920 100644 --- a/hl/src/H5DSpublic.h +++ b/hl/src/H5DSpublic.h @@ -825,7 +825,7 @@ extern "C" { * via configure option. * */ -H5HL_DLL herr_t H5DSwith_new_ref(hid_t obj_id, hbool_t *with_new_ref); +H5HL_DLL herr_t H5DSwith_new_ref(hid_t obj_id, bool *with_new_ref); /** * -------------------------------------------------------------------------- diff --git a/hl/src/H5LT.c b/hl/src/H5LT.c index 370c0032d54..2bde0d7ddee 100644 --- a/hl/src/H5LT.c +++ b/hl/src/H5LT.c @@ -3327,7 +3327,7 @@ out: } htri_t -H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid) +H5LTpath_valid(hid_t loc_id, const char *path, bool check_object_valid) { char *tmp_path = NULL; /* Temporary copy of the path */ char *curr_name; /* Pointer to current component of path name */ diff --git a/hl/src/H5LTpublic.h b/hl/src/H5LTpublic.h index 87406226519..991000c9793 100644 --- a/hl/src/H5LTpublic.h +++ b/hl/src/H5LTpublic.h @@ -1560,7 +1560,7 @@ H5HL_DLL herr_t H5LTfind_attribute(hid_t loc_id, const char *name); * See the “Note on Behavior Change” section above. * */ -H5HL_DLL htri_t H5LTpath_valid(hid_t loc_id, const char *path, hbool_t check_object_valid); +H5HL_DLL htri_t H5LTpath_valid(hid_t loc_id, const char *path, bool check_object_valid); /*------------------------------------------------------------------------- * diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index 28ea577d69d..2fd8dcf8544 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -626,7 +626,7 @@ public class H5 implements java.io.Serializable { // /////// unimplemented //////// // herr_t H5free_memory(void *mem); - // void *H5allocate_memory(size_t size, hbool_t clear); + // void *H5allocate_memory(size_t size, bool clear); // void *H5resize_memory(void *mem, size_t size); // //////////////////////////////////////////////////////////// @@ -4669,11 +4669,11 @@ public class H5 implements java.io.Serializable { // /////// unimplemented //////// // H5_DLL hid_t H5EScreate(void); - // H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, hbool_t *err_occurred); - // H5_DLL herr_t H5EScancel(hid_t es_id, size_t *num_not_canceled, hbool_t *err_occurred); + // H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, bool *err_occurred); + // H5_DLL herr_t H5EScancel(hid_t es_id, size_t *num_not_canceled, bool *err_occurred); // H5_DLL herr_t H5ESget_count(hid_t es_id, size_t *count); // H5_DLL herr_t H5ESget_op_counter(hid_t es_id, uint64_t *counter); - // H5_DLL herr_t H5ESget_err_status(hid_t es_id, hbool_t *err_occurred); + // H5_DLL herr_t H5ESget_err_status(hid_t es_id, bool *err_occurred); // H5_DLL herr_t H5ESget_err_count(hid_t es_id, size_t *num_errs); // H5_DLL herr_t H5ESget_err_info(hid_t es_id, size_t num_err_info, H5ES_err_info_t err_info[], // size_t *err_cleared); @@ -5344,8 +5344,8 @@ public class H5 implements java.io.Serializable { // unsigned hits[2], unsigned misses[2], unsigned evictions[2], unsigned bypasses[2]); // herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr, hsize_t *image_size); // #ifdef H5_HAVE_PARALLEL - // herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag); - // herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag); + // herr_t H5Fset_mpi_atomicity(hid_t file_id, bool flag); + // herr_t H5Fget_mpi_atomicity(hid_t file_id, bool *flag); // #endif /* H5_HAVE_PARALLEL */ // /* @@ -5419,8 +5419,8 @@ public class H5 implements java.io.Serializable { // herr_t H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void**file_handle); // herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void // *buf/*out*/); herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t - // size, const void *buf); herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, hbool_t closing); herr_t - // H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing); herr_t H5FDlock(H5FD_t *file, hbool_t rw); + // size, const void *buf); herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, bool closing); herr_t + // H5FDtruncate(H5FD_t *file, hid_t dxpl_id, bool closing); herr_t H5FDlock(H5FD_t *file, bool rw); // herr_t H5FDunlock(H5FD_t *file); // herr_t H5FDdriver_query(hid_t driver_id, unsigned long *flags/*out*/); @@ -11778,13 +11778,13 @@ public class H5 implements java.io.Serializable { // herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len); // herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr); // herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr); - // herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size); - // herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size); + // herr_t H5Pset_core_write_tracking(hid_t fapl_id, bool is_enabled, size_t page_size); + // herr_t H5Pget_core_write_tracking(hid_t fapl_id, bool *is_enabled, size_t *page_size); // #ifdef H5_HAVE_PARALLEL - // herr_t H5Pset_all_coll_metadata_ops(hid_t accpl_id, hbool_t is_collective); - // herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective); - // herr_t H5Pset_coll_metadata_write(hid_t fapl_id, hbool_t is_collective); - // herr_t H5Pget_coll_metadata_write(hid_t fapl_id, hbool_t *is_collective); + // herr_t H5Pset_all_coll_metadata_ops(hid_t accpl_id, bool is_collective); + // herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, bool *is_collective); + // herr_t H5Pset_coll_metadata_write(hid_t fapl_id, bool is_collective); + // herr_t H5Pget_coll_metadata_write(hid_t fapl_id, bool *is_collective); // #endif /* H5_HAVE_PARALLEL */ // herr_t H5Pset_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr); // herr_t H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr /*out*/); @@ -11803,7 +11803,7 @@ public class H5 implements java.io.Serializable { // Dataset xfer property list (DXPL) routines // // herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg); - // herr_t H5Pset_preserve(hid_t plist_id, hbool_t status); + // herr_t H5Pset_preserve(hid_t plist_id, bool status); // int H5Pget_preserve(hid_t plist_id); // herr_t H5Pset_filter_callback(hid_t plist, H5Z_filter_func_t func, void *op_data) // herr_t H5Pget_vlen_mem_manager(hid_t plist, H5MM_allocate_t *alloc, void **alloc_info, H5MM_free_t diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 0c7fc2df195..d7082a87139 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -217,6 +217,19 @@ New Features Library: -------- + - Removed hbool_t from public API calls + + The hbool_t type was introduced before the library supported C99's + Boolean type. Originally typedef'd to an integer, it has been typedef'd + to C99's bool for many years. + + It had been previously purged from the bulk of the library code and + only remained in public API signatures. In HDF5 2.0, it has also been + removed from public API signatures. + + The hbool_t typedef remains in H5public.h so existing code does not + need to be updated. + - H5public.h no longer includes features.h features.h is supposed to be included by glibc headers and not used in diff --git a/src/H5A.c b/src/H5A.c index 83bc68fe514..0725489bc24 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -2381,7 +2381,7 @@ done: *--------------------------------------------------------------------------*/ herr_t H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, - const char *attr_name, hbool_t *attr_exists, hid_t es_id) + const char *attr_name, bool *attr_exists, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ void *token = NULL; /* Request token for async operation */ @@ -2491,7 +2491,7 @@ done: *--------------------------------------------------------------------------*/ herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *obj_name, const char *attr_name, hbool_t *attr_exists, hid_t lapl_id, + const char *obj_name, const char *attr_name, bool *attr_exists, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ diff --git a/src/H5ACpublic.h b/src/H5ACpublic.h index e41931c8025..4db06eba0a9 100644 --- a/src/H5ACpublic.h +++ b/src/H5ACpublic.h @@ -467,7 +467,7 @@ typedef struct H5AC_cache_config_t { * in use. This field should be set to #H5AC__CURR_CACHE_CONFIG_VERSION * (defined in H5ACpublic.h). */ - hbool_t rpt_fcn_enabled; + bool rpt_fcn_enabled; /**< Boolean flag indicating whether the adaptive cache resize report * function is enabled. This field should almost always be set to disabled * (0). Since resize algorithm activity is reported via stdout, it MUST be @@ -475,7 +475,7 @@ typedef struct H5AC_cache_config_t { * The report function is not supported code, and can be expected to change * between versions of the library. Use it at your own risk. */ - hbool_t open_trace_file; + bool open_trace_file; /**< Boolean field indicating whether the * \ref H5AC_cache_config_t.trace_file_name "trace_file_name" * field should be used to open a trace file for the cache.\n @@ -496,7 +496,7 @@ typedef struct H5AC_cache_config_t { * in reproduction in the lab. If you use it absent the direction * of The HDF Group, you are on your own. */ - hbool_t close_trace_file; + bool close_trace_file; /**< Boolean field indicating whether the current trace file *(if any) should be closed.\n * See the above comments on the \ref H5AC_cache_config_t.open_trace_file @@ -523,7 +523,7 @@ typedef struct H5AC_cache_config_t { * seen in the field, so as to aid in reproduction in the lab. If you use * it absent the direction of The HDF Group, you are on your own. */ - hbool_t evictions_enabled; + bool evictions_enabled; /**< A boolean flag indicating whether evictions from the metadata cache * are enabled. This flag is initially set to enabled (1).\n * In rare circumstances, the raw data throughput quirements may be so high @@ -543,7 +543,7 @@ typedef struct H5AC_cache_config_t { * Evictions will be re-enabled when this field is set back to \c 1. * This should be done as soon as possible. */ - hbool_t set_initial_size; + bool set_initial_size; /**< Boolean flag indicating whether the cache should be created * with a user specified initial size. */ @@ -604,7 +604,7 @@ typedef struct H5AC_cache_config_t { * If you set it to 1.0, you will effectively disable cache size increases. */ - hbool_t apply_max_increment; + bool apply_max_increment; /**< Boolean flag indicating whether an upper limit should be applied to * the size of cache size increases. */ @@ -666,7 +666,7 @@ typedef struct H5AC_cache_config_t { * If you set it to 1.0, you will effectively * disable cache size decreases. 0.9 is a reasonable starting point. */ - hbool_t apply_max_decrement; + bool apply_max_decrement; /**< Boolean flag indicating ether an upper limit should be applied to * the size of cache size decreases. */ @@ -680,7 +680,7 @@ typedef struct H5AC_cache_config_t { * cache before the cache size reduction algorithm tries to evict it. 3 is a * reasonable value. */ - hbool_t apply_empty_reserve; + bool apply_empty_reserve; /**< Boolean flag indicating whether the ageout based decrement * algorithms will maintain a empty reserve when decreasing cache size. */ @@ -746,11 +746,11 @@ typedef struct H5AC_cache_image_config_t { * to the cache must have a known version number, or an error will be * flagged. */ - hbool_t generate_image; + bool generate_image; /**< Boolean flag indicating whether a cache image should be created on file * close. */ - hbool_t save_resize_status; + bool save_resize_status; /**< Boolean flag indicating whether the cache image should include the * adaptive cache resize configuration and status. Note that this field * is ignored at present. diff --git a/src/H5Aint.c b/src/H5Aint.c index 88e26790cd0..ae19ceb2788 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -131,7 +131,7 @@ static const H5I_class_t H5I_ATTR_CLS[1] = {{ }}; /* Flag indicating "top" of interface has been initialized */ -static hbool_t H5A_top_package_initialize_s = false; +static bool H5A_top_package_initialize_s = false; /*------------------------------------------------------------------------- * Function: H5A_init diff --git a/src/H5Apublic.h b/src/H5Apublic.h index a009e478483..c8c8c6ae9f6 100644 --- a/src/H5Apublic.h +++ b/src/H5Apublic.h @@ -26,7 +26,7 @@ * Information struct for H5Aget_info() / H5Aget_info_by_idx() */ typedef struct { - hbool_t corder_valid; /**< Indicate if creation order is valid */ + bool corder_valid; /**< Indicate if creation order is valid */ H5O_msg_crt_idx_t corder; /**< Creation order */ H5T_cset_t cset; /**< Character set of attribute name */ hsize_t data_size; /**< Size of raw data */ @@ -333,9 +333,9 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name); */ #ifndef H5_DOXYGEN H5_DLL herr_t H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id, - const char *attr_name, hbool_t *exists, hid_t es_id); + const char *attr_name, bool *exists, hid_t es_id); #else -H5_DLL herr_t H5Aexists_async(hid_t obj_id, const char *attr_name, hbool_t *exists, hid_t es_id); +H5_DLL herr_t H5Aexists_async(hid_t obj_id, const char *attr_name, bool *exists, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ @@ -376,11 +376,11 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char * */ #ifndef H5_DOXYGEN H5_DLL herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app_line, - hid_t loc_id, const char *obj_name, const char *attr_name, - hbool_t *exists, hid_t lapl_id, hid_t es_id); + hid_t loc_id, const char *obj_name, const char *attr_name, bool *exists, + hid_t lapl_id, hid_t es_id); #else -H5_DLL herr_t H5Aexists_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, - hbool_t *exists, hid_t lapl_id, hid_t es_id); +H5_DLL herr_t H5Aexists_by_name_async(hid_t loc_id, const char *obj_name, const char *attr_name, bool *exists, + hid_t lapl_id, hid_t es_id); #endif /*-------------------------------------------------------------------------*/ diff --git a/src/H5E.c b/src/H5E.c index b1063f7b861..915f4722127 100644 --- a/src/H5E.c +++ b/src/H5E.c @@ -864,7 +864,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, hbool_t close_source_stack) +H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, bool close_source_stack) { H5E_stack_t *dst_stack, *src_stack; /* Error stacks */ herr_t ret_value = SUCCEED; /* Return value */ @@ -903,7 +903,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Eis_paused(hid_t stack_id, hbool_t *is_paused) +H5Eis_paused(hid_t stack_id, bool *is_paused) { H5E_stack_t *stack; /* Error stack */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5ES.c b/src/H5ES.c index 2e633d5a907..6856115f27f 100644 --- a/src/H5ES.c +++ b/src/H5ES.c @@ -285,7 +285,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress /*out*/, hbool_t *op_failed /*out*/) +H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress /*out*/, bool *op_failed /*out*/) { herr_t ret_value = SUCCEED; /* Return value */ @@ -324,7 +324,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5EScancel(hid_t es_id, size_t *num_not_canceled /*out*/, hbool_t *op_failed /*out*/) +H5EScancel(hid_t es_id, size_t *num_not_canceled /*out*/, bool *op_failed /*out*/) { herr_t ret_value = SUCCEED; /* Return value */ @@ -363,7 +363,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5ESget_err_status(hid_t es_id, hbool_t *err_status /*out*/) +H5ESget_err_status(hid_t es_id, bool *err_status /*out*/) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5ESpublic.h b/src/H5ESpublic.h index 1d6b00c6f14..2232934c56f 100644 --- a/src/H5ESpublic.h +++ b/src/H5ESpublic.h @@ -193,7 +193,7 @@ H5_DLL hid_t H5EScreate(void); * \since 1.14.0 * */ -H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, hbool_t *err_occurred); +H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, bool *err_occurred); /** * \ingroup H5ES @@ -211,7 +211,7 @@ H5_DLL herr_t H5ESwait(hid_t es_id, uint64_t timeout, size_t *num_in_progress, h * \since 1.14.0 * */ -H5_DLL herr_t H5EScancel(hid_t es_id, size_t *num_not_canceled, hbool_t *err_occurred); +H5_DLL herr_t H5EScancel(hid_t es_id, size_t *num_not_canceled, bool *err_occurred); /** * \ingroup H5ES @@ -267,7 +267,7 @@ H5_DLL herr_t H5ESget_op_counter(hid_t es_id, uint64_t *counter); * \since 1.14.0 * */ -H5_DLL herr_t H5ESget_err_status(hid_t es_id, hbool_t *err_occurred); +H5_DLL herr_t H5ESget_err_status(hid_t es_id, bool *err_occurred); /** * \ingroup H5ES diff --git a/src/H5Epublic.h b/src/H5Epublic.h index f2275bd4452..d5972662b21 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -314,7 +314,7 @@ H5_DLL hid_t H5Eget_current_stack(void); * * \since 1.14.0 */ -H5_DLL herr_t H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, hbool_t close_source_stack); +H5_DLL herr_t H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, bool close_source_stack); /** * -------------------------------------------------------------------------- * \ingroup H5E @@ -341,7 +341,7 @@ H5_DLL herr_t H5Eappend_stack(hid_t dst_stack_id, hid_t src_stack_id, hbool_t cl * * \since 1.14.5 */ -H5_DLL herr_t H5Eis_paused(hid_t stack_id, hbool_t *is_paused); +H5_DLL herr_t H5Eis_paused(hid_t stack_id, bool *is_paused); /** * -------------------------------------------------------------------------- * \ingroup H5E diff --git a/src/H5F.c b/src/H5F.c index d0e7bcfcca1..a0a57d2947b 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -2349,7 +2349,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled /*out*/, hbool_t *is_currently_logging /*out*/) +H5Fget_mdc_logging_status(hid_t file_id, bool *is_enabled /*out*/, bool *is_currently_logging /*out*/) { H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -2668,7 +2668,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize /*out*/) +H5Fget_dset_no_attrs_hint(hid_t file_id, bool *minimize /*out*/) { H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ @@ -2707,7 +2707,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize) +H5Fset_dset_no_attrs_hint(hid_t file_id, bool minimize) { H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ diff --git a/src/H5FD.c b/src/H5FD.c index cd971011b19..45f3c6d57dc 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -2431,7 +2431,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FDflush(H5FD_t *file, hid_t dxpl_id, hbool_t closing) +H5FDflush(H5FD_t *file, hid_t dxpl_id, bool closing) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2505,7 +2505,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing) +H5FDtruncate(H5FD_t *file, hid_t dxpl_id, bool closing) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2578,7 +2578,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5FDlock(H5FD_t *file, hbool_t rw) +H5FDlock(H5FD_t *file, bool rw) { herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5FDcore.c b/src/H5FDcore.c index f9d8ac592f7..16ed36006b4 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -494,7 +494,7 @@ H5FD__core_unregister(void) *------------------------------------------------------------------------- */ herr_t -H5Pset_core_write_tracking(hid_t plist_id, hbool_t is_enabled, size_t page_size) +H5Pset_core_write_tracking(hid_t plist_id, bool is_enabled, size_t page_size) { H5P_genplist_t *plist; /* Property list pointer */ H5FD_core_fapl_t fa; /* Core VFD info */ @@ -541,7 +541,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_core_write_tracking(hid_t plist_id, hbool_t *is_enabled /*out*/, size_t *page_size /*out*/) +H5Pget_core_write_tracking(hid_t plist_id, bool *is_enabled /*out*/, size_t *page_size /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ const H5FD_core_fapl_t *fa; /* Core VFD info */ @@ -579,7 +579,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store) +H5Pset_fapl_core(hid_t fapl_id, size_t increment, bool backing_store) { H5P_genplist_t *plist; /* Property list pointer */ H5FD_core_fapl_t fa; /* Core VFD info */ @@ -616,7 +616,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/) +H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, bool *backing_store /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ const H5FD_core_fapl_t *fa; /* Core VFD info */ diff --git a/src/H5FDcore.h b/src/H5FDcore.h index c17302f532a..3ce0371c2c8 100644 --- a/src/H5FDcore.h +++ b/src/H5FDcore.h @@ -78,7 +78,7 @@ H5_DLLVAR hid_t H5FD_CORE_id_g; * \since 1.4.0 * */ -H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store); +H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, bool backing_store); /** * \ingroup FAPL @@ -97,7 +97,7 @@ H5_DLL herr_t H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_ * \since 1.4.0 * */ -H5_DLL herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, hbool_t *backing_store /*out*/); +H5_DLL herr_t H5Pget_fapl_core(hid_t fapl_id, size_t *increment /*out*/, bool *backing_store /*out*/); #ifdef __cplusplus } #endif diff --git a/src/H5FDdevelop.h b/src/H5FDdevelop.h index 0933b827767..adf49066533 100644 --- a/src/H5FDdevelop.h +++ b/src/H5FDdevelop.h @@ -302,13 +302,13 @@ typedef struct H5FD_class_t { const void *bufs[] /*in*/); /**< */ - herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, hbool_t closing); + herr_t (*flush)(H5FD_t *file, hid_t dxpl_id, bool closing); /**< Flushes all data to disk */ - herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, hbool_t closing); + herr_t (*truncate)(H5FD_t *file, hid_t dxpl_id, bool closing); /**< Truncates a file */ - herr_t (*lock)(H5FD_t *file, hbool_t rw); + herr_t (*lock)(H5FD_t *file, bool rw); /**< Places an advisory lock on a file */ herr_t (*unlock)(H5FD_t *file); @@ -349,7 +349,7 @@ struct H5FD_t { /* Space allocation management fields */ hsize_t threshold; /**< Threshold for alignment */ hsize_t alignment; /**< Allocation alignment */ - hbool_t paged_aggr; /**< Paged aggregation for file space is enabled or not */ + bool paged_aggr; /**< Paged aggregation for file space is enabled or not */ }; /* VFD initialization function */ @@ -407,9 +407,9 @@ H5_DLL herr_t H5FDread_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl H5_DLL herr_t H5FDwrite_from_selection(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, uint32_t count, hid_t mem_space_ids[], hid_t file_space_ids[], haddr_t offsets[], size_t element_sizes[], const void *bufs[] /* in */); -H5_DLL herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, hbool_t closing); -H5_DLL herr_t H5FDtruncate(H5FD_t *file, hid_t dxpl_id, hbool_t closing); -H5_DLL herr_t H5FDlock(H5FD_t *file, hbool_t rw); +H5_DLL herr_t H5FDflush(H5FD_t *file, hid_t dxpl_id, bool closing); +H5_DLL herr_t H5FDtruncate(H5FD_t *file, hid_t dxpl_id, bool closing); +H5_DLL herr_t H5FDlock(H5FD_t *file, bool rw); H5_DLL herr_t H5FDunlock(H5FD_t *file); H5_DLL herr_t H5FDdelete(const char *name, hid_t fapl_id); H5_DLL herr_t H5FDctl(H5FD_t *file, uint64_t op_code, uint64_t flags, const void *input, void **output); diff --git a/src/H5FDmpio.h b/src/H5FDmpio.h index 1ae96ab517c..99b24b6291b 100644 --- a/src/H5FDmpio.h +++ b/src/H5FDmpio.h @@ -44,7 +44,7 @@ extern "C" { /* Global var whose value comes from environment variable */ /* (Defined in H5FDmpio.c) */ -H5_DLLVAR hbool_t H5FD_mpi_opt_types_g; +H5_DLLVAR bool H5FD_mpi_opt_types_g; /** @private * diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index 1cfa6c1d975..596b76fe628 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -293,7 +293,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id, const c */ herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl, - const char *const *memb_name, const haddr_t *memb_addr, hbool_t relax) + const char *const *memb_name, const haddr_t *memb_addr, bool relax) { H5FD_multi_fapl_t fa; @@ -324,7 +324,7 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_f */ herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl /*out*/, - char **memb_name /*out*/, haddr_t *memb_addr /*out*/, hbool_t *relax) + char **memb_name /*out*/, haddr_t *memb_addr /*out*/, bool *relax) { const H5FD_multi_fapl_t *fa; H5FD_multi_fapl_t default_fa; diff --git a/src/H5FDmulti.h b/src/H5FDmulti.h index 7d9149fc9b0..3f094df675e 100644 --- a/src/H5FDmulti.h +++ b/src/H5FDmulti.h @@ -161,7 +161,7 @@ H5_DLLVAR hid_t H5FD_MULTI_id_g; * \since 1.4.0 */ H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const hid_t *memb_fapl, - const char *const *memb_name, const haddr_t *memb_addr, hbool_t relax); + const char *const *memb_name, const haddr_t *memb_addr, bool relax); /** * \ingroup FAPL @@ -184,7 +184,7 @@ H5_DLL herr_t H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map, const * */ H5_DLL herr_t H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map /*out*/, hid_t *memb_fapl /*out*/, - char **memb_name /*out*/, haddr_t *memb_addr /*out*/, hbool_t *relax /*out*/); + char **memb_name /*out*/, haddr_t *memb_addr /*out*/, bool *relax /*out*/); /** * \ingroup FAPL diff --git a/src/H5FDros3.h b/src/H5FDros3.h index 83ae9eb1169..0c0cf889a98 100644 --- a/src/H5FDros3.h +++ b/src/H5FDros3.h @@ -163,7 +163,7 @@ * number or an error will be raised. Currently, this field should be set * to #H5FD_CURR_ROS3_FAPL_T_VERSION. * - * \var hbool_t H5FD_ros3_fapl_t::authenticate + * \var bool H5FD_ros3_fapl_t::authenticate * A Boolean which specifies if security credentials from this structure * should be used for accessing a S3 bucket. * @@ -215,7 +215,7 @@ */ typedef struct H5FD_ros3_fapl_t { int32_t version; - hbool_t authenticate; + bool authenticate; char aws_region[H5FD_ROS3_MAX_REGION_LEN + 1]; char secret_id[H5FD_ROS3_MAX_SECRET_ID_LEN + 1]; char secret_key[H5FD_ROS3_MAX_SECRET_KEY_LEN + 1]; diff --git a/src/H5FDsplitter.h b/src/H5FDsplitter.h index 6e86b9eadf8..05d8dc1ff79 100644 --- a/src/H5FDsplitter.h +++ b/src/H5FDsplitter.h @@ -55,7 +55,7 @@ typedef struct H5FD_splitter_vfd_config_t { char log_file_path[H5FD_SPLITTER_PATH_MAX + 1]; /**< Path to the log file, which will be created on HDF5 file open (existing files will be clobbered). Can be NULL, in which case no logging output is generated. */ - hbool_t ignore_wo_errs; /**< Whether to ignore errors on the write-only channel */ + bool ignore_wo_errs; /**< Whether to ignore errors on the write-only channel */ } H5FD_splitter_vfd_config_t; //! diff --git a/src/H5Fdeprec.c b/src/H5Fdeprec.c index e0616a444fe..d2eb7ddf1b7 100644 --- a/src/H5Fdeprec.c +++ b/src/H5Fdeprec.c @@ -203,7 +203,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fset_latest_format(hid_t file_id, hbool_t latest_format) +H5Fset_latest_format(hid_t file_id, bool latest_format) { H5VL_object_t *vol_obj; /* File as VOL object */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ diff --git a/src/H5Fmodule.h b/src/H5Fmodule.h index ec3a57fca57..95eb97d121c 100644 --- a/src/H5Fmodule.h +++ b/src/H5Fmodule.h @@ -1058,7 +1058,7 @@ * * typedef struct H5FD_ros3_fapl_t { * int32_t version; - * hbool_t authenticate; + * bool authenticate; * char aws_region[H5FD_ROS3_MAX_REGION_LEN + 1]; * char secret_id[H5FD_ROS3_MAX_SECRET_ID_LEN + 1]; * char secret_key[H5FD_ROS3_MAX_SECRET_KEY_LEN + 1]; diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c index 9b8039a20d6..b233d807d7d 100644 --- a/src/H5Fmpi.c +++ b/src/H5Fmpi.c @@ -247,7 +247,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag) +H5Fset_mpi_atomicity(hid_t file_id, bool flag) { H5VL_object_t *vol_obj; /* File info */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ diff --git a/src/H5Fpublic.h b/src/H5Fpublic.h index 7d5ebc304fa..86d73fac39e 100644 --- a/src/H5Fpublic.h +++ b/src/H5Fpublic.h @@ -1639,7 +1639,7 @@ H5_DLL herr_t H5Fstop_mdc_logging(hid_t file_id); * * \since 1.10.0 */ -H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id, hbool_t *is_enabled, hbool_t *is_currently_logging); +H5_DLL herr_t H5Fget_mdc_logging_status(hid_t file_id, bool *is_enabled, bool *is_currently_logging); /** * \ingroup H5F * @@ -1738,7 +1738,7 @@ H5_DLL herr_t H5Fget_mdc_image_info(hid_t file_id, haddr_t *image_addr, hsize_t * \since 1.10.5 * */ -H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize); +H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, bool *minimize); /** * \ingroup H5F * @@ -1769,7 +1769,7 @@ H5_DLL herr_t H5Fget_dset_no_attrs_hint(hid_t file_id, hbool_t *minimize); * \since 1.10.5 * */ -H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize); +H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, bool minimize); #ifdef H5_HAVE_PARALLEL /** @@ -1836,7 +1836,7 @@ H5_DLL herr_t H5Fset_dset_no_attrs_hint(hid_t file_id, hbool_t minimize); * \since 1.8.9 * */ -H5_DLL herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag); +H5_DLL herr_t H5Fset_mpi_atomicity(hid_t file_id, bool flag); /** * \ingroup PH5F * @@ -1859,7 +1859,7 @@ H5_DLL herr_t H5Fset_mpi_atomicity(hid_t file_id, hbool_t flag); * \since 1.8.9 * */ -H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, hbool_t *flag); +H5_DLL herr_t H5Fget_mpi_atomicity(hid_t file_id, bool *flag); #endif /* H5_HAVE_PARALLEL */ /// \cond DEV @@ -1970,7 +1970,7 @@ H5_DLL herr_t H5Fget_info1(hid_t obj_id, H5F_info1_t *file_info); * \deprecated 1.10.2 Deprecated in favor of the function H5Fset_libver_bounds() * */ -H5_DLL herr_t H5Fset_latest_format(hid_t file_id, hbool_t latest_format); +H5_DLL herr_t H5Fset_latest_format(hid_t file_id, bool latest_format); /** * \ingroup H5F * diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index c24fc549b8d..b6364db46e4 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -931,7 +931,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, H5G_stat_t *statbuf /*out*/) +H5Gget_objinfo(hid_t loc_id, const char *name, bool follow_link, H5G_stat_t *statbuf /*out*/) { H5VL_object_t *vol_obj = NULL; /* Object of loc_id */ H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h index e0389531395..9b6e7e39a5f 100644 --- a/src/H5Gpublic.h +++ b/src/H5Gpublic.h @@ -56,7 +56,7 @@ typedef struct H5G_info_t { H5G_storage_type_t storage_type; /**< Type of storage for links in group */ hsize_t nlinks; /**< Number of links in group */ int64_t max_corder; /**< Current max. creation order value for group */ - hbool_t mounted; /**< Whether group has a file mounted on it */ + bool mounted; /**< Whether group has a file mounted on it */ } H5G_info_t; //! @@ -1121,8 +1121,7 @@ H5_DLL herr_t H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs); * \since 1.0.0 * */ -H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, - H5G_stat_t *statbuf /*out*/); +H5_DLL herr_t H5Gget_objinfo(hid_t loc_id, const char *name, bool follow_link, H5G_stat_t *statbuf /*out*/); /** *------------------------------------------------------------------------- * \ingroup H5G diff --git a/src/H5I.c b/src/H5I.c index dab4eed59a7..b71a9772b57 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -188,7 +188,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Iclear_type(H5I_type_t type, hbool_t force) +H5Iclear_type(H5I_type_t type, bool force) { herr_t ret_value = FAIL; /* Return value */ diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h index 0ccebda6da5..d2897bf4966 100644 --- a/src/H5Ipublic.h +++ b/src/H5Ipublic.h @@ -443,7 +443,7 @@ H5_DLL H5I_type_t H5Iregister_type2(unsigned reserved, H5I_free_t free_func); * \since 1.8.0 * */ -H5_DLL herr_t H5Iclear_type(H5I_type_t type, hbool_t force); +H5_DLL herr_t H5Iclear_type(H5I_type_t type, bool force); /** * \ingroup H5IUD * diff --git a/src/H5L.c b/src/H5L.c index 5a0c5973aab..a818445c52a 100644 --- a/src/H5L.c +++ b/src/H5L.c @@ -1191,7 +1191,7 @@ done: *--------------------------------------------------------------------------*/ herr_t H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, const char *name, - hbool_t *exists, hid_t lapl_id, hid_t es_id) + bool *exists, hid_t lapl_id, hid_t es_id) { H5VL_object_t *vol_obj = NULL; /* Object for loc_id */ void *token = NULL; /* Request token for async operation */ diff --git a/src/H5Lpublic.h b/src/H5Lpublic.h index 20024d35743..a84781f612f 100644 --- a/src/H5Lpublic.h +++ b/src/H5Lpublic.h @@ -75,7 +75,7 @@ typedef enum { //! typedef struct { H5L_type_t type; /**< Type of link */ - hbool_t corder_valid; /**< Indicate if creation order is valid */ + bool corder_valid; /**< Indicate if creation order is valid */ int64_t corder; /**< Creation order */ H5T_cset_t cset; /**< Character set of link name */ union { @@ -664,9 +664,9 @@ H5_DLL htri_t H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id); */ #ifndef H5_DOXYGEN H5_DLL herr_t H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id, - const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); + const char *name, bool *exists, hid_t lapl_id, hid_t es_id); #else -H5_DLL herr_t H5Lexists_async(hid_t loc_id, const char *name, hbool_t *exists, hid_t lapl_id, hid_t es_id); +H5_DLL herr_t H5Lexists_async(hid_t loc_id, const char *name, bool *exists, hid_t lapl_id, hid_t es_id); #endif /** * \ingroup H5L @@ -1457,7 +1457,7 @@ H5_DLL herr_t H5Lcreate_external(const char *file_name, const char *obj_name, hi */ typedef struct { H5L_type_t type; /**< Type of link */ - hbool_t corder_valid; /**< Indicate if creation order is valid */ + bool corder_valid; /**< Indicate if creation order is valid */ int64_t corder; /**< Creation order */ H5T_cset_t cset; /**< Character set of link name */ union { diff --git a/src/H5M.c b/src/H5M.c index 8108303e43f..beea264fea0 100644 --- a/src/H5M.c +++ b/src/H5M.c @@ -1217,7 +1217,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists, hid_t dxpl_id) +H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, bool *exists, hid_t dxpl_id) { H5VL_object_t *vol_obj = NULL; H5VL_optional_args_t vol_cb_args; /* Arguments to VOL callback */ diff --git a/src/H5Mpublic.h b/src/H5Mpublic.h index 0e34bfe01bd..f8100b33686 100644 --- a/src/H5Mpublic.h +++ b/src/H5Mpublic.h @@ -123,7 +123,7 @@ typedef union H5VL_map_args_t { struct { hid_t key_mem_type_id; /**< Memory datatype for key */ const void *key; /**< Pointer to key */ - hbool_t exists; /**< Flag indicating whether key exists in map (OUT) */ + bool exists; /**< Flag indicating whether key exists in map (OUT) */ } exists; /** H5VL_MAP_PUT */ @@ -547,7 +547,7 @@ H5_DLL herr_t H5Mget_async(hid_t map_id, hid_t key_mem_type_id, const void *key, * \since 1.12.0 * */ -H5_DLL herr_t H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, hbool_t *exists, hid_t dxpl_id); +H5_DLL herr_t H5Mexists(hid_t map_id, hid_t key_mem_type_id, const void *key, bool *exists, hid_t dxpl_id); /** * \ingroup H5M diff --git a/src/H5Opublic.h b/src/H5Opublic.h index aaef0ddfc8a..1f7a41db3dd 100644 --- a/src/H5Opublic.h +++ b/src/H5Opublic.h @@ -1563,7 +1563,7 @@ H5_DLL herr_t H5Oenable_mdc_flushes(hid_t object_id); * \since 1.10.0 * */ -H5_DLL herr_t H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled); +H5_DLL herr_t H5Oare_mdc_flushes_disabled(hid_t object_id, bool *are_disabled); /** *------------------------------------------------------------------------- diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c index 2de66c03a2b..df51df30237 100644 --- a/src/H5Pdcpl.c +++ b/src/H5Pdcpl.c @@ -3569,7 +3569,7 @@ done: *----------------------------------------------------------------------------- */ herr_t -H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize /*out*/) +H5Pget_dset_no_attrs_hint(hid_t dcpl_id, bool *minimize /*out*/) { bool setting = false; H5P_genplist_t *plist = NULL; @@ -3609,7 +3609,7 @@ done: *----------------------------------------------------------------------------- */ herr_t -H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize) +H5Pset_dset_no_attrs_hint(hid_t dcpl_id, bool minimize) { H5P_genplist_t *plist = NULL; bool prev_set = false; diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c index dac85834ab6..fd20131ccf3 100644 --- a/src/H5Pdxpl.c +++ b/src/H5Pdxpl.c @@ -1162,7 +1162,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_preserve(hid_t plist_id, hbool_t status) +H5Pset_preserve(hid_t plist_id, bool status) { H5P_genplist_t *plist; /* Property list pointer */ H5T_bkg_t need_bkg; /* Value for background buffer type */ @@ -2550,7 +2550,7 @@ H5P__dxfr_modify_write_buf_dec(const void **_pp, void *_value /*out*/) *------------------------------------------------------------------------- */ herr_t -H5Pset_modify_write_buf(hid_t plist_id, hbool_t modify_write_buf) +H5Pset_modify_write_buf(hid_t plist_id, bool modify_write_buf) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ @@ -2583,7 +2583,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_modify_write_buf(hid_t plist_id, hbool_t *modify_write_buf /*out*/) +H5Pget_modify_write_buf(hid_t plist_id, bool *modify_write_buf /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c index 5b40aa40610..118196ea47c 100644 --- a/src/H5Pfapl.c +++ b/src/H5Pfapl.c @@ -4610,7 +4610,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location, hbool_t start_on_access) +H5Pset_mdc_log_options(hid_t plist_id, bool is_enabled, const char *location, bool start_on_access) { H5P_genplist_t *plist; /* Property list pointer */ char *new_location; /* Working location pointer */ @@ -4654,8 +4654,8 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled /*out*/, char *location /*out*/, - size_t *location_size /*out*/, hbool_t *start_on_access /*out*/) +H5Pget_mdc_log_options(hid_t plist_id, bool *is_enabled /*out*/, char *location /*out*/, + size_t *location_size /*out*/, bool *start_on_access /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ char *location_ptr = NULL; /* Pointer to location string */ @@ -4913,7 +4913,7 @@ H5P__facc_mdc_log_location_close(const char H5_ATTR_UNUSED *name, size_t H5_ATTR *------------------------------------------------------------------------- */ herr_t -H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close) +H5Pset_evict_on_close(hid_t fapl_id, bool evict_on_close) { H5P_genplist_t *plist; /* property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -4952,7 +4952,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close /*out*/) +H5Pget_evict_on_close(hid_t fapl_id, bool *evict_on_close /*out*/) { H5P_genplist_t *plist; /* property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -4993,7 +4993,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled) +H5Pset_file_locking(hid_t fapl_id, bool use_file_locking, bool ignore_when_disabled) { H5P_genplist_t *plist; /* property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -5031,7 +5031,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking /*out*/, hbool_t *ignore_when_disabled /*out*/) +H5Pget_file_locking(hid_t fapl_id, bool *use_file_locking /*out*/, bool *ignore_when_disabled /*out*/) { H5P_genplist_t *plist; /* property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -5146,7 +5146,7 @@ H5P__decode_coll_md_read_flag_t(const void **_pp, void *_value) *------------------------------------------------------------------------- */ herr_t -H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective) +H5Pset_all_coll_metadata_ops(hid_t plist_id, bool is_collective) { H5P_genplist_t *plist; /* Property list pointer */ H5P_coll_md_read_flag_t coll_meta_read; /* Property value */ @@ -5194,7 +5194,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective /*out*/) +H5Pget_all_coll_metadata_ops(hid_t plist_id, bool *is_collective /*out*/) { herr_t ret_value = SUCCEED; /* return value */ @@ -5241,7 +5241,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective) +H5Pset_coll_metadata_write(hid_t plist_id, bool is_collective) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ @@ -5716,7 +5716,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_coll_metadata_write(hid_t plist_id, hbool_t *is_collective /*out*/) +H5Pget_coll_metadata_write(hid_t plist_id, bool *is_collective /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c index 401c550a7e9..3e7d1584945 100644 --- a/src/H5Pfcpl.c +++ b/src/H5Pfcpl.c @@ -1174,7 +1174,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5P__set_file_space_strategy(H5P_genplist_t *plist, H5F_fspace_strategy_t strategy, hbool_t persist, +H5P__set_file_space_strategy(H5P_genplist_t *plist, H5F_fspace_strategy_t strategy, bool persist, hsize_t threshold) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1212,7 +1212,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) +H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, bool persist, hsize_t threshold) { H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* Return value */ @@ -1247,7 +1247,7 @@ done: */ herr_t H5P__get_file_space_strategy(H5P_genplist_t *plist, H5F_fspace_strategy_t *strategy /*out*/, - hbool_t *persist /*out*/, hsize_t *threshold /*out*/) + bool *persist /*out*/, hsize_t *threshold /*out*/) { herr_t ret_value = SUCCEED; /* Return value */ @@ -1279,7 +1279,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy /*out*/, hbool_t *persist /*out*/, +H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy /*out*/, bool *persist /*out*/, hsize_t *threshold /*out*/) { H5P_genplist_t *plist; /* Property list pointer */ diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c index 963cb2552db..4aff3a9c50b 100644 --- a/src/H5Pocpl.c +++ b/src/H5Pocpl.c @@ -375,7 +375,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times) +H5Pset_obj_track_times(hid_t plist_id, bool track_times) { H5P_genplist_t *plist; /* Property list pointer */ uint8_t ohdr_flags; /* Object header flags */ @@ -415,7 +415,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times /*out*/) +H5Pget_obj_track_times(hid_t plist_id, bool *track_times /*out*/) { herr_t ret_value = SUCCEED; /* return value */ diff --git a/src/H5Ppkg.h b/src/H5Ppkg.h index c4abf101640..0b46fb7f1da 100644 --- a/src/H5Ppkg.h +++ b/src/H5Ppkg.h @@ -195,9 +195,9 @@ H5_DLL herr_t H5P__facc_set_def_driver(void); /* Private FCPL routines */ H5_DLL herr_t H5P__get_file_space_strategy(H5P_genplist_t *plist, H5F_fspace_strategy_t *strategy, - hbool_t *persist, hsize_t *threshold); + bool *persist, hsize_t *threshold); H5_DLL herr_t H5P__set_file_space_strategy(H5P_genplist_t *plist, H5F_fspace_strategy_t strategy, - hbool_t persist, hsize_t threshold); + bool persist, hsize_t threshold); /* Private OCPL routines */ H5_DLL herr_t H5P__get_filter(const struct H5Z_filter_info_t *filter, unsigned int *flags, size_t *cd_nelmts, diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h index 7ddf02f1e03..e454669f6fe 100644 --- a/src/H5Ppublic.h +++ b/src/H5Ppublic.h @@ -2239,7 +2239,7 @@ H5_DLL int H5Pget_nfilters(hid_t plist_id); * \since 1.8.0 * */ -H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times); +H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, bool *track_times); /** * \ingroup OCPL * @@ -2820,7 +2820,7 @@ H5_DLL herr_t H5Pset_fletcher32(hid_t plist_id); * \since 1.8.0 * */ -H5_DLL herr_t H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times); +H5_DLL herr_t H5Pset_obj_track_times(hid_t plist_id, bool track_times); /* File creation property list (FCPL) routines */ /** @@ -2873,7 +2873,7 @@ H5_DLL herr_t H5Pget_file_space_page_size(hid_t plist_id, hsize_t *fsp_size); * \since 1.10.1 * */ -H5_DLL herr_t H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy, hbool_t *persist, +H5_DLL herr_t H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy, bool *persist, hsize_t *threshold); /** * \ingroup FCPL @@ -3121,7 +3121,7 @@ H5_DLL herr_t H5Pset_file_space_page_size(hid_t plist_id, hsize_t fsp_size); * \since 1.10.1 * */ -H5_DLL herr_t H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, hbool_t persist, +H5_DLL herr_t H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, bool persist, hsize_t threshold); /** * \ingroup FCPL @@ -3471,7 +3471,7 @@ H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts, /* out */ * \since 1.8.13 * */ -H5_DLL herr_t H5Pget_core_write_tracking(hid_t fapl_id, hbool_t *is_enabled, size_t *page_size); +H5_DLL herr_t H5Pget_core_write_tracking(hid_t fapl_id, bool *is_enabled, size_t *page_size); /** * \ingroup FAPL * @@ -3613,7 +3613,7 @@ H5_DLL herr_t H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size); * \since 1.10.1 * */ -H5_DLL herr_t H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close); +H5_DLL herr_t H5Pget_evict_on_close(hid_t fapl_id, bool *evict_on_close); /** * \ingroup FAPL * @@ -3761,7 +3761,7 @@ H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbac * \since 1.10.7 * */ -H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled); +H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, bool *use_file_locking, bool *ignore_when_disabled); /** * \ingroup FAPL * @@ -3917,8 +3917,8 @@ H5_DLL herr_t H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t * * \since 1.10.0 */ -H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location, - size_t *location_size, hbool_t *start_on_access); +H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, bool *is_enabled, char *location, size_t *location_size, + bool *start_on_access); /** * \ingroup FAPL * @@ -4375,7 +4375,7 @@ H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nslots, s * \since 1.8.13 * */ -H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size); +H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, bool is_enabled, size_t page_size); /** * \ingroup FAPL * @@ -4559,7 +4559,7 @@ H5_DLL herr_t H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size); * \since 1.10.1 * */ -H5_DLL herr_t H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close); +H5_DLL herr_t H5Pset_evict_on_close(hid_t fapl_id, bool evict_on_close); /** * \ingroup FAPL * @@ -4892,7 +4892,7 @@ H5_DLL herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbac * \since 1.10.7 * */ -H5_DLL herr_t H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled); +H5_DLL herr_t H5Pset_file_locking(hid_t fapl_id, bool use_file_locking, bool ignore_when_disabled); /** * \ingroup FAPL * @@ -5207,8 +5207,8 @@ H5_DLL herr_t H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr) * \since 1.10.0 * */ -H5_DLL herr_t H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location, - hbool_t start_on_access); +H5_DLL herr_t H5Pset_mdc_log_options(hid_t plist_id, bool is_enabled, const char *location, + bool start_on_access); /** * \ingroup FAPL * @@ -5570,7 +5570,7 @@ H5_DLL herr_t H5Pget_vol_cap_flags(hid_t plist_id, uint64_t *cap_flags); * * \since 1.10.0 */ -H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective); +H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, bool is_collective); /** * \ingroup GAPL * @@ -5590,7 +5590,7 @@ H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective * * \since 1.10.0 */ -H5_DLL herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collective); +H5_DLL herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, bool *is_collective); /** * \ingroup FAPL * @@ -5619,7 +5619,7 @@ H5_DLL herr_t H5Pget_all_coll_metadata_ops(hid_t plist_id, hbool_t *is_collectiv * * \since 1.10.0 */ -H5_DLL herr_t H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective); +H5_DLL herr_t H5Pset_coll_metadata_write(hid_t plist_id, bool is_collective); /** * \ingroup FAPL * @@ -5638,7 +5638,7 @@ H5_DLL herr_t H5Pset_coll_metadata_write(hid_t plist_id, hbool_t is_collective); * * \since 1.10.0 */ -H5_DLL herr_t H5Pget_coll_metadata_write(hid_t plist_id, hbool_t *is_collective); +H5_DLL herr_t H5Pget_coll_metadata_write(hid_t plist_id, bool *is_collective); /** * \ingroup FAPL @@ -6009,7 +6009,7 @@ H5_DLL herr_t H5Pget_chunk_opts(hid_t plist_id, unsigned *opts); * \since 1.10.5 * */ -H5_DLL herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize); +H5_DLL herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, bool *minimize); /** * \ingroup DCPL * @@ -6492,7 +6492,7 @@ H5_DLL herr_t H5Pset_chunk_opts(hid_t plist_id, unsigned opts); * \since 1.10.5 * */ -H5_DLL herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize); +H5_DLL herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, bool minimize); /** * \ingroup DCPL * @@ -8218,7 +8218,7 @@ H5_DLL herr_t H5Pset_hyper_vector_size(hid_t plist_id, size_t size); * \version 1.8.2 Deprecated. * */ -H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status); +H5_DLL herr_t H5Pset_preserve(hid_t plist_id, bool status); /** * \ingroup DXPL @@ -8687,7 +8687,7 @@ H5_DLL herr_t H5Pget_actual_selection_io_mode(hid_t plist_id, uint32_t *actual_s * \since 1.14.1 * */ -H5_DLL herr_t H5Pset_modify_write_buf(hid_t plist_id, hbool_t modify_write_buf); +H5_DLL herr_t H5Pset_modify_write_buf(hid_t plist_id, bool modify_write_buf); /** * @@ -8709,7 +8709,7 @@ H5_DLL herr_t H5Pset_modify_write_buf(hid_t plist_id, hbool_t modify_write_buf); * \since 1.14.1 * */ -H5_DLL herr_t H5Pget_modify_write_buf(hid_t plist_id, hbool_t *modify_write_buf); +H5_DLL herr_t H5Pget_modify_write_buf(hid_t plist_id, bool *modify_write_buf); /** * \ingroup LCPL diff --git a/src/H5Tdevelop.h b/src/H5Tdevelop.h index bb2d4aee0a0..887e2adb596 100644 --- a/src/H5Tdevelop.h +++ b/src/H5Tdevelop.h @@ -54,7 +54,7 @@ typedef enum H5T_bkg_t { typedef struct H5T_cdata_t { H5T_cmd_t command; /**< what should the conversion function do? */ H5T_bkg_t need_bkg; /**< is the background buffer needed? */ - hbool_t recalc; /**< recalculate private data */ + bool recalc; /**< recalculate private data */ void *priv; /**< private data */ } H5T_cdata_t; //! diff --git a/src/H5VL.c b/src/H5VL.c index 11a91cfd2c2..eec91511ac9 100644 --- a/src/H5VL.c +++ b/src/H5VL.c @@ -641,7 +641,7 @@ done: *--------------------------------------------------------------------------- */ herr_t -H5VLobject_is_native(hid_t obj_id, hbool_t *is_native) +H5VLobject_is_native(hid_t obj_id, bool *is_native) { H5VL_object_t *vol_obj = NULL; herr_t ret_value = SUCCEED; diff --git a/src/H5VLconnector.h b/src/H5VLconnector.h index ebaab04d11c..1c778827fa6 100644 --- a/src/H5VLconnector.h +++ b/src/H5VLconnector.h @@ -197,7 +197,7 @@ typedef struct H5VL_attr_specific_args_t { /* H5VL_ATTR_EXISTS */ struct { const char *name; /* Name of attribute to check */ - hbool_t *exists; /* Whether attribute exists (OUT) */ + bool *exists; /* Whether attribute exists (OUT) */ } exists; /* H5VL_ATTR_ITER */ @@ -474,7 +474,7 @@ typedef struct H5VL_file_specific_args_t { struct { const char *filename; /* Name of file to check */ hid_t fapl_id; /* File access property list to use */ - hbool_t *accessible; /* Whether file is accessible with FAPL settings (OUT) */ + bool *accessible; /* Whether file is accessible with FAPL settings (OUT) */ } is_accessible; /* H5VL_FILE_DELETE */ @@ -485,8 +485,8 @@ typedef struct H5VL_file_specific_args_t { /* H5VL_FILE_IS_EQUAL */ struct { - void *obj2; /* Second file object to compare against */ - hbool_t *same_file; /* Whether files are the same (OUT) */ + void *obj2; /* Second file object to compare against */ + bool *same_file; /* Whether files are the same (OUT) */ } is_equal; } args; } H5VL_file_specific_args_t; @@ -641,7 +641,7 @@ typedef enum H5VL_link_specific_t { /* Parameters for link 'iterate' operation */ typedef struct H5VL_link_iterate_args_t { - hbool_t recursive; /* Whether iteration is recursive */ + bool recursive; /* Whether iteration is recursive */ H5_index_t idx_type; /* Type of index to iterate over */ H5_iter_order_t order; /* Order of index iteration */ hsize_t *idx_p; /* Start/stop iteration index (OUT) */ @@ -660,7 +660,7 @@ typedef struct H5VL_link_specific_args_t { /* H5VL_LINK_EXISTS */ struct { - hbool_t *exists; /* Whether link exists (OUT) */ + bool *exists; /* Whether link exists (OUT) */ } exists; /* H5VL_LINK_ITER */ @@ -743,7 +743,7 @@ typedef struct H5VL_object_specific_args_t { /* H5VL_OBJECT_EXISTS */ struct { - hbool_t *exists; /* Whether object exists (OUT) */ + bool *exists; /* Whether object exists (OUT) */ } exists; /* H5VL_OBJECT_LOOKUP */ @@ -829,7 +829,7 @@ typedef struct H5VL_blob_specific_args_t { /* H5VL_BLOB_ISNULL */ struct { - hbool_t *isnull; /* Whether blob ID is "null" (OUT) */ + bool *isnull; /* Whether blob ID is "null" (OUT) */ } is_null; /* H5VL_BLOB_SETNULL */ diff --git a/src/H5VLnative.h b/src/H5VLnative.h index c6ec4d5118c..60fb6399259 100644 --- a/src/H5VLnative.h +++ b/src/H5VLnative.h @@ -257,8 +257,8 @@ typedef struct H5VL_native_file_get_vfd_handle_t { /* Parameters for native connector's file 'get MDC logging status' operation */ typedef struct H5VL_native_file_get_mdc_logging_status_t { - hbool_t *is_enabled; /* Whether logging is enabled (OUT) */ - hbool_t *is_currently_logging; /* Whether currently logging (OUT) */ + bool *is_enabled; /* Whether logging is enabled (OUT) */ + bool *is_currently_logging; /* Whether currently logging (OUT) */ } H5VL_native_file_get_mdc_logging_status_t; /* Parameters for native connector's file 'get page buffering stats' operation */ @@ -372,23 +372,23 @@ typedef union H5VL_native_file_optional_args_t { /* H5VL_NATIVE_FILE_GET_MIN_DSET_OHDR_FLAG */ struct { - hbool_t *minimize; /* Flag whether dataset object headers are minimal (OUT) */ + bool *minimize; /* Flag whether dataset object headers are minimal (OUT) */ } get_min_dset_ohdr_flag; /* H5VL_NATIVE_FILE_SET_MIN_DSET_OHDR_FLAG */ struct { - hbool_t minimize; /* Flag whether dataset object headers should be minimal */ + bool minimize; /* Flag whether dataset object headers should be minimal */ } set_min_dset_ohdr_flag; #ifdef H5_HAVE_PARALLEL /* H5VL_NATIVE_FILE_GET_MPI_ATOMICITY */ struct { - hbool_t *flag; /* Flag whether MPI atomicity is set for files (OUT) */ + bool *flag; /* Flag whether MPI atomicity is set for files (OUT) */ } get_mpi_atomicity; /* H5VL_NATIVE_FILE_SET_MPI_ATOMICITY */ struct { - hbool_t flag; /* Flag whether to set MPI atomicity for files */ + bool flag; /* Flag whether to set MPI atomicity for files */ } set_mpi_atomicity; #endif /* H5_HAVE_PARALLEL */ @@ -421,7 +421,7 @@ typedef struct H5VL_native_group_iterate_old_t { /* Parameters for group 'get objinfo' operation */ typedef struct H5VL_native_group_get_objinfo_t { H5VL_loc_params_t loc_params; /* Location parameters for iteration */ - hbool_t follow_link; /* Whether to follow links for query */ + bool follow_link; /* Whether to follow links for query */ H5G_stat_t *statbuf; /* Pointer to object info struct (OUT) */ } H5VL_native_group_get_objinfo_t; @@ -480,7 +480,7 @@ typedef union H5VL_native_object_optional_args_t { /* H5VL_NATIVE_OBJECT_ARE_MDC_FLUSHES_DISABLED */ struct { - hbool_t *flag; /* Flag whether metadata cache flushes are disabled for this object (OUT) */ + bool *flag; /* Flag whether metadata cache flushes are disabled for this object (OUT) */ } are_mdc_flushes_disabled; /* H5VL_NATIVE_OBJECT_GET_NATIVE_INFO */ diff --git a/src/H5VLpublic.h b/src/H5VLpublic.h index 2eee2ffa2e3..2b4a0723787 100644 --- a/src/H5VLpublic.h +++ b/src/H5VLpublic.h @@ -445,7 +445,7 @@ H5_DLL herr_t H5VLquery_optional(hid_t obj_id, H5VL_subclass_t subcls, int opt_t * * \since 1.12.2 */ -H5_DLL herr_t H5VLobject_is_native(hid_t obj_id, hbool_t *is_native); +H5_DLL herr_t H5VLobject_is_native(hid_t obj_id, bool *is_native); #ifdef __cplusplus } diff --git a/src/H5public.h b/src/H5public.h index df80aa79c7c..dfad2b2d511 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -258,12 +258,12 @@ typedef int herr_t; * \deprecated Now that we require C99, hbool_t is typedef'd to C99's bool * and hbool_t is considered deprecated. Due to its long-standing, * widespread use, we have no plans to remove the hbool_t typedef - * from the public API, though we will probably switch to using - * bool in the public API starting in the next major release of HDF5. + * from the public API, though it is otherwise unused in the library. * \attention Boolean functions cannot fail. */ #include typedef bool hbool_t; + /** * Three-valued Boolean type. Functions that return #htri_t however return zero * (false), positive (true), or negative (failure). @@ -756,7 +756,7 @@ H5_DLL herr_t H5check_version(unsigned majnum, unsigned minnum, unsigned relnum) * * \since 1.14.0 */ -H5_DLL herr_t H5is_library_terminating(hbool_t *is_terminating); +H5_DLL herr_t H5is_library_terminating(bool *is_terminating); /** * \ingroup H5 * \brief Determines whether the HDF5 library was built with the thread-safety @@ -775,7 +775,7 @@ H5_DLL herr_t H5is_library_terminating(hbool_t *is_terminating); * \since 1.10.0 * */ -H5_DLL herr_t H5is_library_threadsafe(hbool_t *is_ts); +H5_DLL herr_t H5is_library_threadsafe(bool *is_ts); /** * \ingroup H5 * \brief Frees memory allocated by the HDF5 library @@ -868,7 +868,7 @@ H5_DLL herr_t H5free_memory(void *mem); * \since 1.8.15 * */ -H5_DLL void *H5allocate_memory(size_t size, hbool_t clear); +H5_DLL void *H5allocate_memory(size_t size, bool clear); /** * \ingroup H5 * \brief Resizes and, if required, re-allocates memory that will later be