h5test.h testing macros get enclosed in do..while loops (#1721)

* h5test.h testing macros get enclosed in do..while loops

* Adds missed macro in hl C++ code

* Fixes macro in Windows code

1 files changed, 27 insertions, 27 deletions

diff --git a/test/vds_swmr_reader.c b/test/vds_swmr_reader.c
index e16707f..727cd80 100644
--- a/test/vds_swmr_reader.c
+++ b/test/vds_swmr_reader.c
@@ -37,60 +37,60 @@ main(void)
 
     /* Open the VDS file and dataset */
     if ((faplid = h5_fileaccess()) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if ((fid = H5Fopen(VDS_FILE_NAME, H5F_ACC_RDONLY | H5F_ACC_SWMR_READ, faplid)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if ((did = H5Dopen2(fid, VDS_DSET_NAME, H5P_DEFAULT)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Create the read buffer */
     if (VDS_PLANE[1] * VDS_PLANE[2] > INT_MAX)
-        TEST_ERROR
+        TEST_ERROR;
     n_elements = (int)(VDS_PLANE[1] * VDS_PLANE[2]);
     size       = (size_t)n_elements * sizeof(int);
     if (NULL == (buffer = (int *)HDmalloc(size)))
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Create memory dataspace */
     if ((msid = H5Screate_simple(RANK, VDS_PLANE, NULL)) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     /* Read data until the dataset is full (via the writer) */
     do {
 
         /* Refresh metadata */
         if (H5Drefresh(did) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Get the dataset dimensions */
         if ((fsid = H5Dget_space(did)) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sget_simple_extent_dims(fsid, dims, max_dims) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Check the reported size of the VDS */
         if ((n_dims = H5Sget_simple_extent_ndims(fsid)) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (n_dims != RANK)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sget_simple_extent_dims(fsid, dims, max_dims) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         /* NOTE: Don't care what dims[0] is. */
         if (dims[1] != FULL_HEIGHT)
-            TEST_ERROR
+            TEST_ERROR;
         if (dims[2] != WIDTH)
-            TEST_ERROR
+            TEST_ERROR;
         if (max_dims[0] != H5S_UNLIMITED)
-            TEST_ERROR
+            TEST_ERROR;
         if (max_dims[1] != FULL_HEIGHT)
-            TEST_ERROR
+            TEST_ERROR;
         if (max_dims[2] != WIDTH)
-            TEST_ERROR
+            TEST_ERROR;
 
         /* Continue if there's nothing to read */
         if (0 == dims[0]) {
             if (H5Sclose(fsid) < 0)
-                TEST_ERROR
+                TEST_ERROR;
             continue;
         }
 
@@ -100,23 +100,23 @@ main(void)
         start[1] = 0;
         start[2] = 0;
         if (H5Sselect_hyperslab(fsid, H5S_SELECT_SET, start, NULL, VDS_PLANE, NULL) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Dread(did, H5T_NATIVE_INT, msid, fsid, H5P_DEFAULT, buffer) < 0)
-            TEST_ERROR
+            TEST_ERROR;
         if (H5Sclose(fsid) < 0)
-            TEST_ERROR
+            TEST_ERROR;
 
     } while (dims[0] < N_PLANES_TO_WRITE);
 
     /* Close file and dataset */
     if (H5Pclose(faplid) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Sclose(msid) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Dclose(did) < 0)
-        TEST_ERROR
+        TEST_ERROR;
     if (H5Fclose(fid) < 0)
-        TEST_ERROR
+        TEST_ERROR;
 
     HDfree(buffer);
 
@@ -137,11 +137,11 @@ error:
             (void)H5Sclose(msid);
         if (fsid >= 0)
             (void)H5Sclose(fsid);
-        if (buffer != NULL)
-            HDfree(buffer);
     }
     H5E_END_TRY
 
+    HDfree(buffer);
+
     HDfprintf(stderr, "ERROR: SWMR reader exited with errors\n");
     return EXIT_FAILURE;