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

diff --git a/test/btree2.c b/test/btree2.c
index 573f45c..36182f2 100644
--- a/test/btree2.c
+++ b/test/btree2.c
@@ -679,7 +679,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)0, find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -737,7 +737,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -802,7 +802,7 @@ test_insert_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -842,7 +842,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_insert_basic() */
 
@@ -988,7 +988,7 @@ test_insert_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC + 2), find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -1027,7 +1027,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_split_root() */
 
@@ -1180,7 +1180,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level1_2leaf_redistrib() */
 
@@ -1339,7 +1339,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level1_side_split() */
 
@@ -1482,7 +1482,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level1_3leaf_redistrib() */
 
@@ -1604,7 +1604,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level1_middle_split() */
 
@@ -1757,7 +1757,7 @@ test_insert_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC * 30), find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -1797,7 +1797,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_make_level2() */
 
@@ -2025,7 +2025,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_leaf_redistrib() */
 
@@ -2257,7 +2257,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_leaf_split() */
 
@@ -2429,7 +2429,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_2internal_redistrib() */
 
@@ -2606,7 +2606,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_2internal_split() */
 
@@ -2784,7 +2784,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_3internal_redistrib() */
 
@@ -2965,7 +2965,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_insert_level2_3internal_split() */
 
@@ -3132,7 +3132,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3140,7 +3140,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     {
         ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY * 3), find_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3174,7 +3174,7 @@ HDfprintf(stderr,"curr_time=%lu\n",(unsigned long)curr_time);
     {
         ret = H5B2_insert(bt2, &record);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3209,7 +3209,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDfree(records);
     return 1;
 } /* test_insert_lots() */
@@ -3309,7 +3309,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3386,7 +3386,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)1, index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3463,7 +3463,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3557,7 +3557,7 @@ test_update_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)4, index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3617,7 +3617,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_update_basic() */
 
@@ -3824,7 +3824,7 @@ test_update_split_root(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_p
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC + 2), index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -3878,7 +3878,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_split_root() */
 
@@ -4035,7 +4035,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_level1_2leaf_redistrib() */
 
@@ -4198,7 +4198,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_level1_side_split() */
 
@@ -4345,7 +4345,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_level1_3leaf_redistrib() */
 
@@ -4470,7 +4470,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_level1_middle_split() */
 
@@ -4642,7 +4642,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -4819,7 +4819,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5006,7 +5006,7 @@ test_update_make_level2(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_SPLIT_ROOT_NREC_REC * 42), index_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5061,7 +5061,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_update_make_level2() */
 
@@ -5220,7 +5220,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     {
         ret = H5B2_index(bt2, H5_ITER_INC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5228,7 +5228,7 @@ HDfprintf(stderr, "curr_time = %lu\n", (unsigned long)curr_time);
     {
         ret = H5B2_index(bt2, H5_ITER_DEC, (hsize_t)(INSERT_MANY_REC * 3), find_rec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5312,7 +5312,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDfree(records);
 
     return 1;
@@ -5369,7 +5369,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_remove(bt2, &record, NULL, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5409,7 +5409,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_remove(bt2, &record, NULL, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5493,7 +5493,7 @@ test_remove_basic(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_
     {
         ret = H5B2_remove(bt2, &record, NULL, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5627,7 +5627,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_basic() */
 
@@ -5698,7 +5698,7 @@ test_remove_level1_noredistrib(hid_t fapl, const H5B2_create_t *cparam, const bt
     {
         ret = H5B2_remove(bt2, &record, NULL, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -5851,7 +5851,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_noredistrib() */
 
@@ -6047,7 +6047,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_redistrib() */
 
@@ -6225,7 +6225,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_2leaf_merge() */
 
@@ -6350,7 +6350,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_3leaf_merge() */
 
@@ -6576,7 +6576,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_promote() */
 
@@ -6724,7 +6724,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_promote_2leaf_redistrib() */
 
@@ -6872,7 +6872,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_promote_3leaf_redistrib() */
 
@@ -7017,7 +7017,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_promote_2leaf_merge() */
 
@@ -7162,7 +7162,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_promote_3leaf_merge() */
 
@@ -7300,7 +7300,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level1_collapse() */
 
@@ -7585,7 +7585,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_promote() */
 
@@ -7736,7 +7736,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_promote_2internal_redistrib() */
 
@@ -7887,7 +7887,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_promote_3internal_redistrib() */
 
@@ -8039,7 +8039,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_promote_2internal_merge() */
 
@@ -8191,7 +8191,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_promote_3internal_merge() */
 
@@ -8317,7 +8317,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_2internal_merge_left() */
 
@@ -8443,7 +8443,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_2internal_merge_right() */
 
@@ -8569,7 +8569,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_3internal_merge() */
 
@@ -8694,7 +8694,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_remove_level2_collapse_right() */
 
@@ -8769,7 +8769,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return 1;
 } /* gen_l4_btree2() */
@@ -9205,7 +9205,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (fd > 0)
         HDclose(fd);
@@ -9279,7 +9279,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
     {
         ret = H5B2_neighbor(bt2, H5B2_COMPARE_LESS, &search, neighbor_cb, &record);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9359,7 +9359,7 @@ test_find_neighbor(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param
     {
         ret = H5B2_neighbor(bt2, H5B2_COMPARE_GREATER, &search, neighbor_cb, &record);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9437,7 +9437,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDfree(records);
     return 1;
 } /* test_find_neighbor() */
@@ -9710,7 +9710,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_delete() */
 
@@ -9777,7 +9777,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     {
         ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9828,7 +9828,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     {
         ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9879,7 +9879,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     {
         ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9930,7 +9930,7 @@ test_modify(hid_t fapl, const H5B2_create_t *cparam, const bt2_test_param_t *tpa
     {
         ret = H5B2_modify(bt2, &record, modify_cb, &modify);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     /* Should fail */
     if (ret != FAIL)
         TEST_ERROR;
@@ -9955,7 +9955,7 @@ error:
             H5B2_close(bt2);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* test_modify() */
 
@@ -10095,7 +10095,7 @@ error:
         H5Fclose(file0);
         H5Fclose(file00);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return (1);
 } /* test_open_twice_diff() */
 
@@ -10258,7 +10258,7 @@ error:
     {
         H5Pclose(fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (api_ctx_pushed)
         H5CX_pop(FALSE);