Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 68 insertions, 95 deletions

diff --git a/test/vds_swmr_gen.c b/test/vds_swmr_gen.c
index 2589653..3ea05d7 100644
--- a/test/vds_swmr_gen.c
+++ b/test/vds_swmr_gen.c
@@ -6,7 +6,7 @@
  * 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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -15,22 +15,16 @@
 #include "vds_swmr.h"
 
 /* Max number of planes in the dataset */
-#define N_MAX_PLANES   H5S_UNLIMITED
+#define N_MAX_PLANES H5S_UNLIMITED
 
 /* Dataset datatypes */
-#define SOURCE_DATATYPE    H5T_STD_I32LE
-#define VDS_DATATYPE       H5T_STD_I32LE
+#define SOURCE_DATATYPE H5T_STD_I32LE
+#define VDS_DATATYPE    H5T_STD_I32LE
 
 /* Starting size of datasets, both source and VDS */
-static hsize_t DIMS[N_SOURCES][RANK] = {
-    {0, SM_HEIGHT, WIDTH},
-    {0, LG_HEIGHT, WIDTH},
-    {0, SM_HEIGHT, WIDTH},
-    {0, LG_HEIGHT, WIDTH},
-    {0, SM_HEIGHT, WIDTH},
-    {0, LG_HEIGHT, WIDTH}
-};
-static hsize_t VDS_DIMS[RANK] = {0, FULL_HEIGHT, WIDTH};
+static hsize_t DIMS[N_SOURCES][RANK] = {{0, SM_HEIGHT, WIDTH}, {0, LG_HEIGHT, WIDTH}, {0, SM_HEIGHT, WIDTH},
+                                        {0, LG_HEIGHT, WIDTH}, {0, SM_HEIGHT, WIDTH}, {0, LG_HEIGHT, WIDTH}};
+static hsize_t VDS_DIMS[RANK]        = {0, FULL_HEIGHT, WIDTH};
 
 /* Maximum size of datasets, both source and VDS.
  * NOTE: Theoretical (i.e.: H5S_UNLIMITED), not the actual max
@@ -38,47 +32,34 @@ static hsize_t VDS_DIMS[RANK] = {0, FULL_HEIGHT, WIDTH};
  * That number is specified separately.
  */
 static hsize_t MAX_DIMS[N_SOURCES][RANK] = {
-    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
-    {N_MAX_PLANES, LG_HEIGHT, WIDTH},
-    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
-    {N_MAX_PLANES, LG_HEIGHT, WIDTH},
-    {N_MAX_PLANES, SM_HEIGHT, WIDTH},
-    {N_MAX_PLANES, LG_HEIGHT, WIDTH}
-};
+    {N_MAX_PLANES, SM_HEIGHT, WIDTH}, {N_MAX_PLANES, LG_HEIGHT, WIDTH}, {N_MAX_PLANES, SM_HEIGHT, WIDTH},
+    {N_MAX_PLANES, LG_HEIGHT, WIDTH}, {N_MAX_PLANES, SM_HEIGHT, WIDTH}, {N_MAX_PLANES, LG_HEIGHT, WIDTH}};
 static hsize_t VDS_MAX_DIMS[RANK] = {N_MAX_PLANES, FULL_HEIGHT, WIDTH};
 
 static char SOURCE_DSET_NAME[NAME_LEN] = "source_dset";
 
-static int32_t FILL_VALUES[N_SOURCES] = {
-    -1,
-    -2,
-    -3,
-    -4,
-    -5,
-    -6
-};
+static int32_t FILL_VALUES[N_SOURCES] = {-1, -2, -3, -4, -5, -6};
 
 static int32_t VDS_FILL_VALUE = -9;
 
 int
 main(void)
 {
-    hid_t faplid        = -1;   /* file access property list ID (all files) */
+    hid_t faplid = -1; /* file access property list ID (all files) */
 
-    hid_t src_sid       = -1;   /* source dataset's dataspace ID            */
-    hid_t src_dcplid    = -1;   /* source dataset property list ID          */
+    hid_t src_sid    = -1; /* source dataset's dataspace ID            */
+    hid_t src_dcplid = -1; /* source dataset property list ID          */
 
-    hid_t vds_sid       = -1;   /* VDS dataspace ID                         */
-    hid_t vds_dcplid    = -1;   /* VDS dataset property list ID             */
+    hid_t vds_sid    = -1; /* VDS dataspace ID                         */
+    hid_t vds_dcplid = -1; /* VDS dataset property list ID             */
 
-    hid_t fid           = -1;   /* HDF5 file ID                             */
-    hid_t did           = -1;   /* dataset ID                               */
+    hid_t fid = -1; /* HDF5 file ID                             */
+    hid_t did = -1; /* dataset ID                               */
 
-    hsize_t start[RANK];        /* starting point for hyperslab             */
-    int map_start       = -1;   /* starting point in the VDS map            */
-
-    int i;                      /* iterator                         */
+    hsize_t start[RANK];    /* starting point for hyperslab             */
+    int     map_start = -1; /* starting point in the VDS map            */
 
+    int i; /* iterator                         */
 
     /* Start by creating the virtual dataset (VDS) dataspace and creation
      * property list. The individual source datasets are then created
@@ -86,137 +67,129 @@ main(void)
      */
 
     /* Create VDS dcpl */
-    if((vds_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+    if ((vds_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
         TEST_ERROR
-    if(H5Pset_fill_value(vds_dcplid, VDS_DATATYPE,
-                &VDS_FILL_VALUE) < 0)
+    if (H5Pset_fill_value(vds_dcplid, VDS_DATATYPE, &VDS_FILL_VALUE) < 0)
         TEST_ERROR
 
     /* Create VDS dataspace */
-    if((vds_sid = H5Screate_simple(RANK, VDS_DIMS,
-                    VDS_MAX_DIMS)) < 0)
+    if ((vds_sid = H5Screate_simple(RANK, VDS_DIMS, VDS_MAX_DIMS)) < 0)
         TEST_ERROR
 
     /************************************
      * Create source files and datasets *
      ************************************/
 
-    start[0] = 0;
-    start[1] = 0;
-    start[2] = 0;
+    start[0]  = 0;
+    start[1]  = 0;
+    start[2]  = 0;
     map_start = 0;
 
     /* All SWMR files need to use the latest file format */
-    if((faplid = h5_fileaccess()) < 0)
+    if ((faplid = h5_fileaccess()) < 0)
         TEST_ERROR
-    if(H5Pset_libver_bounds(faplid, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
+    if (H5Pset_libver_bounds(faplid, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST) < 0)
         TEST_ERROR
 
-    for(i = 0; i < N_SOURCES; i++) {
+    for (i = 0; i < N_SOURCES; i++) {
 
         /* source dataset dcpl */
-        if((src_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
+        if ((src_dcplid = H5Pcreate(H5P_DATASET_CREATE)) < 0)
             TEST_ERROR
-        if(H5Pset_chunk(src_dcplid, RANK, PLANES[i]) < 0)
+        if (H5Pset_chunk(src_dcplid, RANK, PLANES[i]) < 0)
             TEST_ERROR
-        if(H5Pset_fill_value(src_dcplid, SOURCE_DATATYPE,
-                    &FILL_VALUES[i]) < 0)
+        if (H5Pset_fill_value(src_dcplid, SOURCE_DATATYPE, &FILL_VALUES[i]) < 0)
             TEST_ERROR
 
         /* Use a mix of compressed and uncompressed datasets */
-        if(0 != i % 2)
-            if(H5Pset_deflate(src_dcplid, COMPRESSION_LEVEL) < 0)
+        if (0 != i % 2)
+            if (H5Pset_deflate(src_dcplid, COMPRESSION_LEVEL) < 0)
                 TEST_ERROR
 
         /* Create source file, dataspace, and dataset */
-        if((fid = H5Fcreate(FILE_NAMES[i], H5F_ACC_TRUNC,
-                        H5P_DEFAULT, faplid)) < 0)
+        if ((fid = H5Fcreate(FILE_NAMES[i], H5F_ACC_TRUNC, H5P_DEFAULT, faplid)) < 0)
             TEST_ERROR
-        if((src_sid = H5Screate_simple(RANK, DIMS[i],
-                        MAX_DIMS[i])) < 0)
+        if ((src_sid = H5Screate_simple(RANK, DIMS[i], MAX_DIMS[i])) < 0)
             TEST_ERROR
-        if((did = H5Dcreate2(fid, SOURCE_DSET_NAME,
-                        SOURCE_DATATYPE, src_sid,
-                        H5P_DEFAULT, src_dcplid, H5P_DEFAULT)) < 0)
+        if ((did = H5Dcreate2(fid, SOURCE_DSET_NAME, SOURCE_DATATYPE, src_sid, H5P_DEFAULT, src_dcplid,
+                              H5P_DEFAULT)) < 0)
             TEST_ERROR
 
         /* set up hyperslabs for source and destination datasets */
         start[1] = 0;
-        if(H5Sselect_hyperslab(src_sid, H5S_SELECT_SET, start, NULL,
-                    MAX_DIMS[i], NULL) < 0)
+        if (H5Sselect_hyperslab(src_sid, H5S_SELECT_SET, start, NULL, MAX_DIMS[i], NULL) < 0)
+            TEST_ERROR
+        start[1] = (hsize_t)map_start;
+        if (H5Sselect_hyperslab(vds_sid, H5S_SELECT_SET, start, NULL, MAX_DIMS[i], NULL) < 0)
             TEST_ERROR
-        start[1] = map_start;
-        if(H5Sselect_hyperslab(vds_sid, H5S_SELECT_SET, start, NULL,
-                    MAX_DIMS[i], NULL) < 0)
+        if (PLANES[i][1] > INT_MAX)
             TEST_ERROR
-        map_start += PLANES[i][1];
+        map_start += (int)PLANES[i][1];
 
         /* Add VDS mapping */
-        if(H5Pset_virtual(vds_dcplid, vds_sid, FILE_NAMES[i],
-                    SOURCE_DSET_PATH, src_sid) < 0)
+        if (H5Pset_virtual(vds_dcplid, vds_sid, FILE_NAMES[i], SOURCE_DSET_PATH, src_sid) < 0)
             TEST_ERROR
 
         /* close */
-        if(H5Sclose(src_sid) < 0)
+        if (H5Sclose(src_sid) < 0)
             TEST_ERROR
-        if(H5Pclose(src_dcplid) < 0)
+        if (H5Pclose(src_dcplid) < 0)
             TEST_ERROR
-        if(H5Dclose(did) < 0)
+        if (H5Dclose(did) < 0)
             TEST_ERROR
-        if(H5Fclose(fid) < 0)
+        if (H5Fclose(fid) < 0)
             TEST_ERROR
 
     } /* end for */
 
-
     /*******************
      * Create VDS file *
      *******************/
 
     /* file */
-    if((fid = H5Fcreate(VDS_FILE_NAME, H5F_ACC_TRUNC,
-                    H5P_DEFAULT, faplid)) < 0)
+    if ((fid = H5Fcreate(VDS_FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, faplid)) < 0)
         TEST_ERROR
 
     /* dataset */
-    if((did = H5Dcreate2(fid, VDS_DSET_NAME, VDS_DATATYPE, vds_sid,
-                    H5P_DEFAULT, vds_dcplid, H5P_DEFAULT)) < 0)
+    if ((did = H5Dcreate2(fid, VDS_DSET_NAME, VDS_DATATYPE, vds_sid, H5P_DEFAULT, vds_dcplid, H5P_DEFAULT)) <
+        0)
         TEST_ERROR
 
     /* close */
-    if(H5Pclose(faplid) < 0)
+    if (H5Pclose(faplid) < 0)
         TEST_ERROR
-    if(H5Pclose(vds_dcplid) < 0)
+    if (H5Pclose(vds_dcplid) < 0)
         TEST_ERROR
-    if(H5Sclose(vds_sid) < 0)
+    if (H5Sclose(vds_sid) < 0)
         TEST_ERROR
-    if(H5Dclose(did) < 0)
+    if (H5Dclose(did) < 0)
         TEST_ERROR
-    if(H5Fclose(fid) < 0)
+    if (H5Fclose(fid) < 0)
         TEST_ERROR
 
     return EXIT_SUCCESS;
 
 error:
 
-    H5E_BEGIN_TRY {
-        if(faplid >= 0)
+    H5E_BEGIN_TRY
+    {
+        if (faplid >= 0)
             (void)H5Pclose(faplid);
-        if(src_sid >= 0)
+        if (src_sid >= 0)
             (void)H5Sclose(src_sid);
-        if(src_dcplid >= 0)
+        if (src_dcplid >= 0)
             (void)H5Pclose(src_dcplid);
-        if(vds_sid >= 0)
+        if (vds_sid >= 0)
             (void)H5Sclose(vds_sid);
-        if(vds_dcplid >= 0)
+        if (vds_dcplid >= 0)
             (void)H5Pclose(vds_dcplid);
-        if(fid >= 0)
+        if (fid >= 0)
             (void)H5Fclose(fid);
-        if(did >= 0)
+        if (did >= 0)
             (void)H5Dclose(did);
-    } H5E_END_TRY
+    }
+    H5E_END_TRY
 
     return EXIT_FAILURE;
 
 } /* end main */
-