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

1 files changed, 23 insertions, 23 deletions

diff --git a/test/external.c b/test/external.c
index d0d7f60..bca7da1 100644
--- a/test/external.c
+++ b/test/external.c
@@ -137,7 +137,7 @@ test_non_extendible(hid_t file)
     {
         dset_addr = H5Dget_offset(dset);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset_addr != HADDR_UNDEF)
         FAIL_STACK_ERROR;
 
@@ -184,7 +184,7 @@ error:
         H5Sclose(space);
         H5Dclose(dset);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_non_extendible() */
 
@@ -225,7 +225,7 @@ test_too_small(hid_t file)
     {
         dset = H5Dcreate2(file, "dset2", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external file succeeded instead of failing.");
     if (H5Sclose(space) < 0)
@@ -243,7 +243,7 @@ error:
         H5Pclose(dcpl);
         H5Dclose(dset);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_too_small() */
 
@@ -299,7 +299,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_large_enough_current_eventual() */
 
@@ -340,7 +340,7 @@ test_large_enough_current_not_eventual(hid_t file)
     {
         dset = H5Dcreate2(file, "dset4", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external file succeeded instead of failing.");
 
@@ -359,7 +359,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_large_enough_current_not_eventual() */
 
@@ -452,7 +452,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_unlimited() */
 
@@ -558,7 +558,7 @@ test_multiple_files(hid_t file)
     {
         dset = H5Dcreate2(file, "dset7", H5T_NATIVE_INT, space, H5P_DEFAULT, dcpl, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset >= 0)
         FAIL_PUTS_ERROR("    Small external files succeeded instead of failing.");
 
@@ -577,7 +577,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_multiple_files() */
 
@@ -613,7 +613,7 @@ test_add_to_unlimited(void)
     {
         status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0)
         FAIL_PUTS_ERROR("    H5Pset_external() succeeded when it should have failed.");
 
@@ -632,7 +632,7 @@ error:
     {
         H5Pclose(dcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_add_to_unlimited() */
 
@@ -667,7 +667,7 @@ test_overflow(void)
     {
         status = H5Pset_external(dcpl, "ext2.data", (off_t)0, (hsize_t)100);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0)
         FAIL_PUTS_ERROR("    H5Pset_external() succeeded when it should have failed.");
 
@@ -682,7 +682,7 @@ error:
     {
         H5Pclose(dcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_overflow() */
 
@@ -807,7 +807,7 @@ error:
         H5Sclose(hs_space);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_read_file_set() */
 
@@ -933,7 +933,7 @@ error:
         H5Sclose(file_space);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_write_file_set() */
 
@@ -1030,7 +1030,7 @@ error:
         H5Pclose(dcpl);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_path_absolute() */
 
@@ -1120,7 +1120,7 @@ error:
         H5Sclose(space);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_path_relative() */
 
@@ -1213,7 +1213,7 @@ test_path_relative_cwd(hid_t fapl)
     {
         dset3 = H5Dopen2(file, "dset1", dapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset3 >= 0)
         FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded");
 
@@ -1250,7 +1250,7 @@ test_path_relative_cwd(hid_t fapl)
     {
         dset3 = H5Dopen2(file, "dset1", dapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dset3 >= 0)
         FAIL_PUTS_ERROR("reopening the dataset with a different efile_prefix succeeded");
 
@@ -1291,7 +1291,7 @@ error:
         H5Sclose(space);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_path_relative_cwd() */
 
@@ -1396,7 +1396,7 @@ error:
         H5Sclose(sid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_h5d_get_access_plist() */
 
@@ -1525,7 +1525,7 @@ error:
         H5Pclose(fapl_id_new);
         H5Gclose(gid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     nerrors = MAX(1, nerrors);
     HDprintf("%d TEST%s FAILED.\n", nerrors, 1 == nerrors ? "" : "s");
     return EXIT_FAILURE;