[svn-r22013] HDFFV-7560:

Merge 1.8 and h5dump/tools and tests based on tools library from trunk.
Reduced warnings.

HDFFV-7949:
Remove duplicated functions in h5ls

Tested: local linux,h5committest

6 files changed, 52 insertions, 39 deletions

diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index e5caa11..9a74ebc 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -50,7 +50,7 @@ IF (BUILD_TESTING)
   IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
     ADD_EXECUTABLE (h5jamgentest ${HDF5_TOOLS_H5JAM_SOURCE_DIR}/h5jamgentest.c)
     TARGET_NAMING (h5jamgentest ${LIB_TYPE})
-    TARGET_LINK_LIBRARIES (h5jamgentest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+    TARGET_LINK_LIBRARIES (h5jamgentest ${HDF5_LIB_TARGET})
     SET_TARGET_PROPERTIES (h5jamgentest PROPERTIES FOLDER generator/tools)
     
     #ADD_TEST (NAME h5jamgentest COMMAND $<TARGET_FILE:h5jamgentest>)
diff --git a/tools/h5jam/getub.c b/tools/h5jam/getub.c
index 293aa17..f536605 100644
--- a/tools/h5jam/getub.c
+++ b/tools/h5jam/getub.c
@@ -21,6 +21,7 @@
 #endif
 
 #include "H5private.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 void parse_command_line (int argc, const char *argv[]);
@@ -32,9 +33,9 @@ void parse_command_line (int argc, const char *argv[]);
 #define PROGRAMNAME "getub"
 char *nbytes = NULL;
 
-static const char *s_opts = "c:";	/* add more later ? */
+static const char *s_opts = "c:";  /* add more later ? */
 static struct long_options l_opts[] = {
-  {"c", require_arg, 'c'},	/* input file */
+  {"c", require_arg, 'c'},  /* input file */
   {NULL, 0, '\0'}
 };
 
@@ -84,15 +85,15 @@ parse_command_line (int argc, const char *argv[])
   while ((opt = get_option (argc, argv, s_opts, l_opts)) != EOF)
     {
       switch ((char) opt)
-	{
-	case 'c':
-	  nbytes = HDstrdup (opt_arg);
-	  break;
-	case '?':
-	default:
-	  usage (h5tools_getprogname());
-	  exit (EXIT_FAILURE);
-	}
+  {
+  case 'c':
+    nbytes = HDstrdup (opt_arg);
+    break;
+  case '?':
+  default:
+    usage (h5tools_getprogname());
+    exit (EXIT_FAILURE);
+  }
     }
 
   if (argc <= opt_ind)
@@ -115,6 +116,9 @@ main (int argc, const char *argv[])
   h5tools_setprogname(PROGRAMNAME);
   h5tools_setstatus(EXIT_SUCCESS);
 
+  /* Initialize h5tools lib */
+  h5tools_init();
+
   parse_command_line (argc, argv);
 
   if (nbytes == NULL)
@@ -161,7 +165,7 @@ main (int argc, const char *argv[])
   if (res < (long)size)
     {
       if (buf)
-	free (buf);
+  free (buf);
       HDclose (fd);
       exit (EXIT_FAILURE);
     }
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 5520dc7..981eead 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -15,6 +15,7 @@
 
 #include "hdf5.h"
 #include "H5private.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 /* Name of tool */
@@ -139,7 +140,7 @@ leave(int ret)
 
     h5tools_close();
 
-    exit(ret);
+    HDexit(ret);
 }
 
 /*-------------------------------------------------------------------------
@@ -237,6 +238,9 @@ main (int argc, const char *argv[])
     H5Eget_auto2(H5E_DEFAULT, &func, &edata);
     H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
+    /* Initialize h5tools lib */
+    h5tools_init();
+
     parse_command_line (argc, argv);
 
     if (ub_file == NULL) {
diff --git a/tools/h5jam/h5jamgentest.c b/tools/h5jam/h5jamgentest.c
index ec79215..ca3d86c 100644
--- a/tools/h5jam/h5jamgentest.c
+++ b/tools/h5jam/h5jamgentest.c
@@ -310,18 +310,18 @@ gent_ub(const char * filename, size_t ub_size, size_t ub_fill)
   {
         HDassert(ub_size <= BUF_SIZE);
 
-	fd = HDopen(filename, O_RDWR, 0);
+  fd = HDopen(filename, O_RDWR, 0);
         HDassert(fd >= 0);
 
-	/* fill buf with pattern */
-	HDmemset(buf, '\0', ub_size);
-	bp = buf;
-	for (u = 0; u < ub_fill; u++)
+  /* fill buf with pattern */
+  HDmemset(buf, '\0', ub_size);
+  bp = buf;
+  for (u = 0; u < ub_fill; u++)
             *bp++ = pattern[u % 10];
 
-	HDwrite(fd, buf, ub_size);
+  HDwrite(fd, buf, ub_size);
 
-	HDclose(fd);
+  HDclose(fd);
   }
 }
 
@@ -334,9 +334,9 @@ create_textfile(const char *name, size_t size)
     char *bp;
 
     fd = HDcreat(name,0777);
-    assert(fd >= 0);
-    buf = calloc(size, (size_t)1);
-    assert(buf);
+    HDassert(fd >= 0);
+    buf = HDcalloc(size, (size_t)1);
+    HDassert(buf);
 
     /* fill buf with pattern */
     bp = buf;
@@ -345,7 +345,7 @@ create_textfile(const char *name, size_t size)
 
     HDwrite(fd, buf, size);
 
-    free(buf);
+    HDfree(buf);
 
     HDclose(fd);
 }
@@ -363,7 +363,7 @@ create_binfile(char *name, off_t size)
     fd = creat(name,0777);
     HDassert(fd >= 0);
 
-    buf = calloc(size,1);
+    buf = HDcalloc(size,1);
     HDassert(buf);
 
     /* fill buf with pattern */
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 14ed651..4751dad 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -15,6 +15,7 @@
 
 #include "hdf5.h"
 #include "H5private.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 /* Name of tool */
@@ -142,7 +143,7 @@ leave(int ret)
 
     h5tools_close();
 
-    exit(ret);
+    HDexit(ret);
 }
 
 /*-------------------------------------------------------------------------
@@ -199,7 +200,7 @@ parse_command_line(int argc, const char *argv[])
     if (argc <= opt_ind+2) {
         error_msg("missing file name\n");
         usage(h5tools_getprogname());
-        exit(EXIT_FAILURE);
+        HDexit(EXIT_FAILURE);
     }
 */
 }
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index f1b6756..0169d71 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -21,6 +21,7 @@
 
 #include "hdf5.h"
 #include "H5private.h"
+#include "h5tools.h"
 #include "h5tools_utils.h"
 
 #define TRUE 1
@@ -60,7 +61,7 @@ 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");
+     "           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");
 }
@@ -90,15 +91,15 @@ parse_command_line (int argc, const char *argv[])
   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);
-	}
+  {
+  case 'h':
+    usage (h5tools_getprogname());
+    exit (EXIT_SUCCESS);
+  case '?':
+  default:
+    usage (h5tools_getprogname());
+    exit (EXIT_FAILURE);
+  }
     }
 
   /* check for file name to be processed */
@@ -139,6 +140,9 @@ main (int argc, const char *argv[])
   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);
@@ -174,7 +178,7 @@ main (int argc, const char *argv[])
   if (plist < 0)
     {
       error_msg("Can't get file creation plist for file \"%s\"\n",
-		 ifname);
+     ifname);
       return (EXIT_FAILURE);
     }