Merge1 issue 839 PRs to hdf5 1 12 (#904)

* Fixes for a couple of trivial warnings (#676)

* Committing clang-format changes

* Trivial warning fixes:

* Removes an unused done target in H5Tbit.c
* Add (void) to quiet "ignored return value" warnings in the generators
  (which generally ignore errors)

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

* Removes alternative function enter/leave macro scheme (#678)

* Committing clang-format changes

* Converted BEGIN_FUNC, etc. macros to FUNC_ENTER

* Rips out the BEGIN_FUNC, etc. macros

* Removes 'end if', etc. comments from H5HL package

* Committing clang-format changes

* Fixes an H5EA iterate issue

* Fixes an issue in the H5FA iterator code

* Further cleanup in bin/trace after macro removal

* Iterator changes in H5EA and H5FA

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

* Various CMake changes (#679)

* Committing clang-format changes

* Several CMake updates:

* Removes unused HDF5_ENABLE_HSIZET
* Switches TEST_SHELL_SCRIPTS to ON
* Sets SH_PROGRAM to bash instead of sh

* Set default build type back to RelWithDebInfo

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

* err_compat test cleanup (#681)

* Committing clang-format changes

* Cleans up err_compat test and output

* Formatted source

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

* CMake fix for sporadic flush2 failures (#692)

* Committing clang-format changes

* Runs the flush1/flush2 tests in their own directory

Avoids file deletions by other tests.

* Revert "Runs the flush1/flush2 tests in their own directory"

This reverts commit 746c04882434cb502e4231de8f7dd5acb4949f54.

Also pulls the flush files from the clean list, which is a simpler fix.

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

* Ubsan fixes (#498)

* Fixed use of null pointer identified by UBSan

UBSan warned:
runtime error: member access within null pointer of type 'named_dt_t' (aka 'struct named_dt_t')

with these two tests:
H5REPACK-committed_dt_DFF
H5REPACK-committed_dt

Reformulated per @gnuoyd suggestion.

* Fixed undefined float -> unsigned char conversion in HL_test_image

* Removed dead skip_overflow_tests_g global

The global `skip_overflow_tests_g` was being set but never read.

* Don't treat 2d array as 1d array, fixing UBSan complaint in `CPP_testhdf5`

* Committing clang-format changes

* Remove extra ']' in line 730.

* Committing clang-format changes

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* BUG: DataSet assignment operator is missing (#503)

* BUG: DataSet assignment operator is missing

* Some compilers complain if the copy constructor is given explicitly
  but the assignment operator is implicitly set to default.

* Explicitly defining the assignment operator allows us to properly
  handle reference counters for shared resources.

* BUG: DataSet assignment operator is missing.

* Mimicking code of H5DataType::operator() as suggested by @bmribler.

* Added test

Description:
    Added test for DataSet::operator= that Leengit added
Platform tested:
    Linux/64 (jelly)

* Removed Author field.

* Commit clang format changes.

* Entry for Leengit's github PR #503

* Removed lines left by mistake

Co-authored-by: Binh-Minh Ribler <bmribler@hdfgroup.org>
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

* Hdf5 merge pr7 (#516)

* Modify temporary rpath for testing in java example scripts.

* Update URL in source file Copyright headers for web copy of COPYING (license) file.

* Add release_docs/code-conventions.md file.

* Add script to test h5py.

* Fix script error.

* Add file h5pytest.yml.

* Test declaration of counter variables in for loops.

* Committing clang-format changes

* Committing clang-format changes

* Added [] to line 126 of H5LTanalyze.l.
Ran bin/genparser with flex v2.6.4 and Bison v3.0.4 on jelly.

* Revert "Added [] to line 126 of H5LTanalyze.l."

This reverts commit e4a9cee441efa75b16a8ee030c86189e186dd266.

* Revert extra commits to match canonical develop.

* Add cmake variable HDF5_LIB_INFIX (#7)

* Add cmake variable HDF5_LIB_INFIX

This infix is added to all library names after 'hdf5'.
e.g. the infix '_openmpi' results in the library name 'libhdf5_openmpi.so'
This name is used in packages on debian based systems.
(see https://packages.debian.org/jessie/amd64/libhdf5-openmpi-8/filelist)

This option is useful when testing projects on debian based systems with
custom builds of hdf5 while trying to minimize differences between the
custom setup and the environment created by installing system packages.

* Added RELEASE.txt entry for HDF5_LIB_INFIX.

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

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Raphael Grimm <barcode@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>

Co-authored-by: Dana Robinson <43805+derobins@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Sean McBride <sean@rogue-research.com>
Co-authored-by: Lee Newberg <35611400+Leengit@users.noreply.github.com>
Co-authored-by: Binh-Minh Ribler <bmribler@hdfgroup.org>
Co-authored-by: Raphael Grimm <barcode@users.noreply.github.com>

1 files changed, 140 insertions, 117 deletions

diff --git a/test/err_compat.c b/test/err_compat.c
index 53c8667..6f3cfb3 100644
--- a/test/err_compat.c
+++ b/test/err_compat.c
@@ -39,7 +39,6 @@ int * ipoints2_data = NULL;
 int * icheck2_data  = NULL;
 
 #define DSET_NAME "a_dataset"
-#define FAKE_ID   (hid_t) - 1
 
 herr_t custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data);
 herr_t custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data);
@@ -47,13 +46,13 @@ herr_t custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data);
 /*-------------------------------------------------------------------------
  * Function:    user_print1
  *
- * Purpose:    This function is a user-defined old-style printing function.
+ * Purpose:     This function is a user-defined old-style printing function.
  *              This is just a convenience function for H5Ewalk1() with a
  *              function that prints error messages.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              4 October 2010
  *
  *-------------------------------------------------------------------------
@@ -66,22 +65,22 @@ user_print1(FILE *stream)
     if (H5Ewalk1(H5E_WALK_UPWARD, (H5E_walk1_t)custom_print_cb1, stream) < 0)
         TEST_ERROR;
 
-    return 0;
+    return SUCCEED;
 
 error:
-    return -1;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
  * Function:    user_print2
  *
- * Purpose:    This function is a user-defined new-style printing function.
+ * Purpose:     This function is a user-defined new-style printing function.
  *              This is just a convenience function for H5Ewalk2() with a
  *              function that prints error messages.
  *
- * Return:    Non-negative on success/Negative on failure
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              4 October 2010
  *
  *-------------------------------------------------------------------------
@@ -94,27 +93,23 @@ user_print2(hid_t err_stack, FILE *stream)
     if (H5Ewalk2(err_stack, H5E_WALK_UPWARD, (H5E_walk2_t)custom_print_cb2, stream) < 0)
         TEST_ERROR;
 
-    return 0;
+    return SUCCEED;
 
 error:
-    return -1;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
  * Function:    custom_print_cb1
  *
- * Purpose:    Callback function to print error stack in customized way
- *              for H5Ewalk1.
+ * Purpose:     Callback function to print error stack in customized way
+ *              for H5Ewalk1
  *
- * Return:    Success:    0
+ * Return:      SUCCEED/FAIL
  *
- *        Failure:    -1
- *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              4 October 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -140,7 +135,7 @@ custom_print_cb1(int n, H5E_error1_t *err_desc, void *client_data)
     H5free_memory(maj);
     H5free_memory(min);
 
-    return 0;
+    return SUCCEED;
 
 error:
     if (maj)
@@ -148,24 +143,20 @@ error:
     if (min)
         H5free_memory(min);
 
-    return -1;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
  * Function:    custom_print_cb2
  *
- * Purpose:    Callback function to print error stack in customized way
- *              for H5Ewalk1.
- *
- * Return:    Success:    0
+ * Purpose:     Callback function to print error stack in customized way
+ *              for H5Ewalk1
  *
- *        Failure:    -1
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:    Raymond Lu
+ * Programmer:  Raymond Lu
  *              4 October 2010
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -191,7 +182,7 @@ custom_print_cb2(int n, H5E_error2_t *err_desc, void *client_data)
     H5free_memory(maj);
     H5free_memory(min);
 
-    return 0;
+    return SUCCEED;
 
 error:
     if (maj)
@@ -199,43 +190,42 @@ error:
     if (min)
         H5free_memory(min);
 
-    return -1;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function:    test_error1
- *
- * Purpose:    Test the backward compatibility of H5Eset/get_auto.
- *
- * Return:    Success:    0
+ * Function:    test_error_compat
  *
- *        Failure:    -1
- *
- * Programmer:    Raymond Lu
- *        17 September 2010
+ * Purpose:     Test the backward compatibility of H5Eset/get_auto
  *
+ * Return:      SUCCEED/FAIL
  *
- * Modifications:
+ * Programmer:  Raymond Lu
+ *              17 September 2010
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_error1(void)
+test_error_compat(void)
 {
-    hid_t       dataset, space;
+    hid_t       did = H5I_INVALID_HID;
+    hid_t       sid = H5I_INVALID_HID;
     hsize_t     dims[2];
     H5E_auto1_t old_func1;
     H5E_auto2_t old_func2;
-    void *      old_data;
+    void *      old_data = NULL;
     herr_t      ret;
 
     TESTING("error API H5Eset/get_auto");
-    HDfprintf(stderr, "\n");
 
-    /* Create the data space */
+    /* Add a newline and flush so the output file looks nicer */
+    HDprintf("\n");
+    HDfflush(stdout);
+
+    /* Create the dataspace */
     dims[0] = DIM0;
     dims[1] = DIM1;
-    if ((space = H5Screate_simple(2, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims, NULL)) < 0)
         TEST_ERROR;
 
     /* Use H5Eget_auto2 to query the default printing function.  The library
@@ -253,8 +243,8 @@ test_error1(void)
 
     /* Try the printing function. Dataset creation should fail because the file
      * doesn't exist. */
-    dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (dataset >= 0)
+    did = H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (did >= 0)
         TEST_ERROR;
 
     /* This call should work.  It simply returns H5Eprint1. */
@@ -271,8 +261,8 @@ test_error1(void)
 
     /* Try the printing function. Dataset creation should fail because the file
      * doesn't exist. */
-    dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (dataset >= 0)
+    did = H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (did >= 0)
         TEST_ERROR;
 
     /* This call should fail because the test mixes H5Eget_auto2 with H5Eset_auto1.
@@ -288,8 +278,8 @@ test_error1(void)
 
     /* Try the printing function. Dataset creation should fail because the file
      * doesn't exist. */
-    dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (dataset >= 0)
+    did = H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (did >= 0)
         TEST_ERROR;
 
     /* This function changes the new-style printing function back to the default H5Eprint2. */
@@ -320,64 +310,72 @@ test_error1(void)
 
     /* Try the printing function. Dataset creation should fail because the file
      * doesn't exist. */
-    dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
-    if (dataset >= 0)
+    did = H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    if (did >= 0)
         TEST_ERROR;
 
-    return 0;
+    if (H5Sclose(sid) < 0)
+        TEST_ERROR;
+
+    return SUCCEED;
 
 error:
-    return -1;
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Sclose(sid);
+    }
+    H5E_END_TRY
+
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
- * Function:    test_error2
- *
- * Purpose:    Test error API functions, mainly on H5Epush1.
+ * Function:    test_h5epush1
  *
- * Return:    Success:    0
- *
- *        Failure:    -1
- *
- * Programmer:    Raymond Lu
- *        July 10, 2003
+ * Purpose:     Test error API functions, mainly H5Epush1
  *
+ * Return:      SUCCEED/FAIL
  *
- * Modifications:
+ * Programmer:  Raymond Lu
+ *              July 10, 2003
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-test_error2(hid_t file)
+test_h5epush1(hid_t file)
 {
-    hid_t       dataset, space;
+    hid_t       did       = H5I_INVALID_HID;
+    hid_t       sid       = H5I_INVALID_HID;
+    hid_t       estack_id = H5I_INVALID_HID;
     hsize_t     dims[2];
-    const char *FUNC_test_error = "test_error2";
+    const char *FUNC_test_error = "test_h5epush1";
 
     TESTING("error API based on data I/O");
-    HDfprintf(stderr, "\n");
 
-    /* Create the data space */
+    /* Add a newline and flush so the output file looks nicer */
+    HDprintf("\n");
+    HDfflush(stdout);
+
+    /* Create the dataspace */
     dims[0] = DIM0;
     dims[1] = DIM1;
-    if ((space = H5Screate_simple(2, dims, NULL)) < 0)
+    if ((sid = H5Screate_simple(2, dims, NULL)) < 0)
         TEST_ERROR;
 
     /* Test H5E_BEGIN_TRY */
     H5E_BEGIN_TRY
     {
-        dataset = H5Dcreate2(FAKE_ID, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        did =
+            H5Dcreate2(H5I_INVALID_HID, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     }
     H5E_END_TRY;
 
     /* Create the dataset */
-    if ((dataset = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) <
-        0) {
-        H5Epush1(__FILE__, FUNC_test_error, __LINE__, H5E_ERROR, H5E_CANTCREATE, "H5Dcreate2 failed");
-        goto error;
-    }
+    if ((did = H5Dcreate2(file, DSET_NAME, H5T_STD_I32BE, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        TEST_ERROR;
 
-    /* Disable the library's default printing function */
+        /* Disable the library's default printing function */
 #ifdef H5_USE_16_API_DEFAULT
     if (H5Eset_auto(NULL, NULL) < 0)
 #else
@@ -386,36 +384,48 @@ test_error2(hid_t file)
         TEST_ERROR;
 
     /* Make H5Dwrite fail, verify default print is disabled */
-    if (H5Dwrite(FAKE_ID, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints2) < 0) {
-        H5Epush1(__FILE__, FUNC_test_error, __LINE__, H5E_ERROR, H5E_WRITEERROR,
-                 "H5Dwrite shouldn't succeed");
-        goto error;
-    }
+    if (H5Dwrite(H5I_INVALID_HID, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, ipoints2) < 0)
+        H5Epush1(__FILE__, FUNC_test_error, __LINE__, H5E_ERROR, H5E_WRITEERROR, "expected H5Dwrite error");
+    else
+        TEST_ERROR;
+
+    /* Save the error stack so the close calls don't interfere with it */
+    if ((estack_id = H5Eget_current_stack()) < 0)
+        TEST_ERROR;
 
-    /* In case program comes to this point, close dataset */
-    if (H5Dclose(dataset) < 0)
+    /* Close open identifiers */
+    if (H5Dclose(did) < 0)
+        TEST_ERROR;
+    if (H5Sclose(sid) < 0)
+        TEST_ERROR;
+
+    /* Restore the stack containing errors */
+    if (H5Eset_current_stack(estack_id) < 0)
         TEST_ERROR;
 
-    TEST_ERROR;
+    return SUCCEED;
 
 error:
-    return -1;
+    H5E_BEGIN_TRY
+    {
+        H5Dclose(did);
+        H5Sclose(sid);
+        H5Eclose_stack(estack_id);
+    }
+    H5E_END_TRY
+
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
  * Function:    dump_error
  *
- * Purpose:    Prints error stack in default and customized ways.
+ * Purpose:     Prints error stack in default and customized ways
  *
- * Return:    Success:    0
+ * Return:      SUCCEED/FAIL
  *
- *        Failure:    -1
- *
- * Programmer:    Raymond Lu
- *        July 17, 2003
- *
- *
- * Modifications:
+ * Programmer:  Raymond Lu
+ *              July 17, 2003
  *
  *-------------------------------------------------------------------------
  */
@@ -432,35 +442,34 @@ dump_error(void)
     if (H5Ewalk1(H5E_WALK_UPWARD, custom_print_cb1, stderr) < 0)
         TEST_ERROR;
 
-    return 0;
+    return SUCCEED;
 
 error:
-    return -1;
+    return FAIL;
 }
 
 /*-------------------------------------------------------------------------
  * Function:    main
  *
- * Purpose:    Test error API.
- *
- * Programmer:    Raymond Lu
- *        July 10, 2003
+ * Purpose:     Test error API
  *
- * Modifications:
+ * Programmer:  Raymond Lu
+ *              July 10, 2003
  *
  *-------------------------------------------------------------------------
  */
 int
 main(void)
 {
-    hid_t       file, fapl;
+    hid_t       fid     = H5I_INVALID_HID;
+    hid_t       fapl_id = H5I_INVALID_HID;
     char        filename[1024];
     const char *FUNC_main = "main";
     int         i;
 
     HDfprintf(stderr, "   This program tests the Error API compatible with HDF5 v1.6.  There are supposed to "
                       "be some error messages\n");
-    fapl = h5_fileaccess();
+    fapl_id = h5_fileaccess();
 
     /* Set up data arrays */
     if (NULL == (ipoints2_data = (int *)HDcalloc(DIM0 * DIM1, sizeof(int))))
@@ -477,14 +486,14 @@ main(void)
     for (i = 0; i < DIM0; i++)
         icheck2[i] = icheck2_data + (i * DIM1);
 
-    h5_fixname(FILENAME[0], fapl, filename, sizeof filename);
-    if ((file = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl)) < 0)
+    h5_fixname(FILENAME[0], fapl_id, filename, sizeof(filename));
+    if ((fid = H5Fcreate(filename, H5F_ACC_TRUNC, H5P_DEFAULT, fapl_id)) < 0)
         TEST_ERROR;
 
     /* Test error stack */
 
     /* Push an error onto error stack */
-    H5Epush1(__FILE__, FUNC_main, __LINE__, H5E_ERROR, H5E_BADVALUE, "Error test failed");
+    H5Epush1(__FILE__, FUNC_main, __LINE__, H5E_ERROR, H5E_BADVALUE, "fake error message 1");
 
     /* Print out the errors on stack */
     dump_error();
@@ -493,17 +502,24 @@ main(void)
     H5Eclear1();
 
     /* Test error API */
-    if (test_error1() < 0)
+    if (test_error_compat() < 0)
         TEST_ERROR;
 
-    if (test_error2(file) < 0) {
-        H5Epush1(__FILE__, FUNC_main, __LINE__, H5E_ERROR, H5E_BADMESG, "Error test failed");
+    /* Test H5Epush1
+     *
+     * On success, there will be errors on the stack to print.
+     */
+    if (test_h5epush1(fid) < 0) {
+        TEST_ERROR;
+    }
+    else {
+        H5Epush1(__FILE__, FUNC_main, __LINE__, H5E_ERROR, H5E_BADMESG, "fake error message 2");
         H5Eprint1(stderr);
     }
 
-    if (H5Fclose(file) < 0)
+    if (H5Fclose(fid) < 0)
         TEST_ERROR;
-    h5_clean_files(FILENAME, fapl);
+    h5_clean_files(FILENAME, fapl_id);
 
     HDfree(ipoints2);
     HDfree(ipoints2_data);
@@ -511,7 +527,7 @@ main(void)
     HDfree(icheck2_data);
 
     HDprintf("All error API tests passed.\n");
-    return 0;
+    return EXIT_SUCCESS;
 
 error:
     HDfree(ipoints2);
@@ -519,7 +535,14 @@ error:
     HDfree(icheck2);
     HDfree(icheck2_data);
 
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+        H5Pclose(fapl_id);
+    }
+    H5E_END_TRY
+
     HDprintf("***** ERROR TEST FAILED! *****\n");
-    return 1;
+    return EXIT_FAILURE;
 }
 #endif /* H5_NO_DEPRECATED_SYMBOLS */