Sync test dir w/ develop (#3303)

1 files changed, 290 insertions, 290 deletions

diff --git a/test/links.c b/test/links.c
index 154ae30..1c46fb7 100644
--- a/test/links.c
+++ b/test/links.c
@@ -46,61 +46,61 @@
 #define SYMLINK1 TMPDIR "sym1.h5"
 #define SYMLINK2 TMPDIR2 "sym2.h5"
 
-const char *FILENAME[] = {"links0",
-                          "links1",
-                          "links2",
-                          "links3",
-                          "links4a",          /* 4 */
-                          "links4b",          /* 5 */
-                          "links4c",          /* 6 */
-                          "links4d",          /* 7 */
-                          "links5",           /* 8 */
-                          "links6",           /* 9 */
-                          "links7",           /* 10 */
-                          "links8",           /* 11 */
-                          "extlinks0",        /* 12: main files */
-                          TMPDIR "extlinks0", /* 13: */
-                          "extlinks1",        /* 14: target files */
-                          TMPDIR "extlinks1", /* 15: */
-                          "extlinks2",        /* 16: */
-                          TMPDIR "extlinks2", /* 17: */
-                          "extlinks3",        /* 18: */
-                          TMPDIR "extlinks3", /* 19: */
-                          "extlinks4",        /* 20: */
-                          TMPDIR "extlinks4", /* 21: */
-                          "extlinks5",        /* 22: */
-                          TMPDIR "extlinks6", /* 23: */
-                          "extlinks7",        /* 24: */
-                          TMPDIR "extlinks7", /* 25: */
-                          TMPDIR "extlinks8", /* 26: */
-                          "extlinks9",        /* 27: */
-                          TMPDIR "extlinks9", /* 28: */
-                          "extlinks10",
-                          /* 29: */            /* TESTS for windows */
-                          TMPDIR "extlinks10", /* 30: */
-                          TMPDIR "extlinks11", /* 31: */
-                          TMPDIR "extlinks12", /* 32: */
-                          "extlinks13",        /* 33: */
-                          TMPDIR "extlinks13", /* 34: */
-                          TMPDIR "extlinks14", /* 35: */
-                          TMPDIR "extlinks15", /* 36: */
-                          "extlinks16A",
-                          /* 37: */              /* TESTS for H5P_set_elink_fapl */
-                          "extlinks16B",         /* 38: */
-                          "extlinks17",          /* 39: */
-                          "extlinks18A",         /* 40: */
-                          "extlinks18B",         /* 41: */
-                          "extlinks19A",         /* 42: */
-                          "extlinks19B",         /* 43: */
-                          "extlinks20",          /* 44: */
-                          "extlinks21A",         /* 45: Files for symlink() tests*/
-                          TMPDIR2 "extlinks21B", /* 46: */
-                          TMPDIR2 "extlinks21C", /* 47: */
-                          "extlinks21C",         /* 48: (same as #47, only without the TMPDIR2 prefix) */
-                          TMPDIR "extlinks21D",  /* 49: */
-                          TMPDIR "extlinks21E",  /* 50: */
-                          "extlinks21E",         /* 51: (same as #50, only without the TMPDIR prefix) */
-                          NULL};
+static const char *FILENAME[] = {"links0",
+                                 "links1",
+                                 "links2",
+                                 "links3",
+                                 "links4a",          /* 4 */
+                                 "links4b",          /* 5 */
+                                 "links4c",          /* 6 */
+                                 "links4d",          /* 7 */
+                                 "links5",           /* 8 */
+                                 "links6",           /* 9 */
+                                 "links7",           /* 10 */
+                                 "links8",           /* 11 */
+                                 "extlinks0",        /* 12: main files */
+                                 TMPDIR "extlinks0", /* 13: */
+                                 "extlinks1",        /* 14: target files */
+                                 TMPDIR "extlinks1", /* 15: */
+                                 "extlinks2",        /* 16: */
+                                 TMPDIR "extlinks2", /* 17: */
+                                 "extlinks3",        /* 18: */
+                                 TMPDIR "extlinks3", /* 19: */
+                                 "extlinks4",        /* 20: */
+                                 TMPDIR "extlinks4", /* 21: */
+                                 "extlinks5",        /* 22: */
+                                 TMPDIR "extlinks6", /* 23: */
+                                 "extlinks7",        /* 24: */
+                                 TMPDIR "extlinks7", /* 25: */
+                                 TMPDIR "extlinks8", /* 26: */
+                                 "extlinks9",        /* 27: */
+                                 TMPDIR "extlinks9", /* 28: */
+                                 "extlinks10",
+                                 /* 29: */            /* TESTS for windows */
+                                 TMPDIR "extlinks10", /* 30: */
+                                 TMPDIR "extlinks11", /* 31: */
+                                 TMPDIR "extlinks12", /* 32: */
+                                 "extlinks13",        /* 33: */
+                                 TMPDIR "extlinks13", /* 34: */
+                                 TMPDIR "extlinks14", /* 35: */
+                                 TMPDIR "extlinks15", /* 36: */
+                                 "extlinks16A",
+                                 /* 37: */              /* TESTS for H5P_set_elink_fapl */
+                                 "extlinks16B",         /* 38: */
+                                 "extlinks17",          /* 39: */
+                                 "extlinks18A",         /* 40: */
+                                 "extlinks18B",         /* 41: */
+                                 "extlinks19A",         /* 42: */
+                                 "extlinks19B",         /* 43: */
+                                 "extlinks20",          /* 44: */
+                                 "extlinks21A",         /* 45: Files for symlink() tests*/
+                                 TMPDIR2 "extlinks21B", /* 46: */
+                                 TMPDIR2 "extlinks21C", /* 47: */
+                                 "extlinks21C", /* 48: (same as #47, only without the TMPDIR2 prefix) */
+                                 TMPDIR "extlinks21D", /* 49: */
+                                 TMPDIR "extlinks21E", /* 50: */
+                                 "extlinks21E",        /* 51: (same as #50, only without the TMPDIR prefix) */
+                                 NULL};
 
 #define FAMILY_SIZE    1024
 #define CORE_INCREMENT 1024
@@ -535,13 +535,13 @@ new_links(hid_t fapl, hbool_t new_format)
         if (H5Lcreate_hard(H5L_SAME_LOC, "dataset1", H5L_SAME_LOC, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     H5E_BEGIN_TRY
     {
         if (H5Lcreate_soft("dataset1", H5L_SAME_LOC, "soft", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Create links across files with hard link.  Should fail. */
     H5E_BEGIN_TRY
@@ -549,7 +549,7 @@ new_links(hid_t fapl, hbool_t new_format)
         if (H5Lcreate_hard(file_a, "dataset1", file_b, "hard", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Create hard link to test H5L_SAME_LOC */
     if (H5Lcreate_hard(grp1_a, "dataset2", H5L_SAME_LOC, "hard1", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -595,7 +595,7 @@ error:
         H5Fclose(file_a);
         H5Fclose(file_b);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 }
 
@@ -667,7 +667,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     {
         status = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Lexists() should have failed for a path with missing components.");
@@ -677,7 +677,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     {
         status = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Lexists() should have failed for a path with missing components.");
@@ -715,7 +715,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     {
         status = H5Oget_info_by_name3(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Oget_info_by_name() should have failed for a dangling link.");
@@ -746,7 +746,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     {
         status = H5Oget_info_by_name3(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Oget_info_by_name() should have failed for a recursive link.");
@@ -924,7 +924,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     free(objname);
     return FAIL;
 }
@@ -1083,7 +1083,7 @@ toomany(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "soft17", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for sequence of too many nested links.");
@@ -1124,7 +1124,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end toomany() */
 
@@ -1337,7 +1337,7 @@ error:
         H5Sclose(space_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_lcpl() */
 
@@ -1394,7 +1394,7 @@ test_move(hid_t fapl, hbool_t new_format)
             FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Move a group across files.  Should fail. */
     H5E_BEGIN_TRY
@@ -1402,7 +1402,7 @@ test_move(hid_t fapl, hbool_t new_format)
         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 soft link across files.  Should succeed. */
     if (H5Lmove(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -1431,7 +1431,7 @@ test_move(hid_t fapl, hbool_t new_format)
     {
         moved_grp = H5Gopen2(grp_1, "group_move", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (moved_grp >= 0) {
         H5_FAILED();
         HDputs("    Group still in original location?");
@@ -1482,7 +1482,7 @@ test_move(hid_t fapl, hbool_t new_format)
         if ((moved_grp = H5Gopen2(grp_1, "group_copy", H5P_DEFAULT)) >= 0)
             FAIL_STACK_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5Gclose(grp_1);
     H5Gclose(grp_2);
@@ -1504,7 +1504,7 @@ error:
         H5Fclose(file_a);
         H5Fclose(file_b);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -1561,7 +1561,7 @@ test_copy(hid_t fapl, hbool_t new_format)
             FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Copy a group across files.  Should fail. */
     H5E_BEGIN_TRY
@@ -1569,7 +1569,7 @@ test_copy(hid_t fapl, hbool_t new_format)
         if (H5Lcopy(grp_1, "group_copy", file_b, "group_new_name", H5P_DEFAULT, H5P_DEFAULT) != FAIL)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Copy a soft link across files.  Should succeed. */
     if (H5Lcopy(grp_2, "soft", file_b, "soft_new_name", H5P_DEFAULT, H5P_DEFAULT) < 0)
@@ -1678,7 +1678,7 @@ error:
         H5Fclose(file_a);
         H5Fclose(file_b);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -1918,7 +1918,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_move_preserves() */
 
@@ -1989,7 +1989,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
         if (H5Gget_objname_by_idx(group1_id, (hsize_t)1, tmpstr, sizeof(tmpstr)) >= 0)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Test getting the type for objects */
     if ((obj_type = H5Gget_objtype_by_idx(group1_id, (hsize_t)0)) < 0)
@@ -2001,7 +2001,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
         if (H5Gget_objtype_by_idx(group1_id, (hsize_t)1) >= 0)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Test getting the number of objects in a group */
     if (H5Gget_num_objs(file_id, &num_objs) < 0)
@@ -2058,7 +2058,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
         if (H5Gget_objinfo(file_id, "/group2/soft_link_no_exist", TRUE, NULL) >= 0)
             FAIL_STACK_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Test the dangling soft link */
     if (H5Gget_objinfo(file_id, "/group2/dangle_soft_link", FALSE, &sb_soft2) < 0)
@@ -2105,7 +2105,7 @@ test_deprec(hid_t fapl, hbool_t new_format)
         if (H5Gopen2(file_id, "moved_group1/moved_group2", H5P_DEFAULT) >= 0)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (H5Fclose(file_id) < 0)
         FAIL_STACK_ERROR;
@@ -2120,7 +2120,7 @@ error:
         H5Gclose(group1_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_deprec() */
 
@@ -2185,7 +2185,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
     {
         exists = H5Lexists(file, "no_grp1/hard", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (exists >= 0) {
         H5_FAILED();
         HDputs("    H5Lexists() should have failed for a path with missing components.");
@@ -2195,7 +2195,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
     {
         exists = H5Lexists(file, "/no_grp1/hard", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (exists >= 0) {
         H5_FAILED();
         HDputs("    H5Lexists() should have failed for a path with missing components.");
@@ -2231,7 +2231,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
     {
         status = H5Oget_info_by_name2(file, "grp1/dangle", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Oget_info_by_name() should have failed for a dangling link.");
@@ -2262,7 +2262,7 @@ cklinks_deprec(hid_t fapl, hbool_t new_format)
     {
         status = H5Oget_info_by_name2(file, "grp1/recursive", &oinfo2, H5O_INFO_BASIC, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs("    H5Oget_info_by_name() should have failed for a recursive link.");
@@ -2510,7 +2510,7 @@ error:
         H5Sclose(space_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_lcpl_deprec() */
 
@@ -2751,7 +2751,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* end test_move_preserves_deprec() */
 
@@ -2969,7 +2969,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_root_deprec() */
 
@@ -3123,7 +3123,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_query_deprec() */
 
@@ -3438,7 +3438,7 @@ error:
         H5Fclose(fid2);
         H5Fclose(fid1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* external_link_closing_deprec() */
 
@@ -3761,7 +3761,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_hard_links_deprec() */
 
@@ -3945,7 +3945,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_link_reregister_deprec() */
 
@@ -4112,7 +4112,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_callbacks_deprec() */
 
@@ -4258,7 +4258,7 @@ lapl_nlinks_deprec(hid_t fapl, hbool_t new_format)
     {
         gid = H5Oopen(fid, "soft5", plist);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for sequence of too many nested links.");
@@ -4420,7 +4420,7 @@ error:
         H5Pclose(plist);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end lapl_nlinks_deprec() */
 
@@ -4532,7 +4532,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end linkinfo_deprec() */
 
@@ -4674,7 +4674,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_create_compact_deprec() */
 
@@ -4837,7 +4837,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_create_dense_deprec() */
 
@@ -5126,7 +5126,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -5134,7 +5134,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -5178,7 +5178,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -5186,7 +5186,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -5194,7 +5194,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -5238,7 +5238,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -5246,7 +5246,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -5254,7 +5254,7 @@ link_info_by_idx_deprec(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -5283,7 +5283,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_info_by_idx_deprec() */
 
@@ -5454,7 +5454,7 @@ link_info_by_idx_old_deprec(hid_t fapl)
             ret = H5Lget_info_by_idx1(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                       H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
         H5E_BEGIN_TRY
@@ -5462,7 +5462,7 @@ link_info_by_idx_old_deprec(hid_t fapl)
             name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname,
                                           (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (name_len >= 0)
             TEST_ERROR;
 
@@ -5489,7 +5489,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_info_by_idx_old_deprec() */
 
@@ -5596,7 +5596,7 @@ delete_by_idx_deprec(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -5605,7 +5605,7 @@ delete_by_idx_deprec(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -5637,7 +5637,7 @@ delete_by_idx_deprec(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -5711,7 +5711,7 @@ delete_by_idx_deprec(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -5763,7 +5763,7 @@ delete_by_idx_deprec(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -5897,7 +5897,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end delete_by_idx_deprec() */
 
@@ -5951,7 +5951,7 @@ delete_by_idx_old_deprec(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -5981,7 +5981,7 @@ delete_by_idx_old_deprec(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -5990,7 +5990,7 @@ delete_by_idx_old_deprec(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -6037,7 +6037,7 @@ delete_by_idx_old_deprec(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -6163,7 +6163,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end delete_by_idx_old_deprec() */
@@ -6427,7 +6427,7 @@ link_iterate_check_deprec(hid_t group_id, H5_index_t idx_type, H5_iter_order_t o
     {
         ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_fail_deprec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -6590,7 +6590,7 @@ link_iterate_deprec(hid_t fapl)
                 {
                     ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -6623,7 +6623,7 @@ link_iterate_deprec(hid_t fapl)
                 {
                     ret = H5Literate1(group_id, idx_type, order, &skip, link_iterate_deprec_cb, NULL);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -6662,7 +6662,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (visited)
         free(visited);
@@ -6907,7 +6907,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
     {
         ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -6917,7 +6917,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
     {
         ret = H5Literate1((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_deprec_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -6925,7 +6925,7 @@ link_iterate_old_check_deprec(hid_t group_id, H5_iter_order_t order, unsigned ma
     {
         ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_deprec_cb, iter_info);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -7020,7 +7020,7 @@ link_iterate_old_deprec(hid_t fapl)
         {
             ret = H5Literate1(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_deprec_cb, NULL);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -7031,7 +7031,7 @@ link_iterate_old_deprec(hid_t fapl)
         {
             ret = H5Literate1(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_deprec_cb, NULL);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -7063,7 +7063,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (visited)
         free(visited);
@@ -7286,7 +7286,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_root() */
 
@@ -7408,7 +7408,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_path() */
 
@@ -7607,7 +7607,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_mult() */
 
@@ -7788,7 +7788,7 @@ error:
         H5Pclose(lcpl_id);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_self() */
 
@@ -7929,7 +7929,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_pingpong() */
 
@@ -8055,7 +8055,7 @@ external_link_toomany(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "link1", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         printf("%d:    Should have failed for sequence of too many nested links.", __LINE__);
@@ -8098,7 +8098,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_toomany() */
 
@@ -8165,7 +8165,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "no_file", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for sequence of too many nested links.");
@@ -8177,7 +8177,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "no_object", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for sequence of too many nested links.");
@@ -8189,7 +8189,7 @@ external_link_dangling(hid_t fapl, hbool_t new_format)
     {
         status = H5Lget_name_by_idx(rid, "no_file", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (status >= 0) {
         H5_FAILED();
         HDputs(
@@ -8213,7 +8213,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_dangling() */
 
@@ -8288,7 +8288,7 @@ external_link_prefix(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", gapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file from pathnames set via H5Pset_elink_prefix() */
     if (gid < 0) {
@@ -8312,7 +8312,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_prefix() */
 
@@ -8385,7 +8385,7 @@ external_link_abs_mainpath(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file from absolute path set for main file */
     if (gid < 0) {
@@ -8409,7 +8409,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_abs_mainpath() */
 
@@ -8473,7 +8473,7 @@ external_link_rel_mainpath(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file from the main file's relative pathname */
     if (gid < 0) {
@@ -8497,7 +8497,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_rel_mainpath() */
 
@@ -8566,7 +8566,7 @@ external_link_cwd(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file from the current working directory */
     if (gid < 0) {
@@ -8590,7 +8590,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_cwd() */
 
@@ -8664,7 +8664,7 @@ external_link_abstar(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file with absolute path */
     if (gid < 0) {
@@ -8688,7 +8688,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_abstar() */
 
@@ -8762,7 +8762,7 @@ external_link_abstar_cur(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file from main file's current working directory */
     if (gid < 0) {
@@ -8786,7 +8786,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_abstar_cur() */
 
@@ -8867,7 +8867,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_reltar() */
 
@@ -8937,7 +8937,7 @@ external_link_chdir(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (HDchdir("..") < 0)
         TEST_ERROR;
@@ -8967,7 +8967,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_chdir() */
 
@@ -9181,7 +9181,7 @@ error:
         H5Oclose(oidB);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_set_elink_fapl1() */
 
@@ -9388,7 +9388,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     free(points);
     free(points_data);
@@ -9515,7 +9515,7 @@ error:
         H5Pclose(core_fapl);
         H5Pclose(stdio_fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_set_elink_fapl3() */
 
@@ -9572,7 +9572,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         group = H5Gcreate2(file1, "/ext_link/group", H5P_DEFAULT, H5P_DEFAULT, gapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (group != FAIL)
         TEST_ERROR;
 
@@ -9603,7 +9603,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         subgroup = H5Gcreate2(file1, "/ext_link/group/subgroup", H5P_DEFAULT, H5P_DEFAULT, gapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (subgroup != FAIL)
         TEST_ERROR;
 
@@ -9623,21 +9623,21 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_TRUNC);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
     H5E_BEGIN_TRY
     {
         ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_EXCL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
     H5E_BEGIN_TRY
     {
         ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_CREAT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
     /* SWMR reader with write access */
@@ -9645,7 +9645,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDWR | H5F_ACC_SWMR_READ);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
     /* SWMR writer with read-only access */
@@ -9653,7 +9653,7 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         ret = H5Pset_elink_acc_flags(gapl, H5F_ACC_RDONLY | H5F_ACC_SWMR_WRITE);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret != FAIL)
         TEST_ERROR;
 
@@ -9769,28 +9769,28 @@ external_set_elink_acc_flags(const char *env_h5_drvr, hid_t fapl, hbool_t new_fo
     {
         file1 = H5Fcreate(filename1, H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (file1 != FAIL)
         TEST_ERROR;
     H5E_BEGIN_TRY
     {
         file1 = H5Fcreate(filename1, H5F_ACC_TRUNC | H5F_ACC_DEFAULT, H5P_DEFAULT, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (file1 != FAIL)
         TEST_ERROR;
     H5E_BEGIN_TRY
     {
         file1 = H5Fopen(filename1, H5F_ACC_DEFAULT, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (file1 != FAIL)
         TEST_ERROR;
     H5E_BEGIN_TRY
     {
         file1 = H5Fopen(filename1, H5F_ACC_RDWR | H5F_ACC_DEFAULT, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (file1 != FAIL)
         TEST_ERROR;
 
@@ -9810,7 +9810,7 @@ error:
         H5Fclose(file2);
         H5Pclose(gapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_set_elink_acc_flags() */
 
@@ -9975,7 +9975,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
     {
         group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (group != FAIL)
         TEST_ERROR;
 
@@ -9987,7 +9987,7 @@ external_set_elink_cb(hid_t fapl, hbool_t new_format)
     {
         group = H5Gopen2(file1, "/group1/ext_link/group2", gapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (group != FAIL)
         TEST_ERROR;
 
@@ -10010,7 +10010,7 @@ error:
         H5Pclose(ret_fapl);
         H5Pclose(fam_fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_set_elink_cb() */
 
@@ -10068,7 +10068,7 @@ external_reset_register(void)
     {
         H5Fdelete(filename, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     PASSED();
     return SUCCEED;
@@ -10078,7 +10078,7 @@ error:
     {
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_reset_register() */
 
@@ -10150,7 +10150,7 @@ external_link_win1(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via main file's CWD*/
     if (gid < 0) {
@@ -10174,7 +10174,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win1() */
 
@@ -10247,7 +10247,7 @@ external_link_win2(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file directly */
     if (gid < 0) {
@@ -10271,7 +10271,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win2() */
 
@@ -10341,7 +10341,7 @@ external_link_win3(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file directly */
     if (gid < 0) {
@@ -10365,7 +10365,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win3() */
 
@@ -10432,7 +10432,7 @@ external_link_win4(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via main file's absolute drive/relative path */
     if (gid < 0) {
@@ -10456,7 +10456,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win4() */
 
@@ -10533,7 +10533,7 @@ external_link_win5(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via main file's rel drive/abs path */
     if (gid < 0) {
@@ -10557,7 +10557,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win5() */
 
@@ -10631,7 +10631,7 @@ external_link_win6(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via target file's rel path in current drive */
     if (gid < 0) {
@@ -10655,7 +10655,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win6() */
 
@@ -10726,7 +10726,7 @@ external_link_win7(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via main file's local host/main drive*/
     if (gid < 0) {
@@ -10750,7 +10750,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win7() */
 
@@ -10826,7 +10826,7 @@ external_link_win8(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file directly */
     if (gid < 0) {
@@ -10850,7 +10850,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win8() */
 
@@ -10921,7 +10921,7 @@ external_link_win9(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "ext_link", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* should be able to find the target file via main file's local host/main drive*/
     if (gid < 0) {
@@ -10945,7 +10945,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_win9() */
 
@@ -10996,7 +10996,7 @@ external_link_recursive(hid_t fapl, hbool_t new_format)
     {
         gid = H5Gopen2(fid, "recursive", H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for recursive external links.");
@@ -11016,7 +11016,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_recursive() */
 
@@ -11170,7 +11170,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_query() */
 
@@ -11263,7 +11263,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_unlink_compact() */
 
@@ -11440,7 +11440,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_unlink_dense() */
 
@@ -11674,7 +11674,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_move() */
 
@@ -11906,7 +11906,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_ride() */
 
@@ -12221,7 +12221,7 @@ error:
         H5Fclose(fid2);
         H5Fclose(fid1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* external_link_closing() */
 
@@ -12307,7 +12307,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 }
 
@@ -12412,7 +12412,7 @@ error:
         H5Fclose(fid2);
         H5Fclose(fid1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end external_link_strong() */
 
@@ -12513,7 +12513,7 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
 
     /* Create symbolic link #1 in temporary directory #1 to file #2 in temporary directory #2 */
     /* (i.e. tmp_links/sym1.h5 -> <full path to>/tmp2_links/extlinks21B.h5) */
-    if (HDsymlink(filename2b, SYMLINK1) < 0 && errno != EEXIST)
+    if (symlink(filename2b, SYMLINK1) < 0 && errno != EEXIST)
         TEST_ERROR;
 
     /* set up name for file #3 in temporary directory #2: "tmp2_links/extlinks21C" */
@@ -12527,7 +12527,7 @@ external_symlink(const char *env_h5_drvr, hid_t fapl, hbool_t new_format)
 
     /* Create symbolic link #2 in temporary directory #2 to file #4 in temporary directory #1 */
     /* (i.e. tmp2_links/sym2.h5 -> <full path to>/tmp_links/extlinks21D.h5) */
-    if (HDsymlink(filename4b, SYMLINK2) < 0 && errno != EEXIST)
+    if (symlink(filename4b, SYMLINK2) < 0 && errno != EEXIST)
         TEST_ERROR;
 
     /* set up name for file #5 in temporary directory #1: "tmp_links/extlinks21E" */
@@ -12689,7 +12689,7 @@ error:
         H5Fclose(file2);
         H5Fclose(file1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     free(filename1);
     free(filename2a);
@@ -14141,7 +14141,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_hard_links() */
 
@@ -14353,7 +14353,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_link_reregister() */
 
@@ -14664,7 +14664,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_callbacks() */
 
@@ -14819,7 +14819,7 @@ error:
         H5Gclose(gid2);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end lapl_udata() */
 
@@ -15091,7 +15091,7 @@ ud_link_errors(hid_t fapl, hbool_t new_format)
         if (H5Lcreate_ud(fid, "/ud_link", (H5L_type_t)UD_CBFAIL_TYPE, NULL, 1, H5P_DEFAULT, H5P_DEFAULT) >= 0)
             TEST_ERROR;
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Create a user-defined link to the group. */
     HDstrcpy(group_name, "/group");
@@ -15199,7 +15199,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end ud_link_errors() */
 
@@ -15345,7 +15345,7 @@ lapl_nlinks(hid_t fapl, hbool_t new_format)
     {
         gid = H5Oopen(fid, "soft5", plist);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (gid >= 0) {
         H5_FAILED();
         HDputs("    Should have failed for sequence of too many nested links.");
@@ -15507,7 +15507,7 @@ error:
         H5Pclose(plist);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end lapl_nlinks() */
 
@@ -15619,7 +15619,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end linkinfo() */
 
@@ -15671,7 +15671,7 @@ error:
     {
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end check_all_closed() */
 
@@ -15800,7 +15800,7 @@ error:
     {
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end build_visit_file() */
 
@@ -15903,7 +15903,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_visit() */
 
@@ -15991,7 +15991,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_visit_by_name() */
 
@@ -16098,7 +16098,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end obj_visit() */
 
@@ -16195,7 +16195,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end obj_visit_by_name() */
 
@@ -16278,7 +16278,7 @@ error:
     {
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end obj_visit_stop() */
 
@@ -16756,7 +16756,7 @@ error:
         H5Pclose(gcpl2);
         H5Pclose(fcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_filters() */
 
@@ -17085,7 +17085,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end obj_exists() */
 
@@ -17130,7 +17130,7 @@ corder_create_empty(hid_t fapl)
     {
         ret = H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_INDEXED);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret > 0) {
         H5_FAILED();
         HDputs(
@@ -17214,7 +17214,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_create_empty() */
 
@@ -17356,7 +17356,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_create_compact() */
 
@@ -17519,7 +17519,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_create_dense() */
 
@@ -17815,7 +17815,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_transition() */
 
@@ -17966,7 +17966,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end corder_delete() */
 
@@ -18250,7 +18250,7 @@ link_info_by_idx(hid_t fapl)
                 ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -18258,7 +18258,7 @@ link_info_by_idx(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)0,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -18302,7 +18302,7 @@ link_info_by_idx(hid_t fapl)
                 ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -18310,7 +18310,7 @@ link_info_by_idx(hid_t fapl)
                 ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -18318,7 +18318,7 @@ link_info_by_idx(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -18362,7 +18362,7 @@ link_info_by_idx(hid_t fapl)
                 ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -18370,7 +18370,7 @@ link_info_by_idx(hid_t fapl)
                 ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)u, &linfo,
                                           H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (ret >= 0)
                 TEST_ERROR;
             H5E_BEGIN_TRY
@@ -18378,7 +18378,7 @@ link_info_by_idx(hid_t fapl)
                 name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u,
                                               tmpname, (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
             }
-            H5E_END_TRY;
+            H5E_END_TRY
             if (name_len >= 0)
                 TEST_ERROR;
 
@@ -18407,7 +18407,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_info_by_idx() */
 
@@ -18596,7 +18596,7 @@ link_info_by_idx_old(hid_t fapl)
             ret = H5Lget_info_by_idx2(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, &linfo,
                                       H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
         H5E_BEGIN_TRY
@@ -18604,7 +18604,7 @@ link_info_by_idx_old(hid_t fapl)
             name_len = H5Lget_name_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)u, tmpname,
                                           (size_t)NAME_BUF_SIZE, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (name_len >= 0)
             TEST_ERROR;
 
@@ -18631,7 +18631,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end link_info_by_idx_old() */
 
@@ -18738,7 +18738,7 @@ delete_by_idx(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -18747,7 +18747,7 @@ delete_by_idx(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, "None", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -18779,7 +18779,7 @@ delete_by_idx(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -18853,7 +18853,7 @@ delete_by_idx(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -18905,7 +18905,7 @@ delete_by_idx(hid_t fapl)
                 {
                     ret = H5Ldelete_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -19039,7 +19039,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 } /* end delete_by_idx() */
 
@@ -19102,7 +19102,7 @@ delete_by_idx_old(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -19133,7 +19133,7 @@ delete_by_idx_old(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -19142,7 +19142,7 @@ delete_by_idx_old(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -19193,7 +19193,7 @@ delete_by_idx_old(hid_t fapl)
         {
             ret = H5Ldelete_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -19328,7 +19328,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end delete_by_idx_old() */
@@ -19607,7 +19607,7 @@ link_iterate_check(hid_t group_id, H5_index_t idx_type, H5_iter_order_t order, u
     {
         ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_fail_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -19770,7 +19770,7 @@ link_iterate(hid_t fapl)
                 {
                     ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -19803,7 +19803,7 @@ link_iterate(hid_t fapl)
                 {
                     ret = H5Literate2(group_id, idx_type, order, &skip, link_iterate_cb, NULL);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -19842,7 +19842,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (visited)
         free(visited);
@@ -20101,7 +20101,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
     {
         ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -20111,7 +20111,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
     {
         ret = H5Literate2((hid_t)(-1), H5_INDEX_NAME, order, &skip, link_iterate_fail_cb, NULL);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 
@@ -20120,7 +20120,7 @@ link_iterate_old_check(hid_t group_id, H5_iter_order_t order, unsigned max_links
     {
         ret = H5Giterate((hid_t)(-1), ".", &gskip, group_iterate_old_cb, iter_info);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (ret >= 0)
         TEST_ERROR;
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -20213,7 +20213,7 @@ link_iterate_old(hid_t fapl)
         {
             ret = H5Literate2(group_id, H5_INDEX_NAME, order, &skip, link_iterate_old_cb, NULL);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -20224,7 +20224,7 @@ link_iterate_old(hid_t fapl)
         {
             ret = H5Literate2(group_id, H5_INDEX_CRT_ORDER, order, &skip, link_iterate_old_cb, NULL);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -20256,7 +20256,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (visited)
         free(visited);
@@ -20506,7 +20506,7 @@ open_by_idx(hid_t fapl)
                 {
                     ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)0, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -20546,7 +20546,7 @@ open_by_idx(hid_t fapl)
                 {
                     ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -20590,7 +20590,7 @@ open_by_idx(hid_t fapl)
                 {
                     ret = H5Oopen_by_idx(group_id, ".", idx_type, order, (hsize_t)u, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -20637,7 +20637,7 @@ error:
         H5Fclose(file_id);
         H5Fclose(mount_file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (objno)
         free(objno);
@@ -20821,7 +20821,7 @@ open_by_idx_old(hid_t fapl)
         {
             ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -20860,7 +20860,7 @@ open_by_idx_old(hid_t fapl)
         {
             ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -20869,7 +20869,7 @@ open_by_idx_old(hid_t fapl)
         {
             ret = H5Oopen_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -20905,7 +20905,7 @@ error:
         H5Fclose(file_id);
         H5Fclose(mount_file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end open_by_idx_old() */
@@ -21129,7 +21129,7 @@ object_info(hid_t fapl)
                     ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo,
                                               H5O_INFO_BASIC, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -21186,7 +21186,7 @@ object_info(hid_t fapl)
                     ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo,
                                               H5O_INFO_BASIC, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -21247,7 +21247,7 @@ object_info(hid_t fapl)
                     ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo,
                                               H5O_INFO_BASIC, H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -21290,7 +21290,7 @@ error:
         H5Gclose(soft_group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (objno)
         free(objno);
@@ -21447,7 +21447,7 @@ object_info_old(hid_t fapl)
             ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &oinfo, H5O_INFO_BASIC,
                                       H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -21503,7 +21503,7 @@ object_info_old(hid_t fapl)
             ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &oinfo, H5O_INFO_BASIC,
                                       H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -21513,7 +21513,7 @@ object_info_old(hid_t fapl)
             ret = H5Oget_info_by_idx3(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)(u - 1), &oinfo,
                                       H5O_INFO_BASIC, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -21549,7 +21549,7 @@ error:
         H5Gclose(soft_group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end object_info_old() */
@@ -21680,7 +21680,7 @@ group_info(hid_t fapl)
                     ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info,
                                              H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -21872,7 +21872,7 @@ group_info(hid_t fapl)
                     ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info,
                                              H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -22064,7 +22064,7 @@ group_info(hid_t fapl)
                     ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info,
                                              H5P_DEFAULT);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
                 if (ret >= 0)
                     TEST_ERROR;
 
@@ -22098,7 +22098,7 @@ error:
         H5Gclose(soft_group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end group_info() */
@@ -22160,7 +22160,7 @@ group_info_old(hid_t fapl)
         {
             ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)0, &grp_info, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -22350,7 +22350,7 @@ group_info_old(hid_t fapl)
         {
             ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_NAME, order, (hsize_t)u, &grp_info, H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -22360,7 +22360,7 @@ group_info_old(hid_t fapl)
             ret = H5Gget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, order, (hsize_t)0, &grp_info,
                                      H5P_DEFAULT);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
         if (ret >= 0)
             TEST_ERROR;
 
@@ -22387,7 +22387,7 @@ error:
         H5Gclose(soft_group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end group_info_old() */
@@ -22624,7 +22624,7 @@ error:
         H5Gclose(group_id);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end timestamps() */