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

diff --git a/test/unlink.c b/test/unlink.c
index e18ae73..50781d9 100644
--- a/test/unlink.c
+++ b/test/unlink.c
@@ -118,7 +118,7 @@ test_one(hid_t file)
     {
         status = H5Ldelete(grp, ".", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0)
         FAIL_PUTS_ERROR("    Unlinking object w/o a name should have failed.");
     if (H5Gclose(grp) < 0)
@@ -137,7 +137,7 @@ error:
         H5Gclose(work);
         H5Gclose(grp);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_one() */
 
@@ -244,7 +244,7 @@ error:
         H5Gclose(work);
         H5Gclose(grp);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -289,7 +289,7 @@ error:
     {
         H5Gclose(work);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_symlink() */
 
@@ -353,7 +353,7 @@ error:
         H5Gclose(foo);
         H5Gclose(inner);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_rename() */
 
@@ -410,7 +410,7 @@ test_new_move(hid_t fapl)
             FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Move a group across files.  Should fail. */
     H5E_BEGIN_TRY
@@ -418,7 +418,7 @@ test_new_move(hid_t fapl)
         if (H5Lmove(grp_1, "group_move", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Move a group across groups in the same file. */
     if (H5Lmove(grp_1, "group_move", grp_2, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -454,7 +454,7 @@ error:
         H5Fclose(file_a);
         H5Fclose(file_b);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -1243,7 +1243,7 @@ test_filespace(hid_t fapl)
     {
         dataset = H5Dcreate2(file, DATASETNAME, H5T_NATIVE_INT, space, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (dataset >= 0) {
         H5Dclose(dataset);
         TEST_ERROR;
@@ -1285,7 +1285,7 @@ test_filespace(hid_t fapl)
     {
         group = H5Gcreate2(file, GROUPNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (group >= 0) {
         H5Gclose(group);
         TEST_ERROR;
@@ -1335,7 +1335,7 @@ test_filespace(hid_t fapl)
     {
         status = H5Tcommit2(file, TYPENAME, type, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0)
         TEST_ERROR;
     if (H5Tclose(type) < 0)
@@ -1390,7 +1390,7 @@ test_filespace(hid_t fapl)
     {
         attr = H5Acreate2(dataset, ATTRNAME, H5T_NATIVE_INT, attr_space, H5P_DEFAULT, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (attr >= 0) {
         H5Aclose(attr);
         TEST_ERROR;
@@ -1784,7 +1784,7 @@ error:
                 {
                     H5Gclose(gids[n]);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
             } /* end if */
         HDfree(gids);
     } /* end if */
@@ -1792,7 +1792,7 @@ error:
     {
         H5Gclose(rootid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return 1;
 } /* end test_unlink_rightleaf() */
@@ -1874,7 +1874,7 @@ error:
                 {
                     H5Gclose(gids[n]);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
             } /* end if */
         HDfree(gids);
     } /* end if */
@@ -1882,7 +1882,7 @@ error:
     {
         H5Gclose(rootid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return 1;
 } /* end test_unlink_rightnode() */
@@ -2250,7 +2250,7 @@ error:
                 {
                     H5Gclose(gids[n]);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
             } /* end if */
         HDfree(gids);
     } /* end if */
@@ -2258,7 +2258,7 @@ error:
     {
         H5Gclose(rootid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return 1;
 } /* end test_unlink_middlenode() */
@@ -2342,7 +2342,7 @@ error:
         H5Dclose(d);
         H5Fclose(f);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_resurrect_dataset() */
 
@@ -2422,7 +2422,7 @@ error:
         H5Tclose(type);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_resurrect_datatype() */
 
@@ -2500,7 +2500,7 @@ error:
         H5Gclose(group);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_resurrect_group() */
 
@@ -2598,7 +2598,7 @@ error:
         H5Dclose(dset_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_unlink_chunked_dataset() */
 
@@ -2759,7 +2759,7 @@ error:
         H5Gclose(gid);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_full_group_compact() */
 
@@ -2937,7 +2937,7 @@ error:
         H5Pclose(gcpl);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_full_group_dense() */