Hdf5 1 12 merges (#1528)

* Use internal version of H5Eprint2 to avoid possible stack overflow (#661)

* Add support for parallel filters to h5repack (#832)

* Allow parallel filters feature for comm size of 1 (#840)

* Avoid popping API context when one wasn't pushed (#848)

* Fix several warnings (#720)

* Don't allow H5Pset(get)_all_coll_metadata_ops for DXPLs (#1201)

* Fix free list tracking and cleanup cast alignment warnings (#1288)

* Fix free list tracking and cleanup cast alignment warnings

* Add free list tracking code to H5FL 'arr' routines

* Fix usage of several HDfprintf format specifiers after HDfprintf removal (#1324)

* Use appropriate printf format specifiers for haddr_t and hsize_t types directly (#1340)

* Fix H5ACmpio dirty bytes creation debugging (#1357)

* Fix documentation for H5D_space_status_t enum values (#1372)

* Parallel rank0 deadlock fixes (#1183)

* Fix several places where rank 0 can skip past collective MPI operations on failure

* Committing clang-format changes

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

* Fix a few issues noted by LGTM (#1421)

* Fix cache sanity checking code by moving functions to wider scope (#1435)

* Fix metadata cache bug when resizing a pinned/protected entry (v2) (#1463)

* Disable memory alloc sanity checks by default for Autotools debug builds (#1468)

* Committing clang-format changes

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

3 files changed, 9 insertions, 11 deletions

diff --git a/test/err_compat.c b/test/err_compat.c
index 6f3cfb3..6ad69d8 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -228,16 +228,14 @@ test_error_compat(void)
     if ((sid = H5Screate_simple(2, dims, NULL)) < 0)
         TEST_ERROR;
 
-    /* Use H5Eget_auto2 to query the default printing function.  The library
-     *should indicate H5Eprint2 as the default. */
+    /* Use H5Eget_auto2 to query the default printing function. */
     if (H5Eget_auto2(H5E_DEFAULT, &old_func2, &old_data) < 0)
         TEST_ERROR;
     if (old_data != NULL)
         TEST_ERROR;
-    if (!old_func2 || (H5E_auto2_t)H5Eprint2 != old_func2)
+    if (old_func2 == NULL)
         TEST_ERROR;
 
-    /* This function sets the default printing function to be H5Eprint2. */
     if (H5Eset_auto2(H5E_DEFAULT, old_func2, old_data) < 0)
         TEST_ERROR;
 
@@ -282,12 +280,12 @@ test_error_compat(void)
     if (did >= 0)
         TEST_ERROR;
 
-    /* This function changes the new-style printing function back to the default H5Eprint2. */
-    if (H5Eset_auto2(H5E_DEFAULT, (H5E_auto2_t)H5Eprint2, NULL) < 0)
+    /* This function changes the new-style printing function to the original. */
+    if (H5Eset_auto2(H5E_DEFAULT, old_func2, NULL) < 0)
         TEST_ERROR;
 
-    /* This call should work because the H5Eset_auto2 above restored the default printing
-     * function H5Eprint2.  It simply returns user_print1. */
+    /* This call should work because the H5Eset_auto2 above set the default printing
+     * function to H5Eprint2.  It simply returns user_print1. */
     if ((ret = H5Eget_auto1(&old_func1, &old_data)) < 0)
         TEST_ERROR;
     if (old_data != NULL)
@@ -305,7 +303,7 @@ test_error_compat(void)
         TEST_ERROR;
     if (old_data != NULL)
         TEST_ERROR;
-    if (!old_func2 || (H5E_auto2_t)H5Eprint2 != old_func2)
+    if (old_func2 == NULL)
         TEST_ERROR;
 
     /* Try the printing function. Dataset creation should fail because the file
diff --git a/test/error_test.c b/test/error_test.c
index c8205ff8..f470318 100644
--- a/test/error_test.c
+++ b/test/error_test.c
@@ -129,7 +129,7 @@ test_error(hid_t file)
         TEST_ERROR;
     if (old_data != NULL)
         TEST_ERROR;
-    if (old_func != (H5E_auto2_t)H5Eprint2)
+    if (old_func == NULL)
         TEST_ERROR;
 
     if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0)
diff --git a/test/ohdr.c b/test/ohdr.c
index 068b13e..e0b5e88 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -541,7 +541,7 @@ test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
        done in the source directory. */
     HDstrncpy(testfile, FILE_BOGUS, TESTFILE_LEN);
     testfile[TESTFILE_LEN - 1] = '\0';
-    HDstrncat(testfile, ".copy", 5);
+    HDstrncat(testfile, ".copy", sizeof(testfile) - HDstrlen(testfile) - 1);
 
     /* Make a copy of the data file from svn. */
     if (h5_make_local_copy(FILE_BOGUS, testfile) < 0)