Merge remote-tracking branch 'origin/hdf5_1_12_1' into 1.12/master forhdf5-1_12_1

HDF5 1.12.1 release.

1 files changed, 70 insertions, 40 deletions

diff --git a/test/extend.c b/test/extend.c
index 43fa076..2583de9 100644
--- a/test/extend.c
+++ b/test/extend.c
@@ -6,13 +6,13 @@
  * 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.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /*
- * Programmer:  Robb Matzke <matzke@llnl.gov>
+ * Programmer:  Robb Matzke
  *              Friday, January 30, 1998
  *
  * Purpose:	Tests extendible datasets.
@@ -22,11 +22,16 @@
 
 const char *FILENAME[] = {"extend", NULL};
 
-#define NX 100 /* USE AN EVEN NUMBER!*/
-#define NY 100 /* USE AN EVEN NUMBER!*/
+#define N1X 100 /* USE AN EVEN NUMBER! */
+#define N1Y 100 /* USE AN EVEN NUMBER! */
+#define N2X (N1X / 2)
+#define N2Y (N1Y / 2)
 
 /* Data buffers */
-static int buf1[NY][NX], buf2[NX / 2][NY / 2];
+static int **buf1      = NULL;
+static int * buf1_data = NULL;
+static int **buf2      = NULL;
+static int * buf2_data = NULL;
 
 /*-------------------------------------------------------------------------
  * Function:	write_data
@@ -45,8 +50,8 @@ static int
 write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t mem_space)
 {
     hid_t                dataset, file_space, half_space;
-    static const hsize_t dims[2]      = {NX, NY};
-    static const hsize_t half_dims[2] = {NX / 2, NY / 2};
+    static const hsize_t dims[2]      = {N1X, N1Y};
+    static const hsize_t half_dims[2] = {N2X, N2Y};
     hsize_t              size[2];
     hsize_t              max_size[2] = {0, 0};
     hsize_t              offset[2];
@@ -63,10 +68,10 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
         for (j = 0; j < 5; j++) {
 
             /* Extend the dataset */
-            offset[0] = (hsize_t)(i * NX);
-            offset[1] = (hsize_t)(j * NY);
-            size[0]   = offset[0] + NX;
-            size[1]   = offset[1] + NY;
+            offset[0] = (hsize_t)(i * N1X);
+            offset[1] = (hsize_t)(j * N1Y);
+            size[0]   = offset[0] + N1X;
+            size[1]   = offset[1] + N1Y;
             if (size[0] > max_size[0] || size[1] > max_size[1]) {
                 if (size[0] > max_size[0])
                     max_size[0] = size[0];
@@ -83,7 +88,7 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
                 TEST_ERROR;
 
             /* Write to the hyperslab */
-            if (H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1) < 0)
+            if (H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1_data) < 0)
                 TEST_ERROR;
             if (H5Sclose(file_space) < 0)
                 TEST_ERROR;
@@ -98,23 +103,23 @@ write_data(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t me
         for (j = 0; j < 10; j++) {
 
             /* Select a hyperslab */
-            offset[0] = (hsize_t)(i * (NX / 2));
-            offset[1] = (hsize_t)(j * (NY / 2));
+            offset[0] = (hsize_t)(i * N2X);
+            offset[1] = (hsize_t)(j * N2Y);
             if (H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, half_dims, NULL) < 0)
                 TEST_ERROR;
 
             /* Read */
-            if (H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2) < 0)
+            if (H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2_data) < 0)
                 TEST_ERROR;
 
             /* Compare */
-            for (k = 0; k < (NX / 2); k++)
-                for (m = 0; m < (NY / 2); m++)
-                    if (buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
+            for (k = 0; k < N2X; k++)
+                for (m = 0; m < N2Y; m++)
+                    if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) {
                         HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
                         HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m,
-                                 buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
+                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
+                                 buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
                         TEST_ERROR;
                     } /* end if */
         }             /* end for */
@@ -155,8 +160,8 @@ static int
 write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, hid_t mem_space)
 {
     hid_t                dataset, file_space, half_space;
-    static const hsize_t dims[2]      = {NX, NY};
-    static const hsize_t half_dims[2] = {NX / 2, NY / 2};
+    static const hsize_t dims[2]      = {N1X, N1Y};
+    static const hsize_t half_dims[2] = {N2X, N2Y};
     static hsize_t       size[2];
     hsize_t              offset[2];
     int                  i, j, k, m;
@@ -172,10 +177,10 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h
         for (j = 0; j < 5; j++) {
 
             /* Extend the dataset */
-            offset[0] = (hsize_t)(i * NX);
-            offset[1] = (hsize_t)(j * NY);
-            size[0]   = offset[0] + NX;
-            size[1]   = offset[1] + NY;
+            offset[0] = (hsize_t)(i * N1X);
+            offset[1] = (hsize_t)(j * N1Y);
+            size[0]   = offset[0] + N1X;
+            size[1]   = offset[1] + N1Y;
             if (H5Dextend(dataset, size) < 0)
                 TEST_ERROR;
 
@@ -186,7 +191,7 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h
                 TEST_ERROR;
 
             /* Write to the hyperslab */
-            if (H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1) < 0)
+            if (H5Dwrite(dataset, H5T_NATIVE_INT, mem_space, file_space, H5P_DEFAULT, buf1_data) < 0)
                 TEST_ERROR;
             if (H5Sclose(file_space) < 0)
                 TEST_ERROR;
@@ -201,23 +206,23 @@ write_data_deprec(const char *msg, hid_t file, const char *name, hid_t cparms, h
         for (j = 0; j < 10; j++) {
 
             /* Select a hyperslab */
-            offset[0] = (hsize_t)(i * (NX / 2));
-            offset[1] = (hsize_t)(j * (NY / 2));
+            offset[0] = (hsize_t)(i * N2X);
+            offset[1] = (hsize_t)(j * N2Y);
             if (H5Sselect_hyperslab(file_space, H5S_SELECT_SET, offset, NULL, half_dims, NULL) < 0)
                 TEST_ERROR;
 
             /* Read */
-            if (H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2) < 0)
+            if (H5Dread(dataset, H5T_NATIVE_INT, half_space, file_space, H5P_DEFAULT, buf2_data) < 0)
                 TEST_ERROR;
 
             /* Compare */
-            for (k = 0; k < (NX / 2); k++)
-                for (m = 0; m < (NY / 2); m++)
-                    if (buf2[k][m] != buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]) {
+            for (k = 0; k < N2X; k++)
+                for (m = 0; m < N2Y; m++)
+                    if (buf2[k][m] != buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]) {
                         HDprintf("    i=%d, j=%d, k=%d, m=%d\n", i, j, k, m);
                         HDprintf("    buf2[%d][%d]=%d\n", k, m, buf2[k][m]);
-                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * (NX / 2) + k, (j % 2) * (NY / 2) + m,
-                                 buf1[(i % 2) * (NX / 2) + k][(j % 2) * (NY / 2) + m]);
+                        HDprintf("    buf1[%d][%d]=%d\n", (i % 2) * N2X + k, (j % 2) * N2Y + m,
+                                 buf1[(i % 2) * N2X + k][(j % 2) * N2Y + m]);
                         TEST_ERROR;
                     } /* end if */
         }             /* end for */
@@ -257,8 +262,8 @@ main(void)
     hid_t                file, mem_space, cparms;
     hid_t                fapl;
     int                  nerrors       = 0;
-    static const hsize_t dims[2]       = {NX, NY};
-    static const hsize_t chunk_dims[2] = {NX / 2, NY / 2};
+    static const hsize_t dims[2]       = {N1X, N1Y};
+    static const hsize_t chunk_dims[2] = {N2X, N2Y};
     static hsize_t       maxdims[2]    = {H5S_UNLIMITED, H5S_UNLIMITED};
     char                 filename[1024];
     int                  i, j;
@@ -267,9 +272,23 @@ main(void)
     fapl = h5_fileaccess();
 
     /* Initialize buffer and space */
-    for (i = 0; i < NX; i++)
-        for (j = 0; j < NY; j++)
-            buf1[i][j] = i * NY + j;
+    if (NULL == (buf1_data = (int *)HDcalloc(N1X * N1Y, sizeof(int))))
+        TEST_ERROR;
+    if (NULL == (buf1 = (int **)HDcalloc(N1X, sizeof(buf1_data))))
+        TEST_ERROR;
+    for (i = 0; i < N1X; i++)
+        buf1[i] = buf1_data + (i * N1Y);
+
+    if (NULL == (buf2_data = (int *)HDcalloc(N2X * N2Y, sizeof(int))))
+        TEST_ERROR;
+    if (NULL == (buf2 = (int **)HDcalloc(N2X, sizeof(buf2_data))))
+        TEST_ERROR;
+    for (i = 0; i < N2X; i++)
+        buf2[i] = buf2_data + (i * N2Y);
+
+    for (i = 0; i < N1X; i++)
+        for (j = 0; j < N1Y; j++)
+            buf1[i][j] = i * N1Y + j;
 
     if ((mem_space = H5Screate_simple(2, dims, maxdims)) < 0)
         TEST_ERROR;
@@ -327,9 +346,20 @@ main(void)
     HDprintf("All extend tests passed.\n");
     h5_cleanup(FILENAME, fapl);
 
+    HDfree(buf1);
+    HDfree(buf1_data);
+    HDfree(buf2);
+    HDfree(buf2_data);
+
     HDexit(EXIT_SUCCESS);
 
 error:
+
+    HDfree(buf1);
+    HDfree(buf1_data);
+    HDfree(buf2);
+    HDfree(buf2_data);
+
     HDprintf("*** One or more extend tests failed ***\n");
     HDexit(EXIT_FAILURE);
 } /* end main() */