Merge Fixes the last of the -Wextra-semi-stmt warnings #3326 (#3338)

1 files changed, 50 insertions, 50 deletions

diff --git a/test/API/tselect.c b/test/API/tselect.c
index fc6a275..49215c2 100644
--- a/test/API/tselect.c
+++ b/test/API/tselect.c
@@ -291,7 +291,7 @@ test_select_hyper(hid_t xfer_plist)
     {
         ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sselect_hyperslab");
 
     /* Test selecting stride<block to verify failure */
@@ -311,7 +311,7 @@ test_select_hyper(hid_t xfer_plist)
     {
         ret = H5Sselect_hyperslab(sid1, H5S_SELECT_SET, start, stride, count, block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sselect_hyperslab");
 
     /* Select 2x15x13 hyperslab for disk dataset */
@@ -354,13 +354,13 @@ test_select_hyper(hid_t xfer_plist)
     {
         ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dwrite");
     H5E_BEGIN_TRY
     {
         ret = H5Dwrite(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dwrite");
 
     /* Close memory dataspace */
@@ -404,13 +404,13 @@ test_select_hyper(hid_t xfer_plist)
     {
         ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dread");
     H5E_BEGIN_TRY
     {
         ret = H5Dread(dataset, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, xfer_plist, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dread");
 
     /* Check that the values match with a dataset iterator */
@@ -1030,7 +1030,7 @@ test_select_all_hyper(hid_t xfer_plist)
     {
         ret = H5Dread(dataset, H5T_NATIVE_UCHAR, sid2, sid1, xfer_plist, rbuf);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Dread");
 
     /* Select entire 15x26 extent for disk dataset */
@@ -5624,14 +5624,14 @@ test_select_hyper_valid_combination(void)
     {
         tmp_sid = H5Scombine_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Scombine_select");
 
     H5E_BEGIN_TRY
     {
         tmp_sid = H5Smodify_select(single_pt_sid, H5S_SELECT_AND, single_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Smodify_select");
 
     /* Test the invalid combination between two hyperslab but of different dimension size */
@@ -5639,14 +5639,14 @@ test_select_hyper_valid_combination(void)
     {
         tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Scombine_select");
 
     H5E_BEGIN_TRY
     {
         tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, regular_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Smodify_select");
 
     /* Test invalid operation inputs to the two functions */
@@ -5654,14 +5654,14 @@ test_select_hyper_valid_combination(void)
     {
         tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Scombine_select");
 
     H5E_BEGIN_TRY
     {
         tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_SET, single_hyper_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Smodify_select");
 
     /* Test inputs in case of non-existent space ids */
@@ -5669,14 +5669,14 @@ test_select_hyper_valid_combination(void)
     {
         tmp_sid = H5Scombine_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Scombine_select");
 
     H5E_BEGIN_TRY
     {
         tmp_sid = H5Smodify_select(single_hyper_sid, H5S_SELECT_AND, non_existent_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(tmp_sid, FAIL, "H5Smodify_select");
 
     /* Close dataspaces */
@@ -6942,14 +6942,14 @@ test_select_valid(void)
     {
         sub_space = H5Screate_simple(2, dims, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(sub_space, FAIL, "H5Screate_simple");
 
     H5E_BEGIN_TRY
     {
         valid = H5Sselect_valid(sub_space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(valid, FAIL, "H5Sselect_valid");
 
     /* Set arrays and dataspace for the rest of the cases */
@@ -6970,7 +6970,7 @@ test_select_valid(void)
     {
         valid = H5Sselect_valid(sub_space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(valid, FAIL, "H5Sselect_valid");
 
     MESSAGE(8, ("Case 3 : in the dimensions\nTry offset (4,4) and size(6,6), the original space is of size "
@@ -8246,7 +8246,7 @@ test_scalar_select2(void)
     {
         ret = H5Sselect_elements(sid, H5S_SELECT_SET, (size_t)1, (const hsize_t *)&coord1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sselect_elements");
 
     /* Select one element in memory with a hyperslab selection */
@@ -8256,7 +8256,7 @@ test_scalar_select2(void)
     {
         ret = H5Sselect_hyperslab(sid, H5S_SELECT_SET, start, NULL, count, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sselect_hyperslab");
 
     /* Select no elements in memory & file with "none" selection */
@@ -13947,7 +13947,7 @@ test_select_bounds(void)
     {
         ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_select_bounds");
 
     /* Set point selection */
@@ -13981,7 +13981,7 @@ test_select_bounds(void)
     {
         ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_select_bounds");
 
     /* Set valid offset for selection */
@@ -14035,7 +14035,7 @@ test_select_bounds(void)
     {
         ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_select_bounds");
 
     /* Set valid offset for selection */
@@ -14089,7 +14089,7 @@ test_select_bounds(void)
     {
         ret = H5Sget_select_bounds(sid, low_bounds, high_bounds);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_select_bounds");
 
     /* Set valid offset for selection */
@@ -14154,7 +14154,7 @@ test_hyper_regular(void)
     {
         is_regular = H5Sis_regular_hyperslab(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
 
     /* Query regular hyperslab selection info (should fail) */
@@ -14162,7 +14162,7 @@ test_hyper_regular(void)
     {
         ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
 
     /* Set 'none' selection */
@@ -14174,7 +14174,7 @@ test_hyper_regular(void)
     {
         is_regular = H5Sis_regular_hyperslab(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
 
     /* Query regular hyperslab selection info (should fail) */
@@ -14182,7 +14182,7 @@ test_hyper_regular(void)
     {
         ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
 
     /* Set point selection */
@@ -14206,7 +14206,7 @@ test_hyper_regular(void)
     {
         is_regular = H5Sis_regular_hyperslab(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(is_regular, FAIL, "H5Sis_regular_hyperslab");
 
     /* Query regular hyperslab selection info (should fail) */
@@ -14214,7 +14214,7 @@ test_hyper_regular(void)
     {
         ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
 
     /* Set "regular" hyperslab selection */
@@ -14272,7 +14272,7 @@ test_hyper_regular(void)
     {
         ret = H5Sget_regular_hyperslab(sid, q_start, q_stride, q_count, q_block);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Sget_regular_hyperslab");
 
     /* 'XOR' in the point again, to remove it, which should make it regular again */
@@ -14735,7 +14735,7 @@ test_hyper_unlim(void)
     {
         ssize_out = H5Sget_select_hyper_nblocks(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ssize_out, (hssize_t)H5S_UNLIMITED, "H5Sget_select_hyper_nblocks");
 
     /* Test H5Sget_select_bounds() */
@@ -15198,19 +15198,19 @@ test_sel_iter(void)
     { /* Bad dataspace ID */
         iter_id = H5Ssel_iter_create(H5I_INVALID_HID, (size_t)1, (unsigned)0);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
     H5E_BEGIN_TRY
     { /* Bad element size */
         iter_id = H5Ssel_iter_create(sid, (size_t)0, (unsigned)0);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
     H5E_BEGIN_TRY
     { /* Bad flag(s) */
         iter_id = H5Ssel_iter_create(sid, (size_t)1, (unsigned)0xffff);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(iter_id, FAIL, "H5Ssel_iter_create");
 
     /* Try closing selection iterator, with bad parameters */
@@ -15218,13 +15218,13 @@ test_sel_iter(void)
     { /* Invalid ID */
         ret = H5Ssel_iter_close(H5I_INVALID_HID);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Ssel_iter_close");
     H5E_BEGIN_TRY
     { /* Not a selection iterator ID */
         ret = H5Ssel_iter_close(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(ret, FAIL, "H5Ssel_iter_close");
 
     /* Try with no selection sharing, and with sharing */
@@ -15248,7 +15248,7 @@ test_sel_iter(void)
         { /* Invalid ID */
             ret = H5Ssel_iter_close(iter_id);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_close");
 
         /* Create selection iterator object */
@@ -15260,13 +15260,13 @@ test_sel_iter(void)
         {
             ret = H5Ssel_iter_reset(H5I_INVALID_HID, sid);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_reset");
         H5E_BEGIN_TRY
         {
             ret = H5Ssel_iter_reset(iter_id, H5I_INVALID_HID);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_reset");
 
         /* Try retrieving sequences, with bad parameters */
@@ -15274,31 +15274,31 @@ test_sel_iter(void)
         { /* Invalid ID */
             ret = H5Ssel_iter_get_seq_list(H5I_INVALID_HID, (size_t)1, (size_t)1, &nseq, &nbytes, off, len);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
         H5E_BEGIN_TRY
         { /* Invalid nseq pointer */
             ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, NULL, &nbytes, off, len);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
         H5E_BEGIN_TRY
         { /* Invalid nbytes pointer */
             ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, NULL, off, len);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
         H5E_BEGIN_TRY
         { /* Invalid offset array */
             ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, NULL, len);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
         H5E_BEGIN_TRY
         { /* Invalid length array */
             ret = H5Ssel_iter_get_seq_list(iter_id, (size_t)1, (size_t)1, &nseq, &nbytes, off, NULL);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         VERIFY(ret, FAIL, "H5Ssel_iter_get_seq_list");
 
         /* Close selection iterator */
@@ -15722,31 +15722,31 @@ test_select_intersect_block(void)
     { /* Bad dataspace ID */
         status = H5Sselect_intersect_block(H5I_INVALID_HID, block_start, block_end);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(status, FAIL, "H5Sselect_intersect_block");
     H5E_BEGIN_TRY
     { /* Bad start pointer */
         status = H5Sselect_intersect_block(sid, NULL, block_end);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(status, FAIL, "H5Sselect_intersect_block");
     H5E_BEGIN_TRY
     { /* Bad end pointer */
         status = H5Sselect_intersect_block(sid, block_start, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(status, FAIL, "H5Sselect_intersect_block");
     H5E_BEGIN_TRY
     { /* Invalid block */
         status = H5Sselect_intersect_block(sid, block_start, block_end2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(status, FAIL, "H5Sselect_intersect_block");
     H5E_BEGIN_TRY
     { /* Another invalid block */
         status = H5Sselect_intersect_block(sid, block_start, block_end3);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     VERIFY(status, FAIL, "H5Sselect_intersect_block");
 
     /* Set selection to 'none' */