Many clang -Wextra-semi-stmt fixes (#2537)

* Adds semicolons to function-like macros
* Adds a do..while(0) loop to some macros
* Removes semicolons when inappropriate, especially H5E_TRY_BEGIN/END

4 files changed, 14 insertions, 14 deletions

diff --git a/testpar/t_file.c b/testpar/t_file.c
index 716379b..9c98e5b 100644
--- a/testpar/t_file.c
+++ b/testpar/t_file.c
@@ -156,7 +156,7 @@ test_page_buffer_access(void)
     {
         file_id = H5Fcreate(filename, H5F_ACC_TRUNC, fcpl, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VRFY((file_id < 0), "H5Fcreate failed");
 
     /* disable collective metadata writes for page buffering to work */
@@ -992,7 +992,7 @@ test_delete(void)
     {
         is_hdf5 = H5Fis_accessible(filename, fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VRFY((is_hdf5 != SUCCEED), "H5Fis_accessible");
 
     /* Release file-access plist */
diff --git a/testpar/t_filters_parallel.c b/testpar/t_filters_parallel.c
index b4a4edb..f6c300a 100644
--- a/testpar/t_filters_parallel.c
+++ b/testpar/t_filters_parallel.c
@@ -3450,7 +3450,7 @@ test_write_cmpd_filtered_dataset_type_conversion_unshared(const char *parent_gro
     {
         VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded");
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Verify space allocation status */
     verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN);
@@ -3649,7 +3649,7 @@ test_write_cmpd_filtered_dataset_type_conversion_shared(const char *parent_group
     {
         VRFY((H5Dwrite(dset_id, memtype, memspace, filespace, dxpl_id, data) < 0), "Dataset write succeeded");
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Verify space allocation status */
     verify_space_alloc_status(dset_id, plist_id, NO_CHUNKS_WRITTEN);
@@ -8281,7 +8281,7 @@ test_fill_value_undefined(const char *parent_group, H5Z_filter_t filter_id, hid_
             VRFY((H5Dread(dset_id, HDF5_DATATYPE_NAME, H5S_ALL, H5S_ALL, dxpl_id, read_buf) < 0),
                  "Dataset read succeeded");
         }
-        H5E_END_TRY;
+        H5E_END_TRY
     }
 
     /*
diff --git a/testpar/t_pflush2.c b/testpar/t_pflush2.c
index 3e42351..0250463 100644
--- a/testpar/t_pflush2.c
+++ b/testpar/t_pflush2.c
@@ -119,7 +119,7 @@ error:
         H5Sclose(sid);
         H5Gclose(gid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end check_test_file() */
 
diff --git a/testpar/t_subfiling_vfd.c b/testpar/t_subfiling_vfd.c
index 0841923..1e094fd 100644
--- a/testpar/t_subfiling_vfd.c
+++ b/testpar/t_subfiling_vfd.c
@@ -210,7 +210,7 @@ test_create_and_close(void)
     {
         H5Fdelete(SUBF_FILENAME, fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
 
@@ -390,7 +390,7 @@ test_config_file(void)
     {
         H5Fdelete(SUBF_FILENAME, fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
 
@@ -603,7 +603,7 @@ test_stripe_sizes(void)
             {
                 H5Fdelete(SUBF_FILENAME, fapl_id);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
 
             VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
         }
@@ -781,7 +781,7 @@ test_stripe_sizes(void)
         {
             H5Fdelete(SUBF_FILENAME, fapl_id);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
 
         HDfree(write_buf);
 
@@ -1193,7 +1193,7 @@ test_read_different_stripe_size(void)
     {
         H5Fdelete(SUBF_FILENAME, fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     VRFY((H5Pclose(dxpl_id) >= 0), "DXPL close succeeded");
     VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
@@ -1395,7 +1395,7 @@ test_subfiling_precreate_rank_0(void)
     {
         H5Fdelete(SUBF_FILENAME, fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
     VRFY((H5Pclose(dxpl_id) >= 0), "DXPL close succeeded");
@@ -1533,7 +1533,7 @@ test_subfiling_write_many_read_one(void)
         {
             H5Fdelete(SUBF_FILENAME, fapl_id);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
 
         VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
     }
@@ -1719,7 +1719,7 @@ test_subfiling_write_many_read_few(void)
         {
             H5Fdelete(SUBF_FILENAME, fapl_id);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
 
         VRFY((H5Pclose(fapl_id) >= 0), "FAPL close succeeded");
     }