Merge pull request #524 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8

* commit '7557384b9b60c2561a2eb5b08027f59737cb49c7':
  Correct name of reference file to be copied
  HDFFV-10186 new testfile
  Correct statement order
  HDFFV-9055 add new test file
  Tools merge from develop-1.10

6 files changed, 40 insertions, 40 deletions

diff --git a/tools/h5import/CMakeTests.cmake b/tools/h5import/CMakeTests.cmake
index bfc5ef8..84d1190 100644
--- a/tools/h5import/CMakeTests.cmake
+++ b/tools/h5import/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.
+#
 
 ##############################################################################
 ##############################################################################
diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am
index af60478..3f75bdc 100644
--- a/tools/h5import/Makefile.am
+++ b/tools/h5import/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/h5import/h5import.c b/tools/h5import/h5import.c
index d1aab0c..c71aeef 100644
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.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 "hdf5.h"
diff --git a/tools/h5import/h5import.h b/tools/h5import/h5import.h
index c242483..c69a542 100644
--- a/tools/h5import/h5import.h
+++ b/tools/h5import/h5import.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
diff --git a/tools/h5import/h5importtest.c b/tools/h5import/h5importtest.c
index ac839fb..135b8e4 100644
--- a/tools/h5import/h5importtest.c
+++ b/tools/h5import/h5importtest.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>
@@ -119,8 +117,8 @@ main(void)
 #ifdef H5_SIZEOF_LONG_LONG
         row4i64[i] = row4i64[i - 1] + rowi4i64;
 #endif
-        row4i16[i] = row4i16[i - 1] + rowi4i16;
-        row4i8[i] = row4i8[i - 1] + rowi4i8;
+        row4i16[i] = (short)(row4i16[i - 1] + rowi4i16);
+        row4i8[i] = (char)(row4i8[i - 1] + rowi4i8);
     }
 
     for (j = 1; j < ncol; j++)
@@ -131,8 +129,8 @@ main(void)
 #ifdef H5_SIZEOF_LONG_LONG
         col4i64[j] = col4i64[j - 1] + coli4i64;
 #endif
-        col4i16[j] = col4i16[j - 1] + coli4i16;
-        col4i8[j] = col4i8[j - 1] + coli4i8;
+        col4i16[j] = (short)(col4i16[j - 1] + coli4i16);
+        col4i8[j] = (char)(col4i8[j - 1] + coli4i8);
     }
     for (k = 1; k < npln; k++)
     {
@@ -142,8 +140,8 @@ main(void)
 #ifdef H5_SIZEOF_LONG_LONG
         pln4i64[k] = pln4i64[k - 1] + plni4i64;
 #endif
-        pln4i16[k] = pln4i16[k - 1] + plni4i16;
-        pln4i8[k] = pln4i8[k - 1] + plni4i8;
+        pln4i16[k] = (short)(pln4i16[k - 1] + plni4i16);
+        pln4i8[k] = (char)(pln4i8[k - 1] + plni4i8);
     }
 
     /*
@@ -157,8 +155,8 @@ main(void)
             for (k = 0; k < npln; k++) {
                 b64r3[k][i][j] = row8[i] + col8[j] + pln8[k];
                 b32i3[k][i][j] = row4i[i] + col4i[j] + pln4i[k];
-                b16i3[k][i][j] = row4i16[i] + col4i16[j] + pln4i16[k];
-                b8i3[k][i][j] = row4i8[i] + col4i8[j] + pln4i8[k];
+                b16i3[k][i][j] = (short)(row4i16[i] + col4i16[j] + pln4i16[k]);
+                b8i3[k][i][j] = (char)(row4i8[i] + col4i8[j] + pln4i8[k]);
             }
 
 
diff --git a/tools/h5import/h5importtestutil.sh.in b/tools/h5import/h5importtestutil.sh.in
index 6e747e7..b724957 100644
--- a/tools/h5import/h5importtestutil.sh.in
+++ b/tools/h5import/h5importtestutil.sh.in
@@ -6,15 +6,12 @@
 #
 # 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.
 #
-# HDF Utilities Test script
-# Usage: h5importtestutil.sh [machine-type]
+# Tests for the  h5import tool
 
 srcdir=@srcdir@