4 files changed, 36 insertions, 9 deletions
diff --git a/hl/test/test_ds.c b/hl/test/test_ds.c
index 20e3e82..ead5c65 100644
--- a/hl/test/test_ds.c
+++ b/hl/test/test_ds.c
@@ -3740,7 +3740,10 @@ match_dim_scale(hid_t did, unsigned dim, hid_t dsid, void *visitor_data)
     return ret;
 
 out:
-    H5E_BEGIN_TRY { H5Sclose(sid); }
+    H5E_BEGIN_TRY
+    {
+        H5Sclose(sid);
+    }
     H5E_END_TRY;
     return FAIL;
 }
diff --git a/hl/test/test_file_image.c b/hl/test/test_file_image.c
index f820568..b397a81 100644
--- a/hl/test/test_file_image.c
+++ b/hl/test/test_file_image.c
@@ -335,7 +335,10 @@ test_file_image(size_t open_images, size_t nflags, const unsigned *flags)
             VERIFY(status1 < 0, "H5Dwrite() should have failed");
 
             /* extend dimensions of dataset */
-            H5E_BEGIN_TRY { status1 = H5Dset_extent(dset_id[i], dims4); }
+            H5E_BEGIN_TRY
+            {
+                status1 = H5Dset_extent(dset_id[i], dims4);
+            }
             H5E_END_TRY;
 
             VERIFY(status1 < 0, "H5Dset_extent() should have failed");
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
index b71531e..0c7d511 100644
--- a/hl/test/test_image.c
+++ b/hl/test/test_image.c
@@ -301,7 +301,10 @@ out:
         HDfree(buf1_out);
     if (buf2_out)
         HDfree(buf2_out);
-    H5E_BEGIN_TRY { H5Fclose(fid); }
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+    }
     H5E_END_TRY;
     H5_FAILED();
     return FAIL;
@@ -488,7 +491,10 @@ out:
     if (image_data)
         HDfree(image_data);
 
-    H5E_BEGIN_TRY { H5Fclose(fid); }
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+    }
     H5E_END_TRY;
 
     H5_FAILED();
@@ -720,7 +726,10 @@ out:
     if (image_data)
         HDfree(image_data);
 
-    H5E_BEGIN_TRY { H5Fclose(fid); }
+    H5E_BEGIN_TRY
+    {
+        H5Fclose(fid);
+    }
     H5E_END_TRY;
     if (f)
         HDfclose(f);
diff --git a/hl/test/test_ld.c b/hl/test/test_ld.c
index 02a56f4..dc5755c 100644
--- a/hl/test/test_ld.c
+++ b/hl/test/test_ld.c
@@ -252,7 +252,10 @@ test_LD_dims_params(const char *file)
     /*
      * 1. Verify failure with negative dataset id
      */
-    H5E_BEGIN_TRY { ret = H5LDget_dset_dims(invalid_id, one_cur_dims); }
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_dims(invalid_id, one_cur_dims);
+    }
     H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
 
@@ -261,7 +264,10 @@ test_LD_dims_params(const char *file)
      */
     if ((did = H5Dopen2(fid, DSET_ALLOC_EARLY, H5P_DEFAULT)) < 0)
         FAIL_STACK_ERROR
-    H5E_BEGIN_TRY { ret = H5LDget_dset_dims(did, NULL); }
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_dims(did, NULL);
+    }
     H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)
     if (H5Dclose(did) < 0)
@@ -536,7 +542,10 @@ test_LD_size(const char *file)
     /*
      * Verify failure with an invalid dataset id
      */
-    H5E_BEGIN_TRY { dsize = H5LDget_dset_type_size(invalid_id, NULL); }
+    H5E_BEGIN_TRY
+    {
+        dsize = H5LDget_dset_type_size(invalid_id, NULL);
+    }
     H5E_END_TRY;
     VERIFY_EQUAL(dsize, 0)
 
@@ -916,7 +925,10 @@ test_LD_elmts_invalid(const char *file)
      */
 
     /* Verify failure from case #1: an invalid dataset id */
-    H5E_BEGIN_TRY { ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf); }
+    H5E_BEGIN_TRY
+    {
+        ret = H5LDget_dset_elmts(invalid_id, prev_dims, cur_dims, NULL, tbuf);
+    }
     H5E_END_TRY;
     VERIFY_EQUAL(ret, FAIL)