[svn-r27768] Description:

    Complete revamp of package initialization/shutdown mechanism in the library.
Each package now has a single init/term routine.

    This new way should avoid packages being re-initialized during library
shutdown and is also be _much_ more proactive about giving feedback for
resource leaks internal to the library.

    Introduces a new "module" header file for packages in the library
(e.g src/H5Fmodule.h) which sets up some necessary package configuration macros
for the FUNC_ENTER/LEAVE macros.  (The VFL drivers have their own slightly
modified version of this header, src/H5FDdrvr_module.h)

    Also cleaned up a bunch of resources leaks all across the library and tests,
along with addressing many warnings, as I encountered them.

Tested on:
    MacOSX/64 10.10.5 (amazon) w/serial & parallel
    Linux/64 3.10.x (kituo) w/serial & parallel
    Linux/64 2.6.x (ostrich) w/serial

1 files changed, 13 insertions, 11 deletions

diff --git a/test/file_image.c b/test/file_image.c
index b1b9d47..42199cb 100644
--- a/test/file_image.c
+++ b/test/file_image.c
@@ -643,7 +643,7 @@ test_core(void)
     if(H5Fclose(file) < 0) FAIL_STACK_ERROR
 
     /* Release resources */
-    h5_cleanup(FILENAME, fapl); 
+    h5_clean_files(FILENAME, fapl); 
     HDfree(udata);
     HDfree(file_image);
     HDremove(copied_filename);
@@ -890,8 +890,8 @@ test_get_file_image(const char * test_banner,
     VERIFY(err == SUCCEED, "H5Pclose(core_fapl_id) failed.");
 
     /* tidy up */
-    result = h5_cleanup(FILENAME2, fapl);
-    VERIFY(result != 0, "h5_cleanup() failed.");
+    result = h5_clean_files(FILENAME2, fapl);
+    VERIFY(result != 0, "h5_clean_files() failed.");
 
     /* discard the image buffer if it exists */
     if(image_ptr != NULL) 
@@ -1039,8 +1039,8 @@ test_get_file_image_error_rejection(void)
     VERIFY(err == SUCCEED, "H5Fclose(file_id) failed.");
 
     /* tidy up */
-    result = h5_cleanup(FILENAME2, fapl_id);
-    VERIFY(result != 0, "h5_cleanup(1) failed.");
+    result = h5_clean_files(FILENAME2, fapl_id);
+    VERIFY(result != 0, "h5_clean_files(1) failed.");
 
     /* discard the image buffer if it exists */
     if(image_ptr != NULL) 
@@ -1145,8 +1145,8 @@ test_get_file_image_error_rejection(void)
     VERIFY(err == SUCCEED, "H5Fclose(2) failed.");
 
     /* tidy up */
-    result = h5_cleanup(FILENAME2, fapl_id);
-    VERIFY(result != 0, "h5_cleanup(2 failed.");
+    result = h5_clean_files(FILENAME2, fapl_id);
+    VERIFY(result != 0, "h5_clean_files(2 failed.");
 
     /************************** Test #3 **********************************/
     /* set up a split file driver test file, and try to get its image 
@@ -1208,8 +1208,8 @@ test_get_file_image_error_rejection(void)
     VERIFY(err == SUCCEED, "H5Fclose(2) failed.");
 
     /* tidy up */
-    result = h5_cleanup(FILENAME2, fapl_id);
-    VERIFY(result != 0, "h5_cleanup(2 failed.");
+    result = h5_clean_files(FILENAME2, fapl_id);
+    VERIFY(result != 0, "h5_clean_files(2 failed.");
 
     /************************** Test #4 **********************************/
     /* set up a family file driver test file, and try to get its image 
@@ -1269,8 +1269,8 @@ test_get_file_image_error_rejection(void)
     VERIFY(err == SUCCEED, "H5Fclose(2) failed.");
 
     /* tidy up */
-    result = h5_cleanup(FILENAME2, fapl_id);
-    VERIFY(result != 0, "h5_cleanup(2 failed.");
+    result = h5_clean_files(FILENAME2, fapl_id);
+    VERIFY(result != 0, "h5_clean_files(2 failed.");
     
     PASSED();
 
@@ -1340,6 +1340,8 @@ main(void)
 
     errors += test_get_file_image_error_rejection();
 
+    /* Restore the default error handler (set in h5_reset()) */
+    h5_restore_err();
 
     if(errors) { 
         printf("***** %d File Image TEST%s FAILED! *****\n",