Tools merge from develop-1.10

author: Allen Byrne <byrn@hdfgroup.org> 2017-05-17 20:53:42 (GMT)
committer: Allen Byrne <byrn@hdfgroup.org> 2017-05-17 20:53:42 (GMT)
commit: a466f168515cc377b9bba00abdc0a2a76bd3b507 (patch)
tree: 3f62b7d46be02c0137aa26bf6836dc7ced74f164 /tools/h5diff
parent: f5ee10c94f9c178393cca8c560ec73991159aa9f (diff)
download: hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.zip
hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.tar.gz
hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.tar.bz2
23 files changed, 476 insertions, 384 deletions
diff --git a/tools/h5diff/CMakeTests.cmake b/tools/h5diff/CMakeTests.cmake
index 3e985f7..7f6f8c3 100644
--- a/tools/h5diff/CMakeTests.cmake
+++ b/tools/h5diff/CMakeTests.cmake
@@ -1,3 +1,14 @@
+#
+# Copyright by The HDF Group.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
+#
 
 ##############################################################################
 ##############################################################################
@@ -17,6 +28,7 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_attr2.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset2.h5
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_dset3.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper1.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_hyper2.h5
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_empty.h5
@@ -234,6 +246,8 @@
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_709.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_710.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_80.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_800.txt
+      ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_801.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_90.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_ud.txt
       ${HDF5_TOOLS_H5DIFF_SOURCE_DIR}/testfiles/h5diff_udfail.txt
@@ -418,6 +432,7 @@
   set (FILE6 h5diff_attr2.h5)
   set (FILE7 h5diff_dset1.h5)
   set (FILE8 h5diff_dset2.h5)
+  set (FILE8A h5diff_dset3.h5)
   set (FILE9 h5diff_hyper1.h5)
   set (FILE10 h5diff_hyper2.h5)
   set (FILE11 h5diff_empty.h5)
@@ -818,6 +833,10 @@
           h5diff_710.out.err
           h5diff_80.out
           h5diff_80.out.err
+          h5diff_800.out
+          h5diff_800.out.err
+          h5diff_801.out
+          h5diff_801.out.err
           h5diff_90.out
           h5diff_90.out.err
     )
@@ -1404,6 +1423,14 @@ ADD_H5_TEST (h5diff_644 1 -v --use-system-epsilon -d 5 ${FILE1} ${FILE2} /g1/dse
 ADD_H5_TEST (h5diff_645 1 -v -p 0.05 --use-system-epsilon ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
 ADD_H5_TEST (h5diff_646 1 -v --use-system-epsilon -p 0.05 ${FILE1} ${FILE2} /g1/dset3 /g1/dset4)
 
+# ##############################################################################
+# # Test array variances
+# ##############################################################################
+#
+# Test with -d , -p and --use-system-epsilon.
+ADD_H5_TEST (h5diff_800 1 -v ${FILE7} ${FILE8} /g1/array /g1/array)
+ADD_H5_TEST (h5diff_801 1 -v ${FILE7} ${FILE8A} /g1/array /g1/array)
+
 ##############################################################################
 ###    P L U G I N  T E S T S
 ##############################################################################
diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am
index c667ee4..337261a 100644
--- a/tools/h5diff/Makefile.am
+++ b/tools/h5diff/Makefile.am
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 ##
 ## Makefile.am
 ## Run automake to generate a Makefile.in from this file.
diff --git a/tools/h5diff/dynlib_diff.c b/tools/h5diff/dynlib_diff.c
index d80777d..571452e 100644
--- a/tools/h5diff/dynlib_diff.c
+++ b/tools/h5diff/dynlib_diff.c
@@ -4,12 +4,10 @@
  *                                                                           *
  * This file is part of HDF5. The full HDF5 copyright notice, including      *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic document set and is     *
- * linked from the top-level documents page.  It can also be found at        *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have access   *
- * to either file, you may request a copy from help@hdfgroup.org.            *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /*
  * Purpose:    Tests the plugin module (H5PL)
diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 98335b8..f87fdf2 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -5,12 +5,10 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
@@ -58,7 +56,7 @@ static struct long_options l_opts[] = {
 static void check_options(diff_opt_t* options)
 {
     /*--------------------------------------------------------------
-     * check for mutually exclusive options 
+     * check for mutually exclusive options
      *--------------------------------------------------------------*/
 
     /* check between -d , -p, --use-system-epsilon.
@@ -129,13 +127,13 @@ void parse_command_line(int argc,
             h5diff_exit(EXIT_SUCCESS);
         case 'v':
             options->m_verbose = 1;
-            /* This for loop is for handling style like 
+            /* This for loop is for handling style like
              * -v, -v1, --verbose, --verbose=1.
              */
             for (i = 1; i < argc; i++)
-            {                
-                /* 
-                 * short opt 
+            {
+                /*
+                 * short opt
                  */
                 if (!strcmp (argv[i], "-v"))  /* no arg */
             {
@@ -147,10 +145,10 @@ void parse_command_line(int argc,
             {
                     options->m_verbose_level = atoi(&argv[i][2]);
                     break;
-            }    
+            }
 
-                /* 
-                 * long opt 
+                /*
+                 * long opt
                  */
                 if (!strcmp (argv[i], "--verbose"))  /* no arg */
             {
@@ -179,7 +177,7 @@ void parse_command_line(int argc,
             break;
         case 'E':
             options->exclude_path = 1;
-            
+
             /* create linked list of excluding objects */
             if( (exclude_node = (struct exclude_path_list*) HDmalloc(sizeof(struct exclude_path_list))) == NULL)
             {
@@ -191,8 +189,8 @@ void parse_command_line(int argc,
             exclude_node->obj_path = (char*)opt_arg;
             exclude_node->obj_type = H5TRAV_TYPE_UNKNOWN;
             exclude_prev = exclude_head;
-            
-            if (NULL == exclude_head)            
+
+            if (NULL == exclude_head)
             {
                 exclude_head = exclude_node;
                 exclude_head->next = NULL;
@@ -204,7 +202,7 @@ void parse_command_line(int argc,
 
                 exclude_node->next = NULL;
                 exclude_prev->next = exclude_node;
-            }            
+            }
             break;
         case 'd':
             options->d=1;
@@ -460,7 +458,7 @@ check_d_input( const char *str )
 
 void usage(void)
 {
- printf("usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] \n");
+ printf("usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]\n");
  printf("  file1             File name of the first HDF5 file\n");
  printf("  file2             File name of the second HDF5 file\n");
  printf("  [obj1]            Name of an HDF5 object, in absolute path\n");
@@ -521,19 +519,22 @@ void usage(void)
  printf("   -n C, --count=C\n");
  printf("         Print differences up to C. C must be a positive integer.\n");
  printf("   -d D, --delta=D\n");
- printf("         Print difference if (|a-b| > D). D must be a positive number.\n");
+ printf("         Print difference if (|a-b| > D). D must be a positive number. Where a\n");
+ printf("         is the data point value in file1 and b is the data point value in file2.\n");
  printf("         Can not use with '-p' or '--use-system-epsilon'.\n");
  printf("   -p R, --relative=R\n");
- printf("         Print difference if (|(a-b)/b| > R). R must be a positive number.\n");
+ printf("         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a\n");
+ printf("         is the data point value in file1 and b is the data point value in file2.\n");
  printf("         Can not use with '-d' or '--use-system-epsilon'.\n");
  printf("   --use-system-epsilon\n");
- printf("         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.\n");
+ printf("         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a\n");
+ printf("         is the data point value in file1 and b is the data point value in file2.\n");
  printf("         If the system epsilon is not defined,one of the following predefined\n");
  printf("         values will be used:\n");
  printf("           FLT_EPSILON = 1.19209E-07 for floating-point type\n");
  printf("           DBL_EPSILON = 2.22045E-16 for double precision type\n");
  printf("         Can not use with '-p' or '-d'.\n");
- printf("   --exclude-path \"path\" \n");
+ printf("   --exclude-path \"path\"\n");
  printf("         Exclude the specified path to an object when comparing files or groups.\n");
  printf("         If a group is excluded, all member objects will also be excluded.\n");
  printf("         The specified path is excluded wherever it occurs.\n");
@@ -572,15 +573,15 @@ void usage(void)
  printf("\n");
 
  printf(" Object comparison:\n");
- printf("  1) Groups \n");
+ printf("  1) Groups\n");
  printf("      First compares the names of member objects (relative path, from the\n");
  printf("      specified group) and generates a report of objects that appear in only\n");
  printf("      one group or in both groups. Common objects are then compared recursively.\n");
- printf("  2) Datasets \n");
+ printf("  2) Datasets\n");
  printf("      Array rank and dimensions, datatypes, and data values are compared.\n");
- printf("  3) Datatypes \n");
+ printf("  3) Datatypes\n");
  printf("      The comparison is based on the return value of H5Tequal.\n");
- printf("  4) Symbolic links \n");
+ printf("  4) Symbolic links\n");
  printf("      The paths to the target objects are compared.\n");
  printf("      (The option --follow-symlinks overrides the default behavior when\n");
  printf("       symbolic links are compared.).\n");
diff --git a/tools/h5diff/h5diff_common.h b/tools/h5diff/h5diff_common.h
index 5b1317f..e5dfe3f 100644
--- a/tools/h5diff/h5diff_common.h
+++ b/tools/h5diff/h5diff_common.h
@@ -5,12 +5,10 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef H5DIFFCOMMON_H__
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 2b971f4..6b9004b 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -5,12 +5,10 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
diff --git a/tools/h5diff/h5diff_plugin.sh.in b/tools/h5diff/h5diff_plugin.sh.in
index 3f39d4c..141e948 100644
--- a/tools/h5diff/h5diff_plugin.sh.in
+++ b/tools/h5diff/h5diff_plugin.sh.in
@@ -5,12 +5,10 @@
 #
 # This file is part of HDF5. The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic document set and is
-# linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have access
-# to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 srcdir=@srcdir@
 TOP_BUILDDIR=@top_builddir@
@@ -105,7 +103,7 @@ COPY_TESTFILES_TO_TESTDIR()
             INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
             INODE_DDIR=`$LS -i -d $TESTDIR | $AWK -F' ' '{print $1}'`
             if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
-              $CP -f $tstfile $TESTDIR
+                $CP -f $tstfile $TESTDIR
                 if [ $? -ne 0 ]; then
                     echo "Error: FAILED to copy $tstfile ."
 
@@ -228,6 +226,8 @@ TOOLTEST() {
         # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     elif test $h5haveexitcode = 'yes' -a -z "$pmode"; then
diff --git a/tools/h5diff/h5diffgentest.c b/tools/h5diff/h5diffgentest.c
index 50b32aa..9472bc8 100644
--- a/tools/h5diff/h5diffgentest.c
+++ b/tools/h5diff/h5diffgentest.c
@@ -5,12 +5,10 @@
 *                                                                           *
 * This file is part of HDF5.  The full HDF5 copyright notice, including     *
 * terms governing use, modification, and redistribution, is contained in    *
-* the files COPYING and Copyright.html.  COPYING can be found at the root   *
-* of the source code distribution tree; Copyright.html can be found at the  *
-* root level of an installed copy of the electronic HDF5 document set and   *
-* is linked from the top-level documents page.  It can also be found at     *
-* http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
-* access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
 * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdio.h>
@@ -24,11 +22,11 @@
  * size of that temporary buffer in bytes. For efficiency's sake, choose the
  * largest value suitable for your machine (for testing use a small value).
  */
-/* Maximum size used in a call to malloc for a dataset 
+/* Maximum size used in a call to malloc for a dataset
  * NOTE: this value should stay in sync with the value defined in the tools
- *       library file: h5tools_utils.h 
+ *       library file: h5tools_utils.h
  */
-hsize_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
+size_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 
 /*-------------------------------------------------------------------------
 * Program: h5diffgentest
@@ -50,6 +48,7 @@ hsize_t H5TOOLS_MALLOCSIZE = (128 * 1024 * 1024);
 #define FILE6    "h5diff_attr2.h5"
 #define FILE7    "h5diff_dset1.h5"
 #define FILE8    "h5diff_dset2.h5"
+#define FILE8A   "h5diff_dset3.h5"
 #define FILE9    "h5diff_hyper1.h5"
 #define FILE10   "h5diff_hyper2.h5"
 #define FILE11   "h5diff_empty.h5"
@@ -196,6 +195,7 @@ int main(void)
     /* generate 2 files, the second call creates a similar file with differences */
     test_datasets(FILE7,0);
     test_datasets(FILE8,1);
+    test_datasets(FILE8A,2);
 
     /* generate 2 files, the second call creates a similar file with differences */
     test_hyperslab(FILE9,0);
@@ -236,7 +236,7 @@ int main(void)
     test_enums(ENUM_INVALID_VALUES);
 
     /* -------------------------------------------------
-     * Create test files with dataset and attribute with container types 
+     * Create test files with dataset and attribute with container types
      * (array, vlen) with multiple nested compound types.
      */
     /* file1 */
@@ -251,8 +251,8 @@ int main(void)
     test_comps_vlen_arry(COMPS_COMPLEX2,"dset4", "attr4", 5, 0);
 
     /*-------------------------------------------------
-     * Create test files with non-comparable dataset and attributes with 
-     * comparable datasets and attributes.  All the comparables should display 
+     * Create test files with non-comparable dataset and attributes with
+     * comparable datasets and attributes.  All the comparables should display
      * differences.
      */
     test_data_nocomparables(NON_COMPARBLES1,0);
@@ -1021,14 +1021,14 @@ int test_attributes(const char *file,
 static int test_attributes_verbose_level(const char *fname1, const char *fname2)
 {
     herr_t  status = SUCCEED;
-    hid_t   fid1, fid2;
-    hid_t   f1_gid, f2_gid;
-    hid_t   f1_gid2, f2_gid2;
-    hid_t   f1_gid3, f2_gid3;
-    hid_t   f1_gid4, f2_gid4;
-    hid_t   f1_did, f2_did;
-    hid_t   f1_sid, f2_sid;
-    hid_t   f1_tid, f2_tid;
+    hid_t   fid1    = -1,   fid2 = -1;
+    hid_t   f1_gid  = -1,   f2_gid = -1;
+    hid_t   f1_gid2 = -1,   f2_gid2 = -1;
+    hid_t   f1_gid3 = -1,   f2_gid3 = -1;
+    hid_t   f1_gid4 = -1,   f2_gid4 = -1;
+    hid_t   f1_did  = -1,   f2_did = -1;
+    hid_t   f1_sid  = -1,   f2_sid = -1;
+    hid_t   f1_tid  = -1,   f2_tid = -1;
     /* dset */
     hsize_t dset_dims[1]={3};
     int dset_data[3] = {0,1,2};
@@ -1259,9 +1259,9 @@ out:
     /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if(fid1 > 0)
         H5Fclose(fid1);
-    if(fid2)
+    if(fid2 > 0)
         H5Fclose(fid2);
     if(f1_gid > 0)
         H5Gclose(f1_gid);
@@ -1283,13 +1283,13 @@ out:
         H5Dclose(f1_did);
     if(f2_did > 0)
         H5Dclose(f2_did);
-    if(f1_sid >0)
+    if(f1_sid > 0)
         H5Sclose(f1_sid);
-    if(f2_sid >0)
+    if(f2_sid > 0)
         H5Sclose(f2_sid);
-    if(f1_tid >0)
+    if(f1_tid > 0)
         H5Tclose(f1_tid);
-    if(f2_tid >0)
+    if(f2_tid > 0)
         H5Tclose(f2_tid);
 
     return status;
@@ -1318,7 +1318,7 @@ int test_datasets(const char *file,
     herr_t  status;
     int     buf[2]={1,2};
 
-    if(make_diffs)
+    if(make_diffs > 0)
         memset(buf, 0, sizeof buf);
 
     /* Create a file  */
@@ -1389,9 +1389,8 @@ int test_special_datasets(const char *file,
 
     /* Create a dataset with zero dimension size in one file but the other one
      * has a dataset with a non-zero dimension size */
-    if(make_diffs) {
+    if(make_diffs)
         dims[1] = SPACE1_DIM2 + 4;
-    }
 
     sid = H5Screate_simple(SPACE1_RANK, dims, NULL);
     did  = H5Dcreate2(fid, "dset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
@@ -2804,15 +2803,18 @@ out:
 #define GRP_R_DSETNAME2 "dset2"
 static int test_group_recurse2(void)
 {
-    hid_t       fileid1;
-    hid_t       grp1=0, grp2;
-    hid_t       grp3=0;
-    hid_t       grp4=0;
-    hid_t       dset1, dset2;
-    hid_t       datatype, dataspace;   /* handles */
-    hid_t       fileid2;
-    hid_t       fileid3;
-    hid_t       fileid4;
+    hid_t       fileid1     = -1;
+    hid_t       grp1        = -1;
+    hid_t       grp2        = -1;
+    hid_t       grp3        = -1;
+    hid_t       grp4        = -1;
+    hid_t       dset1       = -1;
+    hid_t       dset2       = -1;
+    hid_t       datatype    = -1;
+    hid_t       dataspace   = -1;
+    hid_t       fileid2     = -1;
+    hid_t       fileid3     = -1;
+    hid_t       fileid4     = -1;
     hsize_t     dimsf[2];              /* dataset dimensions */
     herr_t      status=0;
     int data1[4][2] = {{0,0},{1,1},{2,2},{3,3}};
@@ -3105,12 +3107,18 @@ out:
     /*
      * Close/release resources.
      */
-    H5Sclose(dataspace);
-    H5Tclose(datatype);
-    H5Fclose(fileid1);
-    H5Fclose(fileid2);
-    H5Fclose(fileid3);
-    H5Fclose(fileid4);
+    if(dataspace > 0)
+        H5Sclose(dataspace);
+    if(datatype > 0)
+        H5Tclose(datatype);
+    if(fileid1 > 0)
+        H5Fclose(fileid1);
+    if(fileid2 > 0)
+        H5Fclose(fileid2);
+    if(fileid3 > 0)
+        H5Fclose(fileid3);
+    if(fileid4 > 0)
+        H5Fclose(fileid4);
 
     return status;
 }
@@ -3513,8 +3521,8 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
 {
     int i;
 
-    hid_t    fid1;      /* file id */
-    hid_t    gid;
+    hid_t    fid1   = -1;      /* file id */
+    hid_t    gid    = -1;
 
     /* compound1 datatype */
     typedef struct comp1_t
@@ -3642,7 +3650,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     /* vlen string */
     hid_t    sid_vlen_str=0;      /* dataspace ID */
     hid_t    tid_vlen_str=0;      /* datatype ID */
-    const char vlen_str_buf[]= {
+    char vlen_str_buf[]= {
         "Variable length string"
         };
     hsize_t dims_vlen_str[]  = {VLEN_STR_DIM};
@@ -3659,7 +3667,7 @@ static int test_comp_vlen_strings(const char *fname1, const char *grp_name, int
     hid_t    sid_vlen_str_array=0;      /* dataspace ID */
     hid_t    tid_vlen_str_array_pre=0;      /* datatype ID */
     hid_t    tid_vlen_str_array=0; /* datatype ID */
-    const char *vlen_str_array_buf[VLEN_STR_ARRY_DIM]= {
+    char *vlen_str_array_buf[VLEN_STR_ARRY_DIM]= {
         "1 - Variable length string Array",
         "2 - Testing variable length string array in compound type",
         "3 - Four score and seven\n years ago our forefathers brought forth on this continent a new nation,"
@@ -4160,60 +4168,60 @@ out:
    /*-----------------------------------------------------------------------
     * Close
     *-----------------------------------------------------------------------*/
-    if(fid1)
+    if(fid1 > 0)
         H5Fclose(fid1);
-    if(gid)
+    if(gid > 0)
         H5Gclose(gid);
     /* vlen string */
-    if(tid_vlen_str)
+    if(tid_vlen_str > 0)
         H5Tclose(tid_vlen_str);
-    if(sid_vlen_str)
+    if(sid_vlen_str > 0)
         H5Sclose(sid_vlen_str);
     /* fixed len string */
-    if(tid_fixlen_str)
+    if(tid_fixlen_str > 0)
         H5Tclose(tid_fixlen_str);
-    if(sid_fixlen_str)
+    if(sid_fixlen_str > 0)
         H5Sclose(sid_fixlen_str);
     /* vlen string array */
-    if(tid_vlen_str_array_pre)
+    if(tid_vlen_str_array_pre > 0)
         H5Tclose(tid_vlen_str_array_pre);
-    if(tid_vlen_str_array)
+    if(tid_vlen_str_array > 0)
         H5Tclose(tid_vlen_str_array);
-    if(sid_vlen_str_array)
+    if(sid_vlen_str_array > 0)
         H5Sclose(sid_vlen_str_array);
     /* fixed len string array */
-    if(tid_fixlen_str_array_pre)
+    if(tid_fixlen_str_array_pre > 0)
         H5Tclose(tid_fixlen_str_array_pre);
-    if(tid_fixlen_str_array)
+    if(tid_fixlen_str_array > 0)
         H5Tclose(tid_fixlen_str_array);
-    if(sid_fixlen_str_array)
+    if(sid_fixlen_str_array > 0)
         H5Sclose(sid_fixlen_str_array);
     /* compound */
-    if(tid1_comp)
+    if(tid1_comp > 0)
         H5Tclose(tid1_comp);
-    if(tid2_comp)
+    if(tid2_comp > 0)
         H5Tclose(tid2_comp);
-    if(tid3_comp)
+    if(tid3_comp > 0)
         H5Tclose(tid3_comp);
-    if(tid4_comp)
+    if(tid4_comp > 0)
         H5Tclose(tid4_comp);
-    if(tid5_comp)
+    if(tid5_comp > 0)
         H5Tclose(tid5_comp);
-    if(tid6_comp)
+    if(tid6_comp > 0)
         H5Tclose(tid6_comp);
-    if(tid7_comp)
+    if(tid7_comp > 0)
         H5Tclose(tid7_comp);
-    if(tid8_comp)
+    if(tid8_comp > 0)
         H5Tclose(tid8_comp);
-    if(tid9_comp)
+    if(tid9_comp > 0)
         H5Tclose(tid9_comp);
-    if(did_comp)
+    if(did_comp > 0)
         H5Dclose(did_comp);
-    if(sid_comp)
+    if(sid_comp > 0)
         H5Sclose(sid_comp);
 
     return status;
-}
+} /* end test_comp_vlen_strings() */
 
 
 /*-------------------------------------------------------------------------
@@ -4319,8 +4327,8 @@ out:
 
 /*-------------------------------------------------------------------------
 *
-* Purpose: 
-*   Create test files with dataset and attribute with container types 
+* Purpose:
+*   Create test files with dataset and attribute with container types
 *   (array, vlen) with multiple nested compound types.
 *
 * Function: test_comps_array()
@@ -4344,7 +4352,7 @@ out:
 static void test_comps_array (const char *fname, const char *dset, const char *attr,int diff, int is_file_new)
 {
     /* sub compound 2 */
-    typedef struct {        
+    typedef struct {
         int i2;
         float f2;
     } cmpd2_t;
@@ -4366,17 +4374,17 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
     hid_t  tid_attr;
     hsize_t  sdims_dset[] = {SDIM_DSET};
     hsize_t  sdims_cmpd_arry[] = {SDIM_CMPD_ARRAY};
-    int     i,j;       
+    int     i,j;
     herr_t  ret;  /* Generic return value  */
 
     /* Initialize array data to write */
     for(i=0; i < SDIM_DSET; i++)
     {
         wdata[i].i1 = i;
-        for(j=0; j < SDIM_CMPD_ARRAY; j++) 
+        for(j=0; j < SDIM_CMPD_ARRAY; j++)
         {
-            wdata[i].cmpd2[j].i2 = i*10 + diff;
-            wdata[i].cmpd2[j].f2 = (float)(i*10.5F) + diff;
+            wdata[i].cmpd2[j].i2 = i * 10 + diff;
+            wdata[i].cmpd2[j].f2 = (float)i * 10.5F + (float)diff;
         } /* end for */
     }
 
@@ -4417,7 +4425,7 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
 
 
     /* -------------------
-     * Create a dataset 
+     * Create a dataset
      */
     /* Create dataspace for datasets */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
@@ -4459,18 +4467,18 @@ static void test_comps_array (const char *fname, const char *dset, const char *a
 static void test_comps_vlen (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 2 */
-    typedef struct {       
+    typedef struct {
         int i2;
         float f2;
     } cmpd2_t;
 
     /* top compound 1 */
-    typedef struct { 
+    typedef struct {
         int i1;
         hvl_t vl;   /* VL information for compound2 */
     } cmpd1_t;
 
-    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */ 
+    cmpd1_t wdata[SDIM_DSET];   /* Dataset for compound1 */
 
     hid_t  fid;  /* HDF5 File ID */
     hid_t  did_dset; /* dataset ID   */
@@ -4485,15 +4493,13 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     herr_t  ret;  /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i=0; i<SDIM_DSET; i++)
-    {
-        wdata[i].i1 = i;
-        wdata[i].vl.p = HDmalloc((i+1)*sizeof(cmpd2_t));
-        wdata[i].vl.len = i+1;
-        for(j=0; j<(i+1); j++)
-        {
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = i*10 + diff;
-            ((cmpd2_t *)wdata[i].vl.p)[j].f2 = (float)(i*10.5F) + diff;
+    for(i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int)i;
+        wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
+        wdata[i].vl.len = i + 1;
+        for(j = 0; j < (i + 1); j++) {
+            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)(i * 10 + (unsigned)diff);
+            ((cmpd2_t *)wdata[i].vl.p)[j].f2 = (float)i * 10.5F + (float)diff;
         } /* end for */
     } /* end for */
 
@@ -4528,7 +4534,7 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1 
+     * Create dataset with compound1
      */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
@@ -4573,11 +4579,11 @@ static void test_comps_vlen (const char * fname, const char *dset, const char *a
 
 static void test_comps_array_vlen (const char * fname, const char *dset,const char *attr, int diff, int is_file_new)
 {
-    typedef struct {       
+    typedef struct {
         int i3;
         float f3;
     } cmpd3_t;
- 
+
     typedef struct {        /* Typedef for compound datatype */
         int i2;
         hvl_t vl;   /* VL information to write */
@@ -4600,26 +4606,24 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
     hid_t  tid_cmpd3;       /* Compound3 Datatype ID   */
     hsize_t  sdims_dset[] = {SDIM_DSET};
     hsize_t  sdims_arry[] = {SDIM_CMPD_ARRAY};
-    int        i,j,k;        /* counting variables */
-    herr_t  ret;  /* Generic return value  */
+    unsigned i, j, k;   /* counting variables */
+    herr_t  ret;        /* Generic return value  */
 
 
 
     /* Initialize array data to write in compound1 */
-    for(i=0; i < SDIM_DSET; i++)
-    {
-        wdata[i].i1 = i;
+    for(i = 0; i < SDIM_DSET; i++) {
+        wdata[i].i1 = (int)i;
+
         /* Allocate and initialize VL data to write in compound2 */
-        for(j=0; j < SDIM_CMPD_ARRAY; j++) 
-        {
-            wdata[i].cmpd2[j].i2 = j*10;
-            wdata[i].cmpd2[j].vl.p = HDmalloc((j+1)*sizeof(cmpd3_t));
-            wdata[i].cmpd2[j].vl.len = j+1;
-            for(k=0; k<(j+1); k++) 
-            {
+        for(j = 0; j < SDIM_CMPD_ARRAY; j++) {
+            wdata[i].cmpd2[j].i2 = (int)(j * 10);
+            wdata[i].cmpd2[j].vl.p = HDmalloc((j + 1) * sizeof(cmpd3_t));
+            wdata[i].cmpd2[j].vl.len = j + 1;
+            for(k = 0; k < (j + 1); k++) {
                 /* Initialize data of compound3 */
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].i3 = j*10 + diff;
-                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].f3 = (float)(j*10.5F) + diff;
+                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].i3 = (int)j * 10 + diff;
+                ((cmpd3_t *)wdata[i].cmpd2[j].vl.p)[k].f3 = (float)j * 10.5F + (float)diff;
             } /* end for */
         } /* end for */
     }
@@ -4718,19 +4722,19 @@ static void test_comps_array_vlen (const char * fname, const char *dset,const ch
 static void test_comps_vlen_arry (const char * fname, const char *dset, const char *attr, int diff, int is_file_new)
 {
     /* sub compound 3 */
-    typedef struct {       
+    typedef struct {
         int i3;
         float f3;
     } cmpd3_t;
 
     /* sub compound 2 */
-    typedef struct {       
+    typedef struct {
         int i2;
         cmpd3_t cmpd3[SDIM_CMPD_ARRAY];
     } cmpd2_t;
 
     /* top compound 1 */
-    typedef struct { 
+    typedef struct {
         int i1;
         hvl_t vl;   /* VL information for compound2 */
     } cmpd1_t;
@@ -4753,22 +4757,19 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     herr_t  ret;  /* Generic return value  */
 
     /* Allocate and initialize VL data to write */
-    for(i=0; i<SDIM_DSET; i++)
-    {
+    for(i = 0; i < SDIM_DSET; i++) {
         /* compound 1 data */
-        wdata[i].i1 = i;
-        wdata[i].vl.p = HDmalloc((i+1)*sizeof(cmpd2_t));
-        wdata[i].vl.len = i+1;
-        for(j=0; j<(i+1); j++)
-        {
+        wdata[i].i1 = (int)i;
+        wdata[i].vl.p = HDmalloc((i + 1) * sizeof(cmpd2_t));
+        wdata[i].vl.len = i + 1;
+        for(j = 0; j < (i + 1); j++) {
             /* compound2 data */
-            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = i*10 + diff;
-            for (k=0; k < SDIM_CMPD_ARRAY; k++)
-            {
+            ((cmpd2_t *)wdata[i].vl.p)[j].i2 = (int)i * 10 + diff;
+            for(k = 0; k < SDIM_CMPD_ARRAY; k++) {
                 /* compound 3 data */
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].i3 = k*10.5F + diff;
-                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].f3 = (float)(k*10.5F) + diff;
-            }
+                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].i3 = (int)((float)k * 10.5F) + diff;
+                ((cmpd2_t *)(wdata[i].vl.p))[j].cmpd3[k].f3 = (float)k * 10.5F + (float)diff;
+            } /* end for */
         } /* end for */
     } /* end for */
 
@@ -4814,7 +4815,7 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
     assert(ret >= 0);
 
     /* -------------------------------
-     * Create dataset with compound1 
+     * Create dataset with compound1
      */
     /* Create dataspace for dataset */
     sid_dset = H5Screate_simple(1, sdims_dset, NULL);
@@ -4864,9 +4865,9 @@ static void test_comps_vlen_arry (const char * fname, const char *dset, const ch
 /*-------------------------------------------------------------------------
 * Function: test_data_nocomparables
 *
-* Purpose: 
-*   Create test files with non-comparable dataset and attributes with 
-*   comparable datasets and attributes.  All the comparables should display 
+* Purpose:
+*   Create test files with non-comparable dataset and attributes with
+*   comparable datasets and attributes.  All the comparables should display
 *   differences.
 *
 *-------------------------------------------------------------------------*/
@@ -4924,8 +4925,8 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
         dset_data_ptr2=(int*)&data2;
         attr_data_ptr1=(int*)&data2;
 
-        /* ----------- 
-         * group2 
+        /* -----------
+         * group2
          */
         dset_data_ptr3=(int*)&data2;
         /* dset1/attr1 */
@@ -5047,10 +5048,10 @@ static void test_data_nocomparables (const char * fname, int make_diffs)
         goto out;
     }
 
-    
+
 
 out:
-    
+
     /*-----------------------------------------------------------------------
     * Close IDs
     *-----------------------------------------------------------------------*/
@@ -5075,9 +5076,9 @@ out:
 /*-------------------------------------------------------------------------
 * Function: test_objs_nocomparables
 *
-* Purpose: 
+* Purpose:
 *   Create test files with common objects (same name) but different object
-*   types. 
+*   types.
 *   h5diff should show non-comparable output from these common objects.
 *-------------------------------------------------------------------------*/
 static void test_objs_nocomparables(const char *fname1, const char *fname2)
@@ -5365,6 +5366,34 @@ static void test_objs_strings(const char *fname1, const char *fname2)
     H5Sclose(space);
     H5Dclose(dataset);
 
+    /* string 5 : early term long string */
+    string4A[0][10] = 0;
+    string4A[0][11] = 0;
+    string4B[0][10] = 0;
+
+    string4A[1][10] = 0;
+    string4A[1][11] = 'Z';
+    string4B[1][10] = 0;
+    string4B[1][11] = 'x';
+
+    string4A[2][10] = 0;
+    string4B[2][10] = 0;
+    string4B[2][11] = 'a';
+    string4B[2][12] = 'B';
+    string4B[2][13] = 'c';
+    space = H5Screate_simple(1, dims4, NULL);
+    f_type = mkstr(168, H5T_STR_NULLTERM);
+    m_type = mkstr(21, H5T_STR_NULLTERM);
+    dataset = H5Dcreate2(fid1, "/string5", f_type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dataset, m_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, string4A);
+    H5Dclose(dataset);
+    dataset = H5Dcreate2(fid2, "/string5", f_type, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+    H5Dwrite(dataset, m_type, H5S_ALL, H5S_ALL, H5P_DEFAULT, string4B);
+    H5Tclose(m_type);
+    H5Tclose(f_type);
+    H5Sclose(space);
+    H5Dclose(dataset);
+
 out:
     /*-----------------------------------------------------------------------
     * Close IDs
@@ -5908,13 +5937,15 @@ void write_attr_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n=0;
-    for (i = 0; i < 3; i++) {
-        for (j = 0; j < 2; j++) {
-            buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
-            buf52[i][j].len = i + 1;
-            for (l = 0; l < i + 1; l++)
-                if (make_diffs)((int *)buf52[i][j].p)[l] = 0;
-                else ((int *)buf52[i][j].p)[l] = n++;
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for(l = 0; l < i + 1; l++)
+                if(make_diffs)
+                    ((int *)buf52[i][j].p)[l] = 0;
+                else
+                    ((int *)buf52[i][j].p)[l] = n++;
         }
     }
 
@@ -6125,8 +6156,10 @@ void write_attr_in(hid_t loc_id,
     for (i = 0; i < 4; i++) {
         for (j = 0; j < 3; j++) {
             for (k = 0; k < 2; k++) {
-                if (make_diffs) buf23[i][j][k]=0;
-                else buf23[i][j][k]=n++;
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char)n++;
             }
         }
     }
@@ -6183,12 +6216,12 @@ void write_attr_in(hid_t loc_id,
         for (j = 0; j < 3; j++) {
             for (k = 0; k < 2; k++) {
                 if (make_diffs) {
-                    buf33[i][j][k].a=0;
-                    buf33[i][j][k].b=0.0F;
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a=n++;
-                    buf33[i][j][k].b=n++;
+                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].b = n++;
                 }
             }
         }
@@ -6326,11 +6359,13 @@ void write_attr_in(hid_t loc_id,
     for (i = 0; i < 4; i++) {
         for (j = 0; j < 3; j++) {
             for (k = 0; k < 2; k++) {
-                buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
-                buf53[i][j][k].len = i + 1;
+                buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)(i + 1);
                 for (l = 0; l < i + 1; l++)
-                    if (make_diffs)((int *)buf53[i][j][k].p)[l] = 0;
-                    else ((int *)buf53[i][j][k].p)[l] = n++;
+                    if(make_diffs)
+                        ((int *)buf53[i][j][k].p)[l] = 0;
+                    else
+                        ((int *)buf53[i][j][k].p)[l] = n++;
             }
         }
     }
@@ -6506,6 +6541,9 @@ void write_dset_in(hid_t loc_id,
     int        buf73[4][3][2];    /* integer */
     float      buf83[4][3][2];    /* float */
 
+    if(make_diffs == 2) {
+        dimarray[0] = 4;
+    }
 
     /*-------------------------------------------------------------------------
     * H5S_SCALAR
@@ -6514,11 +6552,8 @@ void write_dset_in(hid_t loc_id,
 
 
 
-    if ( make_diffs )
-    {
-
+    if(make_diffs)
         scalar_data = 1;
-    }
 
     /* create a space  */
     sid = H5Screate(H5S_SCALAR);
@@ -6700,22 +6735,21 @@ void write_dset_in(hid_t loc_id,
     status = H5Tclose(tid);
 
     {
-
         double  *dbuf;                           /* information to write */
-        hid_t   did;                             /* dataset ID   */
-        hid_t   sid;                             /* dataspace ID   */
-        hid_t   tid;                             /* datatype ID   */
+        hid_t   ldid;                            /* dataset ID   */
+        hid_t   lsid;                            /* dataspace ID   */
+        hid_t   ltid;                            /* datatype ID   */
         size_t  size;
         hsize_t sdims[] = {1};
         hsize_t tdims[] = {H5TOOLS_MALLOCSIZE / sizeof(double) + 1};
-        int     j;
+        size_t  jj;
 
         /* allocate and initialize array data to write */
         size = ( H5TOOLS_MALLOCSIZE / sizeof(double) + 1 ) * sizeof(double);
-        dbuf = HDmalloc( size );
+        dbuf = (double *)HDmalloc(size);
 
-        for( j = 0; j < H5TOOLS_MALLOCSIZE / sizeof(double) + 1; j++)
-            dbuf[j] = j;
+        for(jj = 0; jj < (H5TOOLS_MALLOCSIZE / sizeof(double) + 1); jj++)
+            dbuf[jj] = (double)jj;
 
         if (make_diffs)
         {
@@ -6724,19 +6758,19 @@ void write_dset_in(hid_t loc_id,
         }
 
         /* create a type larger than H5TOOLS_MALLOCSIZE */
-        tid = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, tdims);
-        size = H5Tget_size(tid);
-        sid = H5Screate_simple(1, sdims, NULL);
-        did = H5Dcreate2(loc_id, "arrayd", tid, sid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
+        ltid = H5Tarray_create2(H5T_NATIVE_DOUBLE, 1, tdims);
+        size = H5Tget_size(ltid);
+        lsid = H5Screate_simple(1, sdims, NULL);
+        ldid = H5Dcreate2(loc_id, "arrayd", ltid, lsid, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
 #if defined(WRITE_ARRAY)
-        H5Dwrite(did, tid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dbuf);
+        H5Dwrite(ldid, ltid, H5S_ALL, H5S_ALL, H5P_DEFAULT, dbuf);
 #endif
 
         /* close */
-        H5Dclose(did);
-        H5Tclose(tid);
-        H5Sclose(sid);
-        HDfree( dbuf );
+        H5Dclose(ldid);
+        H5Tclose(ltid);
+        H5Sclose(lsid);
+        HDfree(dbuf);
     }
 
     /*-------------------------------------------------------------------------
@@ -6866,15 +6900,12 @@ void write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n = 0;
-    for(i = 0; i < 3; i++)
-    {
-        for(j = 0; j < 2; j++)
-        {
-            buf52[i][j].p = HDmalloc((i + 1) * sizeof(int));
-            buf52[i][j].len = i + 1;
-            for(l = 0; l < i + 1; l++)
-            {
-                if (make_diffs)
+    for(i = 0; i < 3; i++) {
+        for(j = 0; j < 2; j++) {
+            buf52[i][j].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+            buf52[i][j].len = (size_t)(i + 1);
+            for(l = 0; l < i + 1; l++) {
+                if(make_diffs)
                     ((int *)buf52[i][j].p)[l] = 0;
                 else
                     ((int *)buf52[i][j].p)[l] = n++;
@@ -6984,15 +7015,13 @@ void write_dset_in(hid_t loc_id,
 
 
     n=1;
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            for (k = 0; k < 2; k++)
-            {
-                if (make_diffs)
-                    buf23[i][j][k]=0;
-                else buf23[i][j][k]=n++;
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 3; j++) {
+            for (k = 0; k < 2; k++) {
+                if(make_diffs)
+                    buf23[i][j][k] = 0;
+                else
+                    buf23[i][j][k] = (char)n++;
             }
         }
     }
@@ -7017,20 +7046,16 @@ void write_dset_in(hid_t loc_id,
     */
 
     n=1;
-    for (i = 0; i < 4; i++)
-    {
-        for (j = 0; j < 3; j++)
-        {
-            for (k = 0; k < 2; k++)
-            {
-                if (make_diffs)
-                {
-                    buf33[i][j][k].a=0;
-                    buf33[i][j][k].b=0.0F;
+    for (i = 0; i < 4; i++) {
+        for (j = 0; j < 3; j++) {
+            for (k = 0; k < 2; k++) {
+                if (make_diffs) {
+                    buf33[i][j][k].a = 0;
+                    buf33[i][j][k].b = 0.0F;
                 }
                 else {
-                    buf33[i][j][k].a=n++;
-                    buf33[i][j][k].b=n++;
+                    buf33[i][j][k].a = (char)n++;
+                    buf33[i][j][k].b = n++;
                 }
             }
         }
@@ -7077,16 +7102,12 @@ void write_dset_in(hid_t loc_id,
 
     /* Allocate and initialize VL dataset to write */
     n=0;
-    for(i = 0; i < 4; i++)
-    {
-        for(j = 0; j < 3; j++)
-        {
-            for(k = 0; k < 2; k++)
-            {
-                buf53[i][j][k].p = HDmalloc((i + 1) * sizeof(int));
-                buf53[i][j][k].len = i + 1;
-                for(l = 0; l < i + 1; l++)
-                {
+    for(i = 0; i < 4; i++) {
+        for(j = 0; j < 3; j++) {
+            for(k = 0; k < 2; k++) {
+                buf53[i][j][k].p = HDmalloc((size_t)(i + 1) * sizeof(int));
+                buf53[i][j][k].len = (size_t)(i + 1);
+                for(l = 0; l < i + 1; l++) {
                     if(make_diffs)
                         ((int *)buf53[i][j][k].p)[l] = 0;
                     else
@@ -7179,10 +7200,10 @@ void gen_datareg(hid_t fid,
     int             i;
 
     /* allocate the buffer for write the references */
-    rbuf = HDcalloc((size_t)2, sizeof(hdset_reg_ref_t));
+    rbuf = (hdset_reg_ref_t *)HDcalloc((size_t)2, sizeof(hdset_reg_ref_t));
 
     /* allocate the buffer for write the data dataset */
-    buf = HDmalloc(10 * 10 * sizeof(int));
+    buf = (int *)HDmalloc(10 * 10 * sizeof(int));
 
     for(i = 0; i < 10 * 10; i++)
         buf[i] = i;
@@ -7316,7 +7337,7 @@ int test_hyperslab(const char *fname,
         if(make_diffs && i == 512 * 512)
             HDmemset(buf, 0, nelmts);
 
-        hs_start[0] = i * GBLL/(1024*1024);
+        hs_start[0] = (unsigned long long)i * GBLL / (1024 * 1024);
         if (H5Sselect_hyperslab (f_sid,H5S_SELECT_SET,hs_start,NULL,hs_size, NULL) < 0)
             goto out;
 
diff --git a/tools/h5diff/ph5diff_main.c b/tools/h5diff/ph5diff_main.c
index a26b6e9..bfeb408 100644
--- a/tools/h5diff/ph5diff_main.c
+++ b/tools/h5diff/ph5diff_main.c
@@ -5,12 +5,10 @@
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
- * the files COPYING and Copyright.html.  COPYING can be found at the root   *
- * of the source code distribution tree; Copyright.html can be found at the  *
- * root level of an installed copy of the electronic HDF5 document set and   *
- * is linked from the top-level documents page.  It can also be found at     *
- * http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have          *
- * access to either file, you may request a copy from help@hdfgroup.org.     *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <stdlib.h>
diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index a699f00..0a0ee22 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -1,4 +1,4 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -59,19 +59,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -106,15 +109,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index 3c3ad9f..4362711 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -1,4 +1,4 @@
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -59,19 +59,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -106,15 +109,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index 087764a..9ab3204 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -1,5 +1,5 @@
 <-d -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index c31a67e..afe0e72 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -1,5 +1,5 @@
 <-d 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 05318bd..97a1747 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -1,5 +1,5 @@
 <-p -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index fd756b3..78770f0 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -1,5 +1,5 @@
 <-p 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index fd8c680..b2a5881 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -1,5 +1,5 @@
 <-n -4> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index f0d38af..66a3025 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -1,5 +1,5 @@
 <-n 0> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index 4ab66a5..f9258d1 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -1,5 +1,5 @@
 <-n u> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index f5e7ee3..57a4ddd 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -1,5 +1,5 @@
 <-n 0x1> is not a valid option
-usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]] 
+usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   file1             File name of the first HDF5 file
   file2             File name of the second HDF5 file
   [obj1]            Name of an HDF5 object, in absolute path
@@ -60,19 +60,22 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
    -n C, --count=C
          Print differences up to C. C must be a positive integer.
    -d D, --delta=D
-         Print difference if (|a-b| > D). D must be a positive number.
+         Print difference if (|a-b| > D). D must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-p' or '--use-system-epsilon'.
    -p R, --relative=R
-         Print difference if (|(a-b)/b| > R). R must be a positive number.
+         Print difference if (|(a-b)/b| > R). R must be a positive number. Where a
+         is the data point value in file1 and b is the data point value in file2.
          Can not use with '-d' or '--use-system-epsilon'.
    --use-system-epsilon
-         Print difference if (|a-b| > EPSILON), EPSILON is system defined value.
+         Print difference if (|a-b| > EPSILON), EPSILON is system defined value. Where a
+         is the data point value in file1 and b is the data point value in file2.
          If the system epsilon is not defined,one of the following predefined
          values will be used:
            FLT_EPSILON = 1.19209E-07 for floating-point type
            DBL_EPSILON = 2.22045E-16 for double precision type
          Can not use with '-p' or '-d'.
-   --exclude-path "path" 
+   --exclude-path "path"
          Exclude the specified path to an object when comparing files or groups.
          If a group is excluded, all member objects will also be excluded.
          The specified path is excluded wherever it occurs.
@@ -107,15 +110,15 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[ obj2]]
   common objects.
 
  Object comparison:
-  1) Groups 
+  1) Groups
       First compares the names of member objects (relative path, from the
       specified group) and generates a report of objects that appear in only
       one group or in both groups. Common objects are then compared recursively.
-  2) Datasets 
+  2) Datasets
       Array rank and dimensions, datatypes, and data values are compared.
-  3) Datatypes 
+  3) Datatypes
       The comparison is based on the return value of H5Tequal.
-  4) Symbolic links 
+  4) Symbolic links
       The paths to the target objects are compared.
       (The option --follow-symlinks overrides the default behavior when
        symbolic links are compared.).
diff --git a/tools/h5diff/testfiles/h5diff_800.txt b/tools/h5diff/testfiles/h5diff_800.txt
new file mode 100644
index 0000000..e43e7b4
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_800.txt
@@ -0,0 +1,12 @@
+dataset: </g1/array> and </g1/array>
+size:           [2]           [2]
+position        array           array           difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 0 ]          2               0               2              
+[ 0 ]          3               0               3              
+[ 1 ]          4               0               4              
+[ 1 ]          5               0               5              
+[ 1 ]          6               0               6              
+6 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testfiles/h5diff_801.txt b/tools/h5diff/testfiles/h5diff_801.txt
new file mode 100644
index 0000000..043e7e3
--- /dev/null
+++ b/tools/h5diff/testfiles/h5diff_801.txt
@@ -0,0 +1,13 @@
+dataset: </g1/array> and </g1/array>
+Warning: different storage datatype
+size:           [2]           [2]
+position        array           array           difference          
+------------------------------------------------------------
+[ 0 ]          1               0               1              
+[ 0 ]          2               0               2              
+[ 0 ]          3               0               3              
+[ 1 ]          4               0               4              
+[ 1 ]          5               0               5              
+[ 1 ]          6               0               6              
+6 differences found
+EXIT CODE: 1
diff --git a/tools/h5diff/testh5diff.sh.in b/tools/h5diff/testh5diff.sh.in
index b2b0b8c..45a7a45 100644
--- a/tools/h5diff/testh5diff.sh.in
+++ b/tools/h5diff/testh5diff.sh.in
@@ -6,12 +6,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 # Tests for the h5diff tool
 #
@@ -48,8 +46,8 @@ AWK='awk'
 
 nerrors=0
 verbose=yes
-h5haveexitcode=yes	    # default is yes
-pmode=			    # default to run h5diff tests
+h5haveexitcode=yes        # default is yes
+pmode=                # default to run h5diff tests
 mydomainname=`domainname 2>/dev/null`
 
 # source dirs
@@ -460,6 +458,8 @@ TOOLTEST() {
         # Create the expect file if it doesn't yet exist.
         echo " CREATED"
         cp $actual $expect
+        echo "    Expected result (*.ddl) missing"
+        nerrors="`expr $nerrors + 1`"
     elif $CMP $expect $actual; then
         echo " PASSED"
     elif test $h5haveexitcode = 'yes' -a -z "$pmode"; then
diff --git a/tools/h5diff/testph5diff.sh.in b/tools/h5diff/testph5diff.sh.in
index ca212a1..b726a80 100644
--- a/tools/h5diff/testph5diff.sh.in
+++ b/tools/h5diff/testph5diff.sh.in
@@ -6,12 +6,10 @@
 #
 # This file is part of HDF5.  The full HDF5 copyright notice, including
 # terms governing use, modification, and redistribution, is contained in
-# the files COPYING and Copyright.html.  COPYING can be found at the root
-# of the source code distribution tree; Copyright.html can be found at the
-# root level of an installed copy of the electronic HDF5 document set and
-# is linked from the top-level documents page.  It can also be found at
-# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
-# access to either file, you may request a copy from help@hdfgroup.org.
+# the COPYING file, which can be found at the root of the source code
+# distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.
+# If you do not have access to either file, you may request a copy from
+# help@hdfgroup.org.
 #
 
 srcdir=@srcdir@
author	Allen Byrne <byrn@hdfgroup.org>	2017-05-17 20:53:42 (GMT)
committer	Allen Byrne <byrn@hdfgroup.org>	2017-05-17 20:53:42 (GMT)
commit	a466f168515cc377b9bba00abdc0a2a76bd3b507 (patch)
tree	3f62b7d46be02c0137aa26bf6836dc7ced74f164 /tools/h5diff
parent	f5ee10c94f9c178393cca8c560ec73991159aa9f (diff)
download	hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.zip hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.tar.gz hdf5-a466f168515cc377b9bba00abdc0a2a76bd3b507.tar.bz2