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, 107 insertions, 107 deletions

diff --git a/test/fheap.c b/test/fheap.c
index bcf1ab0..f256ec9 100644
--- a/test/fheap.c
+++ b/test/fheap.c
@@ -1905,7 +1905,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_create() */
 
@@ -2058,7 +2058,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_reopen() */
 
@@ -2235,7 +2235,7 @@ error:
         H5Fclose(file);
         H5Fclose(file2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return 1;
 } /* test_open_twice() */
@@ -2338,7 +2338,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     {
         fh2 = H5HF_open(f, fh_addr);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (fh2) {
         /* Close opened heap */
         H5HF_close(fh2);
@@ -2378,7 +2378,7 @@ test_delete_open(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     {
         fh = H5HF_open(f, fh_addr);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (fh) {
         /* Close opened heap */
         H5HF_close(fh);
@@ -2414,7 +2414,7 @@ error:
             H5HF_close(fh2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_delete_open() */
 
@@ -2568,7 +2568,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
     {
         fh = H5HF_create(f, &tmp_cparam);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (NULL != fh)
         FAIL_STACK_ERROR;
 
@@ -2732,7 +2732,7 @@ test_id_limits(hid_t fapl, H5HF_create_t *cparam, hid_t fcpl)
     {
         fh = H5HF_create(f, &tmp_cparam);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (NULL != fh)
         FAIL_STACK_ERROR;
 
@@ -2752,7 +2752,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_id_limits() */
 
@@ -2874,7 +2874,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_filtered_create() */
 
@@ -3013,7 +3013,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_size() */
 
@@ -3148,7 +3148,7 @@ error:
         H5Fclose(file1);
         H5Fclose(file2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_reopen_hdr() */
 
@@ -3222,7 +3222,7 @@ test_man_insert_weird(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tpa
     {
         ret = H5HF_insert(fh, (size_t)0, shared_wobj_g, heap_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
     H5Eclear2(H5E_DEFAULT);
@@ -3260,7 +3260,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_weird() */
 
@@ -3363,7 +3363,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_first() */
 
@@ -3458,7 +3458,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_second() */
 
@@ -3556,7 +3556,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_root_mult() */
 
@@ -3662,7 +3662,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_force_indirect() */
 
@@ -3768,7 +3768,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_fill_second() */
 
@@ -3880,7 +3880,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_insert_third_direct() */
 
@@ -3976,7 +3976,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_first_row() */
 
@@ -4079,7 +4079,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_second_row() */
 
@@ -4179,7 +4179,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_second_row() */
 
@@ -4290,7 +4290,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_third_row() */
 
@@ -4388,7 +4388,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_fourth_row() */
 
@@ -4484,7 +4484,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_all_root_direct() */
 
@@ -4585,7 +4585,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_first_recursive_indirect() */
 
@@ -4695,7 +4695,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_second_direct_recursive_indirect() */
 
@@ -4797,7 +4797,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_first_recursive_indirect() */
 
@@ -4907,7 +4907,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_second_recursive_indirect() */
 
@@ -5015,7 +5015,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_second_recursive_indirect() */
 
@@ -5115,7 +5115,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_recursive_indirect_row() */
 
@@ -5224,7 +5224,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_2nd_recursive_indirect() */
 
@@ -5326,7 +5326,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_recursive_indirect_two_deep() */
 
@@ -5436,7 +5436,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_3rd_recursive_indirect() */
 
@@ -5547,7 +5547,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_first_3rd_recursive_indirect() */
 
@@ -5655,7 +5655,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_recursive_indirect_row() */
 
@@ -5763,7 +5763,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_all_3rd_recursive_indirect() */
 
@@ -5878,7 +5878,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_4th_recursive_indirect() */
 
@@ -5999,7 +5999,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_first_4th_recursive_indirect() */
 
@@ -6111,7 +6111,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_4th_recursive_indirect_row() */
 
@@ -6223,7 +6223,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_all_4th_recursive_indirect() */
 #endif /* ALL_INSERT_TESTS */
@@ -6357,7 +6357,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_start_5th_recursive_indirect() */
 
@@ -6452,7 +6452,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     {
         ret = H5HF_remove(fh, heap_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         FAIL_STACK_ERROR;
 
@@ -6481,7 +6481,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     {
         ret = H5HF_remove(fh, heap_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
     H5Eclear2(H5E_DEFAULT);
@@ -6491,7 +6491,7 @@ HDfprintf(stderr, "Random # seed was: %lu\n", seed);
     {
         ret = H5HF_read(fh, heap_id, shared_robj_g);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
     H5Eclear2(H5E_DEFAULT);
@@ -6517,7 +6517,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_bogus() */
 
@@ -6681,7 +6681,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_one() */
 
@@ -6874,7 +6874,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_two() */
 
@@ -7043,7 +7043,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_one_larger() */
 
@@ -7283,7 +7283,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_two_larger() */
 
@@ -7583,7 +7583,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_three_larger() */
 
@@ -7707,7 +7707,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(heap_id);
     HDfree(heap_id_data);
@@ -7784,7 +7784,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_root_direct() */
 
@@ -7872,7 +7872,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_two_direct() */
 
@@ -7942,7 +7942,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_first_row() */
 
@@ -8014,7 +8014,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_first_two_rows() */
 
@@ -8090,7 +8090,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_first_four_rows() */
 
@@ -8160,7 +8160,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_all_root_direct() */
 
@@ -8234,7 +8234,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_2nd_indirect() */
 
@@ -8312,7 +8312,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_remove_3rd_indirect() */
 
@@ -8392,7 +8392,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_start_block() */
 
@@ -8490,7 +8490,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_start_block_add_back() */
 
@@ -8600,7 +8600,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_start_block_add_skipped() */
 
@@ -8694,7 +8694,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_2nd_block() */
 
@@ -8837,7 +8837,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_2nd_block_add_skipped() */
 
@@ -9005,7 +9005,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_one_partial_skip_2nd_block_add_skipped() */
 
@@ -9135,7 +9135,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_row_skip_add_skipped() */
 
@@ -9264,7 +9264,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_skip_direct_skip_indirect_two_rows_add_skipped() */
 
@@ -9388,7 +9388,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_direct_skip_indirect_start_block_add_skipped() */
 
@@ -9519,7 +9519,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_direct_skip_2nd_indirect_start_block_add_skipped() */
 
@@ -9662,7 +9662,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
 
@@ -9830,7 +9830,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_direct_skip_2nd_indirect_skip_2nd_block_add_skipped() */
 
@@ -9984,7 +9984,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_direct_skip_indirect_two_rows_add_skipped() */
 
@@ -10169,7 +10169,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_direct_skip_indirect_two_rows_skip_indirect_row_add_skipped() */
 
@@ -10298,7 +10298,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_2nd_direct_skip_start_block_add_skipped() */
 
@@ -10440,7 +10440,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_2nd_direct_skip_2nd_indirect_start_block_add_skipped() */
 
@@ -10592,7 +10592,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
 
@@ -10749,7 +10749,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_2nd_direct_fill_direct_skip2_3rd_indirect_start_block_add_skipped() */
 
@@ -10912,7 +10912,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_direct_less_one_fill_direct_wrap_start_block_add_skipped() */
 
@@ -11082,7 +11082,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_1st_row_3rd_direct_fill_2nd_direct_less_one_wrap_start_block_add_skipped() */
 
@@ -11243,7 +11243,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_direct_fill_direct_skip_start_block_add_skipped() */
 
@@ -11423,7 +11423,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_start_block_add_skipped() */
 
@@ -11640,7 +11640,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_two_rows_start_block_add_skipped()
    */
@@ -11841,7 +11841,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_3rd_direct_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped() */
 
@@ -12078,7 +12078,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_fill_4th_direct_less_one_fill_2nd_direct_fill_direct_skip_3rd_indirect_wrap_start_block_add_skipped()
    */
@@ -12211,7 +12211,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_frag_simple() */
 
@@ -12380,7 +12380,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_frag_direct() */
 
@@ -12491,7 +12491,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_frag_2nd_direct() */
 
@@ -12611,7 +12611,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_man_frag_3rd_direct() */
 
@@ -12761,7 +12761,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_huge_insert_one() */
 
@@ -12991,7 +12991,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_huge_insert_two() */
 
@@ -13296,7 +13296,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_huge_insert_three() */
 
@@ -13721,7 +13721,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_huge_insert_mix() */
 
@@ -13932,7 +13932,7 @@ error:
             H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_filtered_huge() */
 
@@ -14082,7 +14082,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_tiny_insert_one() */
 
@@ -14312,7 +14312,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_tiny_insert_two() */
 
@@ -14919,7 +14919,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_tiny_insert_mix() */
 
@@ -15092,7 +15092,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_filtered_man_root_direct() */
 
@@ -15418,7 +15418,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_filtered_man_root_indirect() */
 
@@ -15621,7 +15621,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_random() */
 
@@ -15838,7 +15838,7 @@ error:
             H5O_msg_reset(H5O_PLINE_ID, &tmp_cparam.pline); /* Release the I/O pipeline filter information */
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_random_pow2() */
 
@@ -15955,7 +15955,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     {
         ret = H5HF_write(fh, huge_heap_id, &id_changed, shared_wobj_g);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDassert(!id_changed);
     if (tparam->comp == FHEAP_TEST_COMPRESS) {
         if (ret >= 0)
@@ -15971,7 +15971,7 @@ test_write(hid_t fapl, H5HF_create_t *cparam, fheap_test_param_t *tparam)
     {
         ret = H5HF_write(fh, tiny_heap_id, &id_changed, shared_wobj_g);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDassert(!id_changed);
     if (ret >= 0)
         TEST_ERROR;
@@ -16129,7 +16129,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_write() */
 
@@ -16301,7 +16301,7 @@ error:
             H5HF_close(fh);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_bug1() */
 
@@ -16926,7 +16926,7 @@ error:
         H5Pclose(def_fcpl);
         H5Pclose(fcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (api_ctx_pushed)
         H5CX_pop(FALSE);