Sync with develop

1 files changed, 29 insertions, 17 deletions

diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 559c677..453444d 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -70,11 +70,12 @@ parse_command_line (int argc, const char *argv[])
         switch ((char) opt) {
             case 'h':
                 usage (h5tools_getprogname());
-                HDexit(EXIT_SUCCESS);
+                h5tools_setstatus(EXIT_SUCCESS);
+                break;
             case '?':
             default:
                 usage (h5tools_getprogname());
-                HDexit(EXIT_FAILURE);
+                h5tools_setstatus(EXIT_FAILURE);
         }
     }
 
@@ -82,10 +83,17 @@ parse_command_line (int argc, const char *argv[])
     if (argc <= opt_ind) {
         error_msg("missing file name\n");
         usage (h5tools_getprogname());
-        HDexit(EXIT_FAILURE);
+        h5tools_setstatus(EXIT_FAILURE);
     }
 } /* end parse_command_line() */
 
+static void
+leave(int ret)
+{
+   h5tools_close();
+   HDexit(ret);
+}
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
@@ -98,9 +106,7 @@ int
 main (int argc, const char *argv[])
 {
     char *ifname;
-    void *edata;
-    H5E_auto2_t func;
-    hid_t ifile;
+    hid_t ifile = H5I_INVALID_HID;
     hsize_t usize;
     htri_t testval;
     herr_t status;
@@ -112,16 +118,16 @@ main (int argc, const char *argv[])
     /* Initialize h5tools lib */
     h5tools_init();
 
-    /* Disable error reporting */
-    H5Eget_auto2(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
-
     parse_command_line(argc, argv);
 
+    /* enable error reporting if command line option */
+    h5tools_error_report();
+
     if(argc <= (opt_ind)) {
         error_msg("missing file name\n");
         usage (h5tools_getprogname());
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     ifname = HDstrdup(argv[opt_ind]);
@@ -130,33 +136,39 @@ main (int argc, const char *argv[])
 
     if(testval <= 0) {
         error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     ifile = H5Fopen(ifname, H5F_ACC_RDONLY, H5P_DEFAULT);
 
     if(ifile < 0) {
         error_msg("Can't open input HDF5 file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     plist = H5Fget_create_plist(ifile);
     if(plist < 0) {
         error_msg("Can't get file creation plist for file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     status = H5Pget_userblock(plist, &usize);
     if(status < 0) {
         error_msg("Can't get user block for file \"%s\"\n", ifname);
-        return EXIT_FAILURE;
+        h5tools_setstatus(EXIT_FAILURE);
+        goto done;
     }
 
     HDprintf("%ld\n", (long) usize);
 
+done:
     H5Pclose (plist);
-    H5Fclose (ifile);
+    if(ifile >= 0)
+        H5Fclose (ifile);
 
-    return EXIT_SUCCESS;
+    leave(h5tools_getstatus());
 } /* end main() */