Cherry-pick 12 develop branch PRs to hdf5_1_12 (#622)

* Snapshot version 1.12 release 1-3.  Update  version to 1.12.1-4.

* First cut of the H5 public API documentation. (#80)

* First cut of the H5 public API documentation.

* Added H5Z "bonus track."

* Applied Quincey's patch.

* Added the missing patches from Quincey's original patch.

* H5PL (complete) and basic H5VL API documentation.

* Added H5I API docs.

* Added H5L API docs.

* First installment from Elena's H5T batch.

* Second installment of Elena's H5T batch.

* Final installment of Elena's H5T batch.

* Full set of current H5F documentation. (#105)

* First cut of the H5 public API documentation.

* Added H5Z "bonus track."

* Applied Quincey's patch.

* Added the missing patches from Quincey's original patch.

* H5PL (complete) and basic H5VL API documentation.

* Added H5I API docs.

* Added H5L API docs.

* First installment from Elena's H5T batch.

* Second installment of Elena's H5T batch.

* Final installment of Elena's H5T batch.

* Migrated documentation for SWMR functions.

* Catching up on MDC functions.

* Integrated the H5F MDC function documentation.

* Added MDC and parallel H5F functions.

* Slightly updated main page.

* Added doxygen/dox/H5AC_cache_config_t.dox to MANIFEST.

* Doxygen - added (mostly) beginner functions (#112)

* Doxygen - added (mostly) beginner functions

* Removed duplicate H5Pset_szip function

* Add src/H5module.h to MANIFEST.

* close #195. (#196)

* Update HDF5PluginMacros.cmake

* Update HDF5PluginMacros.cmake

* Avoid aligned access for references by decoding into temporary buffer and then copying the result into the actual buffer.   Update test to be more thorough with using compound datatype fields everywhere. (#206)

* Modify temporary rpath for testing in java example scripts. (#230)

* Fix undefined left shifting of negative numbers (#338)

Undefined Bahavior Sanitizer errored here about left shifting negative numbers.

* Fixes various warnings noticed on Windows (#425)

* Fixes various warnings noticed on Windows

- Adds a prototype for our implementation of vasprintf
- Return type of H5_get_utf16_str() is now non-const
- Fixes possible uninitialized return type in Wremove_utf8
- Better isolation of fork() code in accum.c:test_swmr_write_big()
- Better isolation of non-zlib code in dsets.c:test_filter_delete()
- Removed unused variable in trefer.c:test_reference_cmpnd_obj()

* Fixes clang-format issues

* Applied clang-tidy readability-non-const-parameter warning fixes auto… (#429)

* Automatically applied clang-tidy readability-avoid-const-params-in-decls fixes

Removes useless const declarations.

* Fixed most readability-non-const-parameter warnings

These changes were made automatically by clang-tidy, but I manually reverted the changes related to the H5Z_func_t signature.

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Added C++11 override keyword where appropriate (#433)

Added H5_OVERRIDE macro for compatibility with both C++11 and older.

* Various clang tidy warning fixes (#448)

* Fixed clang-tidy bugprone-reserved-identifier warnings

* Fixed clang-tidy bugprone-assert-side-effect warnings

* Fixed clang-tidy bugprone-copy-constructor-init warning

* Fixed clang-tidy readability-redundant-preprocessor warning

For error_test.c the removed code was already dead, because it was in the else of an `#if H5_USE_16_API` block.

Based on H5Location.h, I think p_get_ref_obj_type was meant to be in `#ifndef DOXYGEN_SHOULD_SKIP_THIS` and an `#endif` was missing.  Similarly, in the header, getObjTypeByIdx is only in H5_NO_DEPRECATED_SYMBOLS, not DOXYGEN_SHOULD_SKIP_THIS.

* Fixed clang-tidy readability-redundant-string-init warnings

* Fixed some clang-tidy performance-type-promotion-in-math-fn warnings

* Fixed clang-tidy performance-unnecessary-value-param warnings

* Reformat source with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Removed checks/workarounds for pre-C++89 compatibility (#449)

After 30+ years, just assume that the following exist:
- extension-less includes
- namespaces
- std::
- static_cast
- bool

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings (#451)

* Fixed all clang-tidy bugprone-suspicious-string-compare warnings

This change was generated entirely by clang-tidy itself.

* Reformat code with clang v10.0.1.

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Remove 2 functions incorrectly merged from develop in a cherry-pick merge of PR #451.

* Minor parallel improvements (#519)

* Improve MPI error reporting, handled failed operations in parallel tests more nicely, and clean up MPI_Allreduce for determining whether to break collective I/O

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Clean up MPI-IO VFD tracing support (#520)

* Clean up tracing support

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Brings the native implementation of H5Fdelete() from Bitbucket (#524)

* Committing clang-format changes

* Brings the native VFD H5Fdelete() implementation from Bitbucket

Only brings the 'del' callbacks, not the 'open/close' scheme.

* Formatter changes

* Committing clang-format changes

* Fixes direct VFD callback name

* Removes UNUSED macro from family API call

* Adds barrier and rank 0 check to MPI-I/O VFD delete

* Revert "Adds barrier and rank 0 check to MPI-I/O VFD delete"

This reverts commit 909765f759d9d96e84f4b8b1cc14f7d2b3ac8143.

* Revert "Revert "Adds barrier and rank 0 check to MPI-I/O VFD delete""

This reverts commit 9b04bef1157853fc79fcb8fcc3e8ba1371091702.

* Adds a second barrier after the delete in MPI-I/O VFD

* Only delete files in the core VFD when the backing store flag is set

* Fixes string issues in multi VFD

Also, h5test.c cleanup code now uses H5Fdelete().

* Formatted source

* Rework fapl checks for MPI-I/O VFD delete callback

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Minor warning fixes in develop (#526)

* Committing clang-format changes

* Minor warning fixes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes implementation of my_strdup() from the multi VFD (#527)

* Committing clang-format changes

* Removes my_strdup() from the multi VFD

* Use strdup directly when memory sanity checks are off

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Removes dead H5ST package from the library (#528)

* Committing clang-format changes

* Removes the unused H5ST package from the library

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix HDFFV-11232 (#530)

* fixed missed closing of a dataset

* fixed missed closing of a dataset

* fixed typo in error return

* Committing clang-format changes

* minor edits

* code format

* Committing clang-format changes

* code format

* minor edit

* added H5fortkit dependency for H5VLff.F90, HDFFV-11232

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes incorrect usage of H5I_BADID (#554)

* Committing clang-format changes

* Fixes incorrect use of H5I_BADID

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes a segfault when H5Pset_mdc_log_options is called multiple times on a fapl (#601)

* Committing clang-format changes

* Fixes a segfault when H5Pset_mdc_log_options() is called multiple times

An internal string is incorrectly freed when the API call is invoked
multiple times on a property list, which will usually cause a segfault
to occur. On the first call the log location is NULL so the problem
doesn't occur.

Fixes HDFFV-11239

* Fixes typos

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fix for a segfault when H5Pset_fapl_log is passed an invalid fapl ID (#607)

* Committing clang-format changes

* Fixes an issue where H5Pset_fapl_log sefaults when passed an invalid
fapl ID

This was due to a pointer-containing struct being memset after the first
internal API call. If the first call failed, the error condition would
check if the pointer was not NULL and then attempt to free it if not.
This would lead to the freeing of a wild pointer if an invalid fapl ID
were passed in.

This was fixed by reordering the memset and adding a test to ensure the
problem stays fixed.

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Fixes crashes when size_hint > UINT32_MAX is passed to H5Gcreate1 (#611)

* Committing clang-format changes

* Fixes incorrect size_hint handling in H5Gcreate1

* Updates the size hint type for group creation

* Updates the RELEASE.txt note

* Revert "Updates the RELEASE.txt note"

This reverts commit 3df386acca806d652bbe2209f7c4503b30f068ff.

* Reverts previous behavior to use a uint32_t struct field

* Updates RELEASE.txt

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Revert "Brings the native implementation of H5Fdelete() from Bitbucket (#524)"

This reverts commit 38d1b121ae428138b8863c2a319518c7363c2d94.

Co-authored-by: Gerd Heber <gheber@hdfgroup.org>
Co-authored-by: bljhdf <58825073+bljhdf@users.noreply.github.com>
Co-authored-by: H. Joe Lee <hyoklee@hdfgroup.org>
Co-authored-by: Quincey Koziol <quincey@koziol.cc>
Co-authored-by: Sean McBride <sean@rogue-research.com>
Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: Quincey Koziol <koziol@lbl.gov>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scot Breitenfeld <brtnfld@hdfgroup.org>

3 files changed, 174 insertions, 174 deletions

diff --git a/hl/c++/src/H5PacketTable.h b/hl/c++/src/H5PacketTable.h
index a73b4c9..acd0ccf 100644
--- a/hl/c++/src/H5PacketTable.h
+++ b/hl/c++/src/H5PacketTable.h
@@ -35,7 +35,7 @@ class H5_HLCPPDLL PacketTable {
      */
     PacketTable()
     {
-        table_id = H5I_BADID;
+        table_id = H5I_INVALID_HID;
     }
 
     /* "Open" Constructor
diff --git a/hl/src/H5PT.c b/hl/src/H5PT.c
index d9fdfb0..f5fb99f 100644
--- a/hl/src/H5PT.c
+++ b/hl/src/H5PT.c
@@ -29,7 +29,7 @@ static H5I_type_t H5PT_ptable_id_type = H5I_UNINIT;
 #define H5PT_HASH_TABLE_SIZE 64
 
 /* Packet Table private functions */
-static herr_t H5PT_free_id(void *id);
+static herr_t H5PT_free_id(void *id, void **_ctx);
 static herr_t H5PT_close(htbl_t *table);
 static herr_t H5PT_create_index(htbl_t *table_id);
 static herr_t H5PT_set_index(htbl_t *table_id, hsize_t pt_index);
@@ -402,7 +402,7 @@ error:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5PT_free_id(void *id)
+H5PT_free_id(void *id, void H5_ATTR_UNUSED **_ctx)
 {
     HDfree(id);
     return SUCCEED;
diff --git a/hl/src/H5TB.c b/hl/src/H5TB.c
index 1ac162f..efa61a3 100644
--- a/hl/src/H5TB.c
+++ b/hl/src/H5TB.c
@@ -57,11 +57,11 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi
                hsize_t nrecords, size_t type_size, const char *field_names[], const size_t *field_offset,
                const hid_t *field_types, hsize_t chunk_size, void *fill_data, int compress, const void *buf)
 {
-    hid_t          did         = H5I_BADID;
-    hid_t          sid         = H5I_BADID;
-    hid_t          mem_type_id = H5I_BADID;
-    hid_t          plist_id    = H5I_BADID;
-    hid_t          attr_id     = H5I_BADID;
+    hid_t          did         = H5I_INVALID_HID;
+    hid_t          sid         = H5I_INVALID_HID;
+    hid_t          mem_type_id = H5I_INVALID_HID;
+    hid_t          plist_id    = H5I_INVALID_HID;
+    hid_t          attr_id     = H5I_INVALID_HID;
     hsize_t        dims[1];
     hsize_t        dims_chunk[1];
     hsize_t        maxdims[1] = {H5S_UNLIMITED};
@@ -129,17 +129,17 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi
     /* terminate access to the data space. */
     if (H5Sclose(sid) < 0)
         goto out;
-    sid = H5I_BADID;
+    sid = H5I_INVALID_HID;
 
     /* end access to the dataset */
     if (H5Dclose(did) < 0)
         goto out;
-    did = H5I_BADID;
+    did = H5I_INVALID_HID;
 
     /* end access to the property list */
     if (H5Pclose(plist_id) < 0)
         goto out;
-    plist_id = H5I_BADID;
+    plist_id = H5I_INVALID_HID;
 
     /*-------------------------------------------------------------------------
      * set the conforming table attributes
@@ -196,24 +196,24 @@ H5TBmake_table(const char *table_title, hid_t loc_id, const char *dset_name, hsi
 
             if (H5Aclose(attr_id) < 0)
                 goto out;
-            attr_id = H5I_BADID;
+            attr_id = H5I_INVALID_HID;
         } /* end for */
 
         /* terminate access to the data space. */
         if (H5Sclose(sid) < 0)
             goto out;
-        sid = H5I_BADID;
+        sid = H5I_INVALID_HID;
 
         /* end access to the dataset */
         if (H5Dclose(did) < 0)
             goto out;
-        did = H5I_BADID;
+        did = H5I_INVALID_HID;
     } /* end if */
 
     /* release the datatype. */
     if (H5Tclose(mem_type_id) < 0)
         goto out;
-    mem_type_id = H5I_BADID;
+    mem_type_id = H5I_INVALID_HID;
 
     ret_val = 0;
 
@@ -267,9 +267,9 @@ herr_t
 H5TBappend_records(hid_t loc_id, const char *dset_name, hsize_t nrecords, size_t type_size,
                    const size_t *field_offset, const size_t *field_sizes, const void *buf)
 {
-    hid_t   did         = H5I_BADID;
-    hid_t   tid         = H5I_BADID;
-    hid_t   mem_type_id = H5I_BADID;
+    hid_t   did         = H5I_INVALID_HID;
+    hid_t   tid         = H5I_INVALID_HID;
+    hid_t   mem_type_id = H5I_INVALID_HID;
     hsize_t nrecords_orig;
     hsize_t nfields;
     herr_t  ret_val = -1;
@@ -332,11 +332,11 @@ herr_t
 H5TBwrite_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
                   const size_t *field_offset, const size_t *field_sizes, const void *buf)
 {
-    hid_t   did         = H5I_BADID;
-    hid_t   tid         = H5I_BADID;
-    hid_t   sid         = H5I_BADID;
-    hid_t   m_sid       = H5I_BADID;
-    hid_t   mem_type_id = H5I_BADID;
+    hid_t   did         = H5I_INVALID_HID;
+    hid_t   tid         = H5I_INVALID_HID;
+    hid_t   sid         = H5I_INVALID_HID;
+    hid_t   m_sid       = H5I_INVALID_HID;
+    hid_t   mem_type_id = H5I_INVALID_HID;
     hsize_t count[1];
     hsize_t offset[1];
     hsize_t mem_size[1];
@@ -425,14 +425,14 @@ H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_nam
                       hsize_t nrecords, size_t type_size, const size_t *field_offset,
                       const size_t *field_sizes, const void *buf)
 {
-    hid_t    did            = H5I_BADID;
-    hid_t    tid            = H5I_BADID;
-    hid_t    write_type_id  = H5I_BADID;
-    hid_t    member_type_id = H5I_BADID;
-    hid_t    nmtype_id      = H5I_BADID;
-    hid_t    m_sid          = H5I_BADID;
-    hid_t    file_space_id  = H5I_BADID;
-    hid_t    preserve_id    = H5I_BADID;
+    hid_t    did            = H5I_INVALID_HID;
+    hid_t    tid            = H5I_INVALID_HID;
+    hid_t    write_type_id  = H5I_INVALID_HID;
+    hid_t    member_type_id = H5I_INVALID_HID;
+    hid_t    nmtype_id      = H5I_INVALID_HID;
+    hid_t    m_sid          = H5I_INVALID_HID;
+    hid_t    file_space_id  = H5I_INVALID_HID;
+    hid_t    preserve_id    = H5I_INVALID_HID;
     hssize_t nfields;
     hssize_t i, j;
     hsize_t  count[1];
@@ -510,10 +510,10 @@ H5TBwrite_fields_name(hid_t loc_id, const char *dset_name, const char *field_nam
             /* close */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
             if (H5Tclose(nmtype_id) < 0)
                 goto out;
-            nmtype_id = H5I_BADID;
+            nmtype_id = H5I_INVALID_HID;
         } /* end if */
 
         H5free_memory(member_name);
@@ -583,14 +583,14 @@ H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, con
                        hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset,
                        const size_t *field_sizes, const void *buf)
 {
-    hid_t   did            = H5I_BADID;
-    hid_t   tid            = H5I_BADID;
-    hid_t   write_type_id  = H5I_BADID;
-    hid_t   member_type_id = H5I_BADID;
-    hid_t   nmtype_id      = H5I_BADID;
-    hid_t   m_sid          = H5I_BADID;
-    hid_t   file_space_id  = H5I_BADID;
-    hid_t   preserve_id    = H5I_BADID;
+    hid_t   did            = H5I_INVALID_HID;
+    hid_t   tid            = H5I_INVALID_HID;
+    hid_t   write_type_id  = H5I_INVALID_HID;
+    hid_t   member_type_id = H5I_INVALID_HID;
+    hid_t   nmtype_id      = H5I_INVALID_HID;
+    hid_t   m_sid          = H5I_INVALID_HID;
+    hid_t   file_space_id  = H5I_INVALID_HID;
+    hid_t   preserve_id    = H5I_INVALID_HID;
     hsize_t count[1];
     hsize_t offset[1];
     hsize_t i;
@@ -663,10 +663,10 @@ H5TBwrite_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, con
         /* close */
         if (H5Tclose(member_type_id) < 0)
             goto out;
-        member_type_id = H5I_BADID;
+        member_type_id = H5I_INVALID_HID;
         if (H5Tclose(nmtype_id) < 0)
             goto out;
-        nmtype_id = H5I_BADID;
+        nmtype_id = H5I_INVALID_HID;
 
         H5free_memory(member_name);
         member_name = NULL;
@@ -747,10 +747,10 @@ herr_t
 H5TBread_table(hid_t loc_id, const char *dset_name, size_t type_size, const size_t *field_offset,
                const size_t *field_sizes, void *dst_buf)
 {
-    hid_t   did         = H5I_BADID;
-    hid_t   ftype_id    = H5I_BADID;
-    hid_t   mem_type_id = H5I_BADID;
-    hid_t   sid         = H5I_BADID;
+    hid_t   did         = H5I_INVALID_HID;
+    hid_t   ftype_id    = H5I_INVALID_HID;
+    hid_t   mem_type_id = H5I_INVALID_HID;
+    hid_t   sid         = H5I_INVALID_HID;
     hsize_t dims[1];
     herr_t  ret_val = -1;
 
@@ -820,9 +820,9 @@ herr_t
 H5TBread_records(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
                  const size_t *field_offset, const size_t *field_sizes, void *buf)
 {
-    hid_t   did         = H5I_BADID;
-    hid_t   ftype_id    = H5I_BADID;
-    hid_t   mem_type_id = H5I_BADID;
+    hid_t   did         = H5I_INVALID_HID;
+    hid_t   ftype_id    = H5I_INVALID_HID;
+    hid_t   mem_type_id = H5I_INVALID_HID;
     hsize_t nrecords_orig;
     hsize_t nfields;
     herr_t  ret_val = -1;
@@ -887,13 +887,13 @@ H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_name
                      hsize_t nrecords, size_t type_size, const size_t *field_offset,
                      const size_t *field_sizes, void *buf)
 {
-    hid_t    did         = H5I_BADID;
-    hid_t    ftype_id    = H5I_BADID;
-    hid_t    mem_type_id = H5I_BADID;
-    hid_t    mtype_id    = H5I_BADID;
-    hid_t    nmtype_id   = H5I_BADID;
-    hid_t    sid         = H5I_BADID;
-    hid_t    m_sid       = H5I_BADID;
+    hid_t    did         = H5I_INVALID_HID;
+    hid_t    ftype_id    = H5I_INVALID_HID;
+    hid_t    mem_type_id = H5I_INVALID_HID;
+    hid_t    mtype_id    = H5I_INVALID_HID;
+    hid_t    nmtype_id   = H5I_INVALID_HID;
+    hid_t    sid         = H5I_INVALID_HID;
+    hid_t    m_sid       = H5I_INVALID_HID;
     hssize_t nfields;
     hsize_t  count[1];
     hsize_t  offset[1];
@@ -960,10 +960,10 @@ H5TBread_fields_name(hid_t loc_id, const char *dset_name, const char *field_name
             /* close */
             if (H5Tclose(mtype_id) < 0)
                 goto out;
-            mtype_id = H5I_BADID;
+            mtype_id = H5I_INVALID_HID;
             if (H5Tclose(nmtype_id) < 0)
                 goto out;
-            nmtype_id = H5I_BADID;
+            nmtype_id = H5I_INVALID_HID;
             j++;
         } /* end if */
 
@@ -1044,13 +1044,13 @@ H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, cons
                       hsize_t start, hsize_t nrecords, size_t type_size, const size_t *field_offset,
                       const size_t *field_sizes, void *buf)
 {
-    hid_t   did            = H5I_BADID;
-    hid_t   tid            = H5I_BADID;
-    hid_t   read_type_id   = H5I_BADID;
-    hid_t   member_type_id = H5I_BADID;
-    hid_t   nmtype_id      = H5I_BADID;
-    hid_t   sid            = H5I_BADID;
-    hid_t   m_sid          = H5I_BADID;
+    hid_t   did            = H5I_INVALID_HID;
+    hid_t   tid            = H5I_INVALID_HID;
+    hid_t   read_type_id   = H5I_INVALID_HID;
+    hid_t   member_type_id = H5I_INVALID_HID;
+    hid_t   nmtype_id      = H5I_INVALID_HID;
+    hid_t   sid            = H5I_INVALID_HID;
+    hid_t   m_sid          = H5I_INVALID_HID;
     hsize_t count[1];
     hsize_t offset[1];
     hsize_t mem_size[1];
@@ -1117,10 +1117,10 @@ H5TBread_fields_index(hid_t loc_id, const char *dset_name, hsize_t nfields, cons
         /* close the member type */
         if (H5Tclose(member_type_id) < 0)
             goto out;
-        member_type_id = H5I_BADID;
+        member_type_id = H5I_INVALID_HID;
         if (H5Tclose(nmtype_id) < 0)
             goto out;
-        nmtype_id = H5I_BADID;
+        nmtype_id = H5I_INVALID_HID;
 
         H5free_memory(member_name);
         member_name = NULL;
@@ -1198,11 +1198,11 @@ out:
 herr_t
 H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords)
 {
-    hid_t          did         = H5I_BADID;
-    hid_t          tid         = H5I_BADID;
-    hid_t          sid         = H5I_BADID;
-    hid_t          m_sid       = H5I_BADID;
-    hid_t          mem_type_id = H5I_BADID;
+    hid_t          did         = H5I_INVALID_HID;
+    hid_t          tid         = H5I_INVALID_HID;
+    hid_t          sid         = H5I_INVALID_HID;
+    hid_t          m_sid       = H5I_INVALID_HID;
+    hid_t          mem_type_id = H5I_INVALID_HID;
     hsize_t        nfields;
     hsize_t        ntotal_records;
     hsize_t        read_start;
@@ -1294,16 +1294,16 @@ H5TBdelete_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nr
         /* close */
         if (H5Sclose(m_sid) < 0)
             goto out;
-        m_sid = H5I_BADID;
+        m_sid = H5I_INVALID_HID;
         if (H5Tclose(mem_type_id) < 0)
             goto out;
-        mem_type_id = H5I_BADID;
+        mem_type_id = H5I_INVALID_HID;
         if (H5Sclose(sid) < 0)
             goto out;
-        sid = H5I_BADID;
+        sid = H5I_INVALID_HID;
         if (H5Tclose(tid) < 0)
             goto out;
-        tid = H5I_BADID;
+        tid = H5I_INVALID_HID;
     } /* read_nrecords */
 
     /*-------------------------------------------------------------------------
@@ -1361,11 +1361,11 @@ herr_t
 H5TBinsert_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nrecords, size_t type_size,
                   const size_t *field_offset, const size_t *field_sizes, void *buf)
 {
-    hid_t          did         = H5I_BADID;
-    hid_t          tid         = H5I_BADID;
-    hid_t          mem_type_id = H5I_BADID;
-    hid_t          sid         = H5I_BADID;
-    hid_t          m_sid       = H5I_BADID;
+    hid_t          did         = H5I_INVALID_HID;
+    hid_t          tid         = H5I_INVALID_HID;
+    hid_t          mem_type_id = H5I_INVALID_HID;
+    hid_t          sid         = H5I_INVALID_HID;
+    hid_t          m_sid       = H5I_INVALID_HID;
     hsize_t        nfields;
     hsize_t        ntotal_records;
     hsize_t        read_nrecords;
@@ -1442,10 +1442,10 @@ H5TBinsert_record(hid_t loc_id, const char *dset_name, hsize_t start, hsize_t nr
     /* terminate access to the dataspace */
     if (H5Sclose(m_sid) < 0)
         goto out;
-    m_sid = H5I_BADID;
+    m_sid = H5I_INVALID_HID;
     if (H5Sclose(sid) < 0)
         goto out;
-    sid = H5I_BADID;
+    sid = H5I_INVALID_HID;
 
     /*-------------------------------------------------------------------------
      * write the "pushed down" records
@@ -1513,10 +1513,10 @@ herr_t
 H5TBadd_records_from(hid_t loc_id, const char *dset_name1, hsize_t start1, hsize_t nrecords,
                      const char *dset_name2, hsize_t start2)
 {
-    hid_t          did   = H5I_BADID;
-    hid_t          tid   = H5I_BADID;
-    hid_t          sid   = H5I_BADID;
-    hid_t          m_sid = H5I_BADID;
+    hid_t          did   = H5I_INVALID_HID;
+    hid_t          tid   = H5I_INVALID_HID;
+    hid_t          sid   = H5I_INVALID_HID;
+    hid_t          m_sid = H5I_INVALID_HID;
     hsize_t        count[1];
     hsize_t        offset[1];
     hsize_t        mem_size[1];
@@ -1643,24 +1643,24 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c
                    const char *dset_name3)
 {
     /* identifiers for the 1st dataset. */
-    hid_t did_1 = H5I_BADID;
-    hid_t tid_1 = H5I_BADID;
-    hid_t sid_1 = H5I_BADID;
-    hid_t pid_1 = H5I_BADID;
+    hid_t did_1 = H5I_INVALID_HID;
+    hid_t tid_1 = H5I_INVALID_HID;
+    hid_t sid_1 = H5I_INVALID_HID;
+    hid_t pid_1 = H5I_INVALID_HID;
     /* identifiers for the 2nd dataset. */
-    hid_t did_2 = H5I_BADID;
-    hid_t tid_2 = H5I_BADID;
-    hid_t sid_2 = H5I_BADID;
-    hid_t pid_2 = H5I_BADID;
+    hid_t did_2 = H5I_INVALID_HID;
+    hid_t tid_2 = H5I_INVALID_HID;
+    hid_t sid_2 = H5I_INVALID_HID;
+    hid_t pid_2 = H5I_INVALID_HID;
     /* identifiers for the 3rd dataset. */
-    hid_t          did_3          = H5I_BADID;
-    hid_t          tid_3          = H5I_BADID;
-    hid_t          sid_3          = H5I_BADID;
-    hid_t          pid_3          = H5I_BADID;
-    hid_t          sid            = H5I_BADID;
-    hid_t          m_sid          = H5I_BADID;
-    hid_t          member_type_id = H5I_BADID;
-    hid_t          attr_id        = H5I_BADID;
+    hid_t          did_3          = H5I_INVALID_HID;
+    hid_t          tid_3          = H5I_INVALID_HID;
+    hid_t          sid_3          = H5I_INVALID_HID;
+    hid_t          pid_3          = H5I_INVALID_HID;
+    hid_t          sid            = H5I_INVALID_HID;
+    hid_t          m_sid          = H5I_INVALID_HID;
+    hid_t          member_type_id = H5I_INVALID_HID;
+    hid_t          attr_id        = H5I_INVALID_HID;
     hsize_t        count[1];
     hsize_t        offset[1];
     hsize_t        mem_size[1];
@@ -1807,17 +1807,17 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c
 
             if (H5Aclose(attr_id) < 0)
                 goto out;
-            attr_id = H5I_BADID;
+            attr_id = H5I_INVALID_HID;
 
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
         } /* end for */
 
         /* close data space. */
         if (H5Sclose(sid) < 0)
             goto out;
-        sid = H5I_BADID;
+        sid = H5I_INVALID_HID;
     } /* end if */
 
     /*-------------------------------------------------------------------------
@@ -1856,7 +1856,7 @@ H5TBcombine_tables(hid_t loc_id1, const char *dset_name1, hid_t loc_id2, const c
      */
     if (H5Sclose(m_sid) < 0)
         goto out;
-    m_sid = H5I_BADID;
+    m_sid = H5I_INVALID_HID;
     HDfree(tmp_buf);
     tmp_buf = NULL;
 
@@ -1999,25 +1999,25 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
                  hsize_t position, const void *fill_data, const void *buf)
 {
     /* identifiers for the 1st, original dataset */
-    hid_t did_1  = H5I_BADID;
-    hid_t tid_1  = H5I_BADID;
-    hid_t sid_1  = H5I_BADID;
-    hid_t pid_1  = H5I_BADID;
-    hid_t msid_1 = H5I_BADID;
+    hid_t did_1  = H5I_INVALID_HID;
+    hid_t tid_1  = H5I_INVALID_HID;
+    hid_t sid_1  = H5I_INVALID_HID;
+    hid_t pid_1  = H5I_INVALID_HID;
+    hid_t msid_1 = H5I_INVALID_HID;
     /* identifiers for the 2nd, new dataset */
-    hid_t did_2  = H5I_BADID;
-    hid_t tid_2  = H5I_BADID;
-    hid_t sid_2  = H5I_BADID;
-    hid_t pid_2  = H5I_BADID;
-    hid_t msid_2 = H5I_BADID;
+    hid_t did_2  = H5I_INVALID_HID;
+    hid_t tid_2  = H5I_INVALID_HID;
+    hid_t sid_2  = H5I_INVALID_HID;
+    hid_t pid_2  = H5I_INVALID_HID;
+    hid_t msid_2 = H5I_INVALID_HID;
     /* identifiers for the 3rd, final dataset */
-    hid_t          did_3          = H5I_BADID;
-    hid_t          tid_3          = H5I_BADID;
-    hid_t          sid_3          = H5I_BADID;
-    hid_t          member_type_id = H5I_BADID;
-    hid_t          write_type_id  = H5I_BADID;
-    hid_t          preserve_id    = H5I_BADID;
-    hid_t          attr_id        = H5I_BADID;
+    hid_t          did_3          = H5I_INVALID_HID;
+    hid_t          tid_3          = H5I_INVALID_HID;
+    hid_t          sid_3          = H5I_INVALID_HID;
+    hid_t          member_type_id = H5I_INVALID_HID;
+    hid_t          write_type_id  = H5I_INVALID_HID;
+    hid_t          preserve_id    = H5I_INVALID_HID;
+    hid_t          attr_id        = H5I_INVALID_HID;
     size_t         member_size;
     size_t         new_member_size = 0;
     size_t         total_size;
@@ -2157,7 +2157,7 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
             /* close the member type */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
         } /* end else */
     }     /* end for */
 
@@ -2307,12 +2307,12 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
 
         if (H5Aclose(attr_id) < 0)
             goto out;
-        attr_id = H5I_BADID;
+        attr_id = H5I_INVALID_HID;
 
         /* close the member type */
         if (H5Tclose(member_type_id) < 0)
             goto out;
-        member_type_id = H5I_BADID;
+        member_type_id = H5I_INVALID_HID;
     } /* end for */
 
     /*-------------------------------------------------------------------------
@@ -2334,11 +2334,11 @@ H5TBinsert_field(hid_t loc_id, const char *dset_name, const char *field_name, hi
 
         if (H5Aclose(attr_id) < 0)
             goto out;
-        attr_id = H5I_BADID;
+        attr_id = H5I_INVALID_HID;
 
         if (H5Tclose(member_type_id) < 0)
             goto out;
-        member_type_id = H5I_BADID;
+        member_type_id = H5I_INVALID_HID;
     } /* end fill_data */
 
     ret_val = 0;
@@ -2415,23 +2415,23 @@ herr_t
 H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
 {
     /* identifiers for the 1st original dataset */
-    hid_t did_1 = H5I_BADID;
-    hid_t tid_1 = H5I_BADID;
-    hid_t sid_1 = H5I_BADID;
-    hid_t pid_1 = H5I_BADID;
+    hid_t did_1 = H5I_INVALID_HID;
+    hid_t tid_1 = H5I_INVALID_HID;
+    hid_t sid_1 = H5I_INVALID_HID;
+    hid_t pid_1 = H5I_INVALID_HID;
     /* identifiers for the 2nd new dataset */
-    hid_t did_2 = H5I_BADID;
-    hid_t tid_2 = H5I_BADID;
-    hid_t sid_2 = H5I_BADID;
-    hid_t pid_2 = H5I_BADID;
+    hid_t did_2 = H5I_INVALID_HID;
+    hid_t tid_2 = H5I_INVALID_HID;
+    hid_t sid_2 = H5I_INVALID_HID;
+    hid_t pid_2 = H5I_INVALID_HID;
     /* identifiers for the 3rd final dataset */
-    hid_t          did_3          = H5I_BADID;
-    hid_t          tid_3          = H5I_BADID;
-    hid_t          member_type_id = H5I_BADID;
-    hid_t          preserve_id    = H5I_BADID;
-    hid_t          read_type_id   = H5I_BADID;
-    hid_t          write_type_id  = H5I_BADID;
-    hid_t          attr_id        = H5I_BADID;
+    hid_t          did_3          = H5I_INVALID_HID;
+    hid_t          tid_3          = H5I_INVALID_HID;
+    hid_t          member_type_id = H5I_INVALID_HID;
+    hid_t          preserve_id    = H5I_INVALID_HID;
+    hid_t          read_type_id   = H5I_INVALID_HID;
+    hid_t          write_type_id  = H5I_INVALID_HID;
+    hid_t          attr_id        = H5I_INVALID_HID;
     size_t         member_size;
     size_t         type_size1;
     size_t         type_size2;
@@ -2515,7 +2515,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
             /* close the member type */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
 
             H5free_memory(member_name);
             member_name = NULL;
@@ -2598,7 +2598,7 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
             /* close the member type */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
         } /* end if */
 
         H5free_memory(member_name);
@@ -2682,22 +2682,22 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
             /* end access to the property list */
             if (H5Pclose(preserve_id) < 0)
                 goto out;
-            preserve_id = H5I_BADID;
+            preserve_id = H5I_INVALID_HID;
 
             /* close the member type */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
 
             /* close the read type */
             if (H5Tclose(read_type_id) < 0)
                 goto out;
-            read_type_id = H5I_BADID;
+            read_type_id = H5I_INVALID_HID;
 
             /* close the write type */
             if (H5Tclose(write_type_id) < 0)
                 goto out;
-            write_type_id = H5I_BADID;
+            write_type_id = H5I_INVALID_HID;
 
             HDfree(tmp_buf);
             tmp_buf = NULL;
@@ -2769,18 +2769,18 @@ H5TBdelete_field(hid_t loc_id, const char *dset_name, const char *field_name)
 
             if (H5Aclose(attr_id) < 0)
                 goto out;
-            attr_id = H5I_BADID;
+            attr_id = H5I_INVALID_HID;
 
             /* close the member type */
             if (H5Tclose(member_type_id) < 0)
                 goto out;
-            member_type_id = H5I_BADID;
+            member_type_id = H5I_INVALID_HID;
         } /* end for */
 
         /* close data space. */
         if (H5Sclose(sid_1) < 0)
             goto out;
-        sid_1 = H5I_BADID;
+        sid_1 = H5I_INVALID_HID;
     } /* end if */
 
     ret_val = 0;
@@ -2962,9 +2962,9 @@ out:
 herr_t
 H5TBget_table_info(hid_t loc_id, const char *dset_name, hsize_t *nfields, hsize_t *nrecords)
 {
-    hid_t   tid = H5I_BADID;
-    hid_t   sid = H5I_BADID;
-    hid_t   did = H5I_BADID;
+    hid_t   tid = H5I_INVALID_HID;
+    hid_t   sid = H5I_INVALID_HID;
+    hid_t   did = H5I_INVALID_HID;
     hsize_t dims[1];
     int     num_members;
     herr_t  ret_val = -1;
@@ -3008,7 +3008,7 @@ H5TBget_table_info(hid_t loc_id, const char *dset_name, hsize_t *nfields, hsize_
         /* terminate access to the dataspace */
         if (H5Sclose(sid) < 0)
             goto out;
-        sid = H5I_BADID;
+        sid = H5I_INVALID_HID;
 
         *nrecords = dims[0];
     } /* end if */
@@ -3048,11 +3048,11 @@ herr_t
 H5TBget_field_info(hid_t loc_id, const char *dset_name, char *field_names[], size_t *field_sizes,
                    size_t *field_offsets, size_t *type_size)
 {
-    hid_t    did    = H5I_BADID; /* dataset ID */
-    hid_t    tid    = H5I_BADID; /* file type ID */
-    hid_t    n_tid  = H5I_BADID; /* native type ID */
-    hid_t    m_tid  = H5I_BADID; /* member type ID */
-    hid_t    nm_tid = H5I_BADID; /* native member ID */
+    hid_t    did    = H5I_INVALID_HID; /* dataset ID */
+    hid_t    tid    = H5I_INVALID_HID; /* file type ID */
+    hid_t    n_tid  = H5I_INVALID_HID; /* native type ID */
+    hid_t    m_tid  = H5I_INVALID_HID; /* member type ID */
+    hid_t    nm_tid = H5I_INVALID_HID; /* native member ID */
     hssize_t nfields;
     hssize_t i;
     herr_t   ret_val = -1;
@@ -3111,10 +3111,10 @@ H5TBget_field_info(hid_t loc_id, const char *dset_name, char *field_names[], siz
         /* close the member types */
         if (H5Tclose(m_tid) < 0)
             goto out;
-        m_tid = H5I_BADID;
+        m_tid = H5I_INVALID_HID;
         if (H5Tclose(nm_tid) < 0)
             goto out;
-        nm_tid = H5I_BADID;
+        nm_tid = H5I_INVALID_HID;
     } /* end for */
 
     ret_val = 0;
@@ -3267,9 +3267,9 @@ static hid_t
 H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const size_t *field_offset,
                  const size_t *field_sizes, hid_t ftype_id)
 {
-    hid_t    mem_type_id = H5I_BADID;
-    hid_t    mtype_id    = H5I_BADID;
-    hid_t    nmtype_id   = H5I_BADID;
+    hid_t    mem_type_id = H5I_INVALID_HID;
+    hid_t    mtype_id    = H5I_INVALID_HID;
+    hid_t    nmtype_id   = H5I_INVALID_HID;
     size_t   size_native;
     hsize_t  nfields = 0;
     char **  fnames  = NULL;
@@ -3310,10 +3310,10 @@ H5TB_create_type(hid_t loc_id, const char *dset_name, size_t type_size, const si
             goto out;
         if (H5Tclose(mtype_id) < 0)
             goto out;
-        mtype_id = H5I_BADID;
+        mtype_id = H5I_INVALID_HID;
         if (H5Tclose(nmtype_id) < 0)
             goto out;
-        nmtype_id = H5I_BADID;
+        nmtype_id = H5I_INVALID_HID;
     } /* end for */
 
     ret_val = mem_type_id;
@@ -3364,8 +3364,8 @@ herr_t
 H5TB_common_append_records(hid_t dataset_id, hid_t mem_type_id, size_t nrecords, hsize_t orig_table_size,
                            const void *buf)
 {
-    hid_t   sid   = H5I_BADID;
-    hid_t   m_sid = H5I_BADID;
+    hid_t   sid   = H5I_INVALID_HID;
+    hid_t   m_sid = H5I_INVALID_HID;
     hsize_t count[1];
     hsize_t offset[1];
     hsize_t dims[1];
@@ -3429,8 +3429,8 @@ herr_t
 H5TB_common_read_records(hid_t dataset_id, hid_t mem_type_id, hsize_t start, size_t nrecords,
                          hsize_t table_size, void *buf)
 {
-    hid_t   sid   = H5I_BADID;
-    hid_t   m_sid = H5I_BADID;
+    hid_t   sid   = H5I_INVALID_HID;
+    hid_t   m_sid = H5I_INVALID_HID;
     hsize_t count[1];
     hsize_t offset[1];
     hsize_t mem_size[1];