[svn-r30020] Description:

    Bring r29992 from revise_chunks branch to trunk:

Turn off error reporting for h5debug and hdf2gif.

Tested on:
    MacOSX/64 10.11.5 (amazon) w/serial, parallel & produciton
    (h5committest forthcoming)

3 files changed, 21 insertions, 3 deletions

diff --git a/hl/tools/gif2h5/hdf2gif.c b/hl/tools/gif2h5/hdf2gif.c
index e03d5c4..8ed05df 100644
--- a/hl/tools/gif2h5/hdf2gif.c
+++ b/hl/tools/gif2h5/hdf2gif.c
@@ -48,6 +48,8 @@ FILE *fpGif = NULL;
 int main(int argc , char **argv)
 {
     BYTE *Image;
+    void *edata;
+    H5E_auto2_t func;
 
     /* compression structs */
     CHAR *HDFName = NULL;
@@ -73,6 +75,10 @@ int main(int argc , char **argv)
     char *image_name = NULL;
     int idx;
 
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     /* Initialize h5tools lib */
     h5tools_init();
 
@@ -330,6 +336,8 @@ int main(int argc , char **argv)
     if (image_name != NULL)
         free(image_name);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return EXIT_SUCCESS;
 
 
@@ -340,5 +348,7 @@ out:
     if (image_name != NULL)
         free(image_name);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return EXIT_FAILURE;
 }
diff --git a/test/cache_common.h b/test/cache_common.h
index 0b22cf2..122dba5 100644
--- a/test/cache_common.h
+++ b/test/cache_common.h
@@ -739,7 +739,7 @@ H5TEST_DLL void unprotect_entry(H5F_t * file_ptr,
 H5TEST_DLL void verify_clean(void);
 
 H5TEST_DLL void verify_entry_status(H5C_t * cache_ptr,
-                int tag,
+		         int tag,
                          int num_entries,
                          struct expected_entry_status expected[]);
 
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 94e9557..ae64952 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -254,11 +254,13 @@ main(int argc, char *argv[])
     haddr_t     addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0;
     uint8_t     sig[H5F_SIGNATURE_LEN];
     size_t      u;
+    H5E_auto2_t func;
+    void 	*edata;
     herr_t      status = SUCCEED;
 
     if(argc == 1) {
-  		HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
-  		HDexit(1);
+  	HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+  	HDexit(1);
     } /* end if */
 
     /* Initialize the library */
@@ -267,6 +269,10 @@ main(int argc, char *argv[])
         HDexit(1);
     } /* end if */
 
+    /* Disable error reporting */
+    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
     /*
      * Open the file and get the file descriptor.
      */
@@ -710,6 +716,8 @@ main(int argc, char *argv[])
     H5Pclose(fapl);
     H5Fclose(fid);
 
+    H5Eset_auto2(H5E_DEFAULT, func, edata);
+
     return 0;
 } /* main() */