Tools cleanup

10 files changed, 80 insertions, 122 deletions

diff --git a/hl/tools/testfiles/w-err-cmpd1.ddl b/hl/tools/testfiles/w-err-cmpd1.ddl
deleted file mode 100644
index 775d6a0..0000000
--- a/hl/tools/testfiles/w-err-cmpd1.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: error in processing <list_of_fields>
diff --git a/hl/tools/testfiles/w-err-cmpd2.ddl b/hl/tools/testfiles/w-err-cmpd2.ddl
deleted file mode 100644
index 775d6a0..0000000
--- a/hl/tools/testfiles/w-err-cmpd2.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: error in processing <list_of_fields>
diff --git a/hl/tools/testfiles/w-err-cmpd3.ddl b/hl/tools/testfiles/w-err-cmpd3.ddl
deleted file mode 100644
index 775d6a0..0000000
--- a/hl/tools/testfiles/w-err-cmpd3.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: error in processing <list_of_fields>
diff --git a/hl/tools/testfiles/w-err-cmpd4.ddl b/hl/tools/testfiles/w-err-cmpd4.ddl
deleted file mode 100644
index 775d6a0..0000000
--- a/hl/tools/testfiles/w-err-cmpd4.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: error in processing <list_of_fields>
diff --git a/hl/tools/testfiles/w-err-cmpd5.ddl b/hl/tools/testfiles/w-err-cmpd5.ddl
deleted file mode 100644
index 775d6a0..0000000
--- a/hl/tools/testfiles/w-err-cmpd5.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: error in processing <list_of_fields>
diff --git a/hl/tools/testfiles/w-err-dset-nomax.ddl b/hl/tools/testfiles/w-err-dset-nomax.ddl
deleted file mode 100644
index b99cf84..0000000
--- a/hl/tools/testfiles/w-err-dset-nomax.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: "/DSET_NOMAX" should have unlimited or max. dimension setting
diff --git a/hl/tools/testfiles/w-err-dset-none.ddl b/hl/tools/testfiles/w-err-dset-none.ddl
deleted file mode 100644
index cbf6770..0000000
--- a/hl/tools/testfiles/w-err-dset-none.ddl
+++ /dev/null
@@ -1,2 +0,0 @@
-Opened "WATCH.h5" with sec2 driver.
-h5watch error: "/DSET_NONE" should be a chunked or virtual dataset
diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index 42dda92..ae57031 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -82,7 +82,7 @@ static struct long_options l_opts[] = {
 };
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    usage
  *
@@ -119,7 +119,7 @@ static void usage(const char *prog)
     HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
 } /* usage() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
@@ -220,7 +220,7 @@ leave(int ret)
 } /* leave() */
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function:    main
  *
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index 7321c66..ac3bbee 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -11,8 +11,6 @@
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include "hdf5.h"
 #include "H5private.h"
 
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 8e4b3ac..1946e90 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -26,9 +26,9 @@
  */
 static const char *s_opts = "h";
 static struct long_options l_opts[] = {
-  {"help", no_arg, 'h'},
-  {"hel", no_arg, 'h'},
-  {NULL, 0, '\0'}
+    {"help", no_arg, 'h'},
+    {"hel", no_arg, 'h'},
+    {NULL, 0, '\0'}
 };
 
 /*-------------------------------------------------------------------------
@@ -37,152 +37,126 @@ static struct long_options l_opts[] = {
  * Purpose:     Print the usage message
  *
  * Return:      void
- *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 static void
 usage (const char *prog)
 {
-  fflush (stdout);
-  fprintf (stdout, "usage: %s h5_file\n", prog);
-  fprintf (stdout,
-     "           Check that h5_fil is HDF5 file and print size of user block \n");
-  fprintf (stdout, "       %s -h\n", prog);
-  fprintf (stdout, "           Print a usage message and exit\n");
-}
+    HDfflush(stdout);
+    HDfprintf(stdout, "usage: %s h5_file\n", prog);
+    HDfprintf(stdout,
+        "           Check that h5_fil is HDF5 file and print size of user block \n");
+    HDfprintf(stdout, "       %s -h\n", prog);
+    HDfprintf(stdout, "           Print a usage message and exit\n");
+} /* end usage() */
 
 /*-------------------------------------------------------------------------
  * Function:    parse_command_line
  *
  * Purpose:     Parse the command line for the h5dumper.
  *
- * Return:      Success:
- *
+ * Return:      Success:    void
  *              Failure:    Exits program with EXIT_FAILURE value.
- *
- * Programmer:
- *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 
 static void
 parse_command_line (int argc, const char *argv[])
 {
-  int opt;
-
-  /* parse command line options */
-  while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
-    {
-      switch ((char) opt)
-      {
-      case 'h':
-        usage (h5tools_getprogname());
-        exit (EXIT_SUCCESS);
-      case '?':
-      default:
-        usage (h5tools_getprogname());
-        exit (EXIT_FAILURE);
-      }
+    int opt;
+
+    /* parse command line options */
+    while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF) {
+        switch ((char) opt) {
+            case 'h':
+                usage (h5tools_getprogname());
+                HDexit(EXIT_SUCCESS);
+            case '?':
+            default:
+                usage (h5tools_getprogname());
+                HDexit(EXIT_FAILURE);
+        }
     }
 
-  /* check for file name to be processed */
-  if (argc <= opt_ind)
-    {
-      error_msg("missing file name\n");
-      usage (h5tools_getprogname());
-      exit (EXIT_FAILURE);
+    /* check for file name to be processed */
+    if (argc <= opt_ind) {
+        error_msg("missing file name\n");
+        usage (h5tools_getprogname());
+        HDexit(EXIT_FAILURE);
     }
-}
+} /* end parse_command_line() */
 
 /*-------------------------------------------------------------------------
  * Function:    main
  *
  * Purpose:     HDF5 user block unjammer
  *
- * Return:      Success:    0
- *              Failure:    1
- *
- * Programmer:
- *
- * Modifications:
- *
+ * Return:      EXIT_SUCCESS/EXIT_FAILURE
  *-------------------------------------------------------------------------
  */
 int
 main (int argc, const char *argv[])
 {
-  char *ifname;
-  void *edata;
-  H5E_auto2_t func;
-  hid_t ifile;
-  hsize_t usize;
-  htri_t testval;
-  herr_t status;
-  hid_t plist;
-
-  h5tools_setprogname(PROGRAMNAME);
-  h5tools_setstatus(EXIT_SUCCESS);
-
-  /* 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);
-
-  if (argc <= (opt_ind))
-    {
-      error_msg("missing file name\n");
-      usage (h5tools_getprogname());
-      return (EXIT_FAILURE);
+    char *ifname;
+    void *edata;
+    H5E_auto2_t func;
+    hid_t ifile;
+    hsize_t usize;
+    htri_t testval;
+    herr_t status;
+    hid_t plist = -1;
+
+    h5tools_setprogname(PROGRAMNAME);
+    h5tools_setstatus(EXIT_SUCCESS);
+
+    /* 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);
+
+    if(argc <= (opt_ind)) {
+        error_msg("missing file name\n");
+        usage (h5tools_getprogname());
+        return EXIT_FAILURE;
     }
 
-  ifname = HDstrdup (argv[opt_ind]);
+    ifname = HDstrdup(argv[opt_ind]);
 
   testval = H5Fis_hdf5 (ifname);
 
-  if (testval <= 0)
-    {
-      error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
-      return (EXIT_FAILURE);
+    if(testval <= 0) {
+        error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
+        return EXIT_FAILURE;
     }
 
-  ifile = H5Fopen (ifname, H5F_ACC_RDONLY, H5P_DEFAULT);
+    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);
+    if(ifile < 0) {
+        error_msg("Can't open input HDF5 file \"%s\"\n", ifname);
+        return EXIT_FAILURE;
     }
 
-  plist = H5Fget_create_plist (ifile);
-  if (plist < 0)
-    {
-      error_msg("Can't get file creation plist for file \"%s\"\n",
-     ifname);
-      return (EXIT_FAILURE);
+    plist = H5Fget_create_plist(ifile);
+    if(plist < 0) {
+        error_msg("Can't get file creation plist for file \"%s\"\n", ifname);
+        return EXIT_FAILURE;
     }
 
-  status = H5Pget_userblock (plist, &usize);
-  if (status < 0)
-    {
-      error_msg("Can't get user block for file \"%s\"\n", ifname);
-      return (EXIT_FAILURE);
+    status = H5Pget_userblock(plist, &usize);
+    if(status < 0) {
+        error_msg("Can't get user block for file \"%s\"\n", ifname);
+        return EXIT_FAILURE;
     }
 
-  printf ("%ld\n", (long) usize);
+    HDprintf("%ld\n", (long) usize);
 
-  H5Pclose (plist);
-  H5Fclose (ifile);
+    H5Pclose (plist);
+    H5Fclose (ifile);
 
-  return (EXIT_SUCCESS);
-}
+    return EXIT_SUCCESS;
+} /* end main() */