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

33 files changed, 109 insertions, 114 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index ea268f3..c617ec3 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -1088,7 +1088,7 @@ done:
         if (fapl2_id != H5P_DEFAULT)
             H5Pclose(fapl2_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
 
@@ -1929,7 +1929,7 @@ done:
         H5Gclose(grp2_id);
         /* enable error reporting */
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(": %d - errstat:%d", nfound, opts->err_stat);
 
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c
index 3f504eb..825ca06 100644
--- a/tools/lib/h5diff_array.c
+++ b/tools/lib/h5diff_array.c
@@ -96,7 +96,7 @@ static hbool_t not_comparable;
     }
 
 #define PER_UNSIGN(TYPE, A, B)                                                                               \
-    {                                                                                                        \
+    do {                                                                                                     \
         per            = -1;                                                                                 \
         not_comparable = FALSE;                                                                              \
         both_zero      = FALSE;                                                                              \
@@ -106,7 +106,7 @@ static hbool_t not_comparable;
             per = ABS((double)((TYPE)((B) - (A))) / (double)(A));                                            \
         else                                                                                                 \
             not_comparable = TRUE;                                                                           \
-    }
+    } while (0)
 
 #define PDIFF(a, b) (((b) > (a)) ? ((b) - (a)) : ((a) - (b)))
 
@@ -684,7 +684,7 @@ diff_datum(void *_mem1, void *_mem2, hsize_t elemtno, diff_opt_t *opts, hid_t co
                     }
                     /* enable error reporting */
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
             }
             break;
 
@@ -1371,7 +1371,7 @@ diff_region(hid_t obj1_id, hid_t obj2_id, hid_t region1_id, hid_t region2_id, di
         npoints1 = H5Sget_select_elem_npoints(region1_id);
         npoints2 = H5Sget_select_elem_npoints(region2_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     H5TOOLS_DEBUG("blocks: 1=%" PRIdHSIZE "-2=%" PRIdHSIZE, nblocks1, nblocks2);
     H5TOOLS_DEBUG("points: 1=%" PRIdHSIZE "-2=%" PRIdHSIZE, npoints1, npoints2);
 
@@ -3117,7 +3117,7 @@ done:
     {
         H5Pclose(dxpl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (buf)
         HDfree(buf);
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c
index aa64fa5..5019a14 100644
--- a/tools/lib/h5diff_attr.c
+++ b/tools/lib/h5diff_attr.c
@@ -304,7 +304,7 @@ done:
         H5Aclose(attr1_id);
         H5Aclose(attr2_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
 
@@ -585,7 +585,7 @@ done:
         H5Sclose(space1_id);
         H5Sclose(space2_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
 
@@ -678,7 +678,7 @@ done:
         H5Aclose(attr1_id);
         H5Aclose(attr2_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(" - errstat:%d", opts->err_stat);
     return nfound_total;
diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c
index b5c3290..61f4044 100644
--- a/tools/lib/h5diff_dset.c
+++ b/tools/lib/h5diff_dset.c
@@ -95,7 +95,7 @@ done:
         H5Dclose(did2);
         /* enable error reporting */
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(":%d - errstat:%d", nfound, opts->err_stat);
     return nfound;
@@ -931,7 +931,7 @@ done:
         H5Tclose(m_tid2);
         /* enable error reporting */
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     H5TOOLS_ENDDEBUG(": %d with nfound:%d", ret_value, nfound);
     return nfound;
diff --git a/tools/lib/h5tools.c b/tools/lib/h5tools.c
index 189aafd..396de54 100644
--- a/tools/lib/h5tools.c
+++ b/tools/lib/h5tools.c
@@ -975,7 +975,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
         {
             fid = H5Fopen(fname, flags, fapl_id);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
     }
 
     /* If we succeeded in opening the file, we're done. */
@@ -1036,7 +1036,7 @@ h5tools_fopen(const char *fname, unsigned flags, hid_t fapl_id, hbool_t use_spec
                 {
                     fid = h5tools_fopen(fname, flags, tmp_fapl_id, TRUE, drivername, drivername_size);
                 }
-                H5E_END_TRY;
+                H5E_END_TRY
 
                 if (fid >= 0) {
                     used_fapl_id = tmp_fapl_id;
diff --git a/tools/lib/h5tools_dump.c b/tools/lib/h5tools_dump.c
index 57a1712..d444c8c 100644
--- a/tools/lib/h5tools_dump.c
+++ b/tools/lib/h5tools_dump.c
@@ -3493,8 +3493,7 @@ h5tools_dump_dcpl(FILE *stream, const h5tool_format_t *info, h5tools_context_t *
                                                (hsize_t)0, (hsize_t)0);
                         break;
                     case H5Z_FILTER_SZIP:
-                        szip_options_mask = cd_values[0];
-                        ;
+                        szip_options_mask     = cd_values[0];
                         szip_pixels_per_block = cd_values[1];
 
                         h5tools_str_append(&buffer, "%s %s", SZIP, BEGIN);
@@ -3947,7 +3946,7 @@ h5tools_print_packed_bits(h5tools_str_t *buffer, hid_t type)
         error_msg("Packed Bit offset+length value(%u) too large. Max is %d\n",
                   packed_data_offset + packed_data_length, packed_bits_size);
         packed_data_mask = 0;
-    };
+    }
     h5tools_str_append(buffer, "%s %s=%u %s=%u", PACKED_BITS, PACKED_OFFSET, packed_data_offset,
                        PACKED_LENGTH, packed_data_length);
 }
diff --git a/tools/lib/h5tools_str.c b/tools/lib/h5tools_str.c
index 223eb61..dff9aa0 100644
--- a/tools/lib/h5tools_str.c
+++ b/tools/lib/h5tools_str.c
@@ -459,7 +459,7 @@ h5tools_str_dump_space_blocks(h5tools_str_t *str, hid_t rspace, const h5tool_for
     {
         snblocks = H5Sget_select_hyper_nblocks(rspace);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Print block information */
     if (snblocks > 0) {
@@ -520,7 +520,7 @@ h5tools_str_dump_space_points(h5tools_str_t *str, hid_t rspace, const h5tool_for
     {
         snpoints = H5Sget_select_elem_npoints(rspace);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* Print point information */
     if (snpoints > 0) {
diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c
index 564dcba..b55d1f5 100644
--- a/tools/lib/h5trav.c
+++ b/tools/lib/h5trav.c
@@ -119,7 +119,6 @@ trav_token_add(trav_addr_t *visited, H5O_token_t *token, const char *path)
     /* Allocate space if necessary */
     if (visited->nused == visited->nalloc) {
         visited->nalloc = MAX(1, visited->nalloc * 2);
-        ;
         visited->objs =
             (trav_addr_path_t *)HDrealloc(visited->objs, visited->nalloc * sizeof(trav_addr_path_t));
     } /* end if */
@@ -322,8 +321,7 @@ trav_info_add(trav_info_t *info, const char *path, h5trav_type_t obj_type)
         /* Allocate space if necessary */
         if (info->nused == info->nalloc) {
             info->nalloc = MAX(1, info->nalloc * 2);
-            ;
-            info->paths = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
+            info->paths  = (trav_path_t *)HDrealloc(info->paths, info->nalloc * sizeof(trav_path_t));
         } /* end if */
 
         /* Append it */
diff --git a/tools/src/h5copy/h5copy.c b/tools/src/h5copy/h5copy.c
index 9756d11..72cd88e 100644
--- a/tools/src/h5copy/h5copy.c
+++ b/tools/src/h5copy/h5copy.c
@@ -488,7 +488,7 @@ done:
         H5Fclose(fid_src);
         H5Fclose(fid_dst);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     leave(ret_value);
 }
diff --git a/tools/src/h5diff/ph5diff_main.c b/tools/src/h5diff/ph5diff_main.c
index 64b1f28..f65d2b0 100644
--- a/tools/src/h5diff/ph5diff_main.c
+++ b/tools/src/h5diff/ph5diff_main.c
@@ -150,7 +150,7 @@ ph5diff_worker(int nID)
                 }
                 /* enable error reporting */
             }
-            H5E_END_TRY;
+            H5E_END_TRY
         }
         /* Check for work */
         else if (Status.MPI_TAG == MPI_TAG_ARGS) {
diff --git a/tools/src/h5dump/h5dump_ddl.c b/tools/src/h5dump/h5dump_ddl.c
index 3eaa2f9..9d59c95 100644
--- a/tools/src/h5dump/h5dump_ddl.c
+++ b/tools/src/h5dump/h5dump_ddl.c
@@ -1649,7 +1649,7 @@ error:
         H5Oclose(oid);
         H5Aclose(attr_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     dump_indent -= COL;
 }
 
diff --git a/tools/src/h5dump/h5dump_xml.c b/tools/src/h5dump/h5dump_xml.c
index d0bc7e4..80f9142 100644
--- a/tools/src/h5dump/h5dump_xml.c
+++ b/tools/src/h5dump/h5dump_xml.c
@@ -3079,7 +3079,7 @@ error:
         H5Tclose(type);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 }
 
@@ -3249,7 +3249,7 @@ error:
         H5Tclose(type);
         H5Sclose(space);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return FAIL;
 }
 
diff --git a/tools/src/h5format_convert/h5format_convert.c b/tools/src/h5format_convert/h5format_convert.c
index 200f735..82f91e7 100644
--- a/tools/src/h5format_convert/h5format_convert.c
+++ b/tools/src/h5format_convert/h5format_convert.c
@@ -162,7 +162,6 @@ parse_command_line(int argc, const char *const *argv)
 
 error:
     return -1;
-    ;
 } /* parse_command_line() */
 
 /*-------------------------------------------------------------------------
@@ -334,7 +333,7 @@ error:
         H5Pclose(dcpl);
         H5Dclose(did);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* convert() */
diff --git a/tools/src/h5import/h5import.c b/tools/src/h5import/h5import.c
index 5a2fae3..428d32f 100644
--- a/tools/src/h5import/h5import.c
+++ b/tools/src/h5import/h5import.c
@@ -1021,7 +1021,7 @@ processStrData(FILE *strm, struct Input *in, hid_t file_id)
 
         /*enable error reporting */
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if ((space_id = H5Screate_simple(1, dims, NULL)) < 0)
         goto out;
@@ -1147,7 +1147,7 @@ processStrHDFData(FILE *strm, struct Input *in, hid_t file_id)
 
         /*enable error reporting */
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 #ifdef H5DEBUGIMPORT
     HDprintf("processStrHDFData DATATYPE STRING groups created\n");
 #endif
@@ -1249,7 +1249,7 @@ out:
         H5Sclose(mspace_id);
         H5Tclose(type_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return (-1);
 }
@@ -4629,7 +4629,7 @@ process(struct Options *opt)
             }
         }
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     for (k = 0; k < opt->fcount; k++) {
         in = &(opt->infiles[k].in);
@@ -4677,7 +4677,7 @@ process(struct Options *opt)
 
                 /*enable error reporting */
             }
-            H5E_END_TRY;
+            H5E_END_TRY
 
             /*create data type */
             intype  = createInputDataType(in);
@@ -4733,7 +4733,7 @@ process(struct Options *opt)
 
                 /*enable error reporting */
             }
-            H5E_END_TRY;
+            H5E_END_TRY
 
             /* write dataset */
             if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) {
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index d130b38..1c8c24a 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -109,7 +109,6 @@ parse_command_line(int argc, const char *const *argv)
                 if (input_file)
                     h5tools_set_input_file(input_file, 1);
                 break;
-                ;
 
             case 'u':
                 ub_file = HDstrdup(H5_optarg);
diff --git a/tools/src/h5repack/h5repack.c b/tools/src/h5repack/h5repack.c
index c58943b..0bb0082 100644
--- a/tools/src/h5repack/h5repack.c
+++ b/tools/src/h5repack/h5repack.c
@@ -575,7 +575,7 @@ done:
         H5Tclose(ftype_id);
         H5Aclose(attr_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 } /* end copy_attr() */
@@ -884,7 +884,7 @@ done:
         H5Dclose(did);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (travt)
         trav_table_free(travt);
     return ret_value;
diff --git a/tools/src/h5repack/h5repack_copy.c b/tools/src/h5repack/h5repack_copy.c
index 42c393b..5275481 100644
--- a/tools/src/h5repack/h5repack_copy.c
+++ b/tools/src/h5repack/h5repack_copy.c
@@ -390,7 +390,7 @@ done:
             H5Fclose(fidout);
             H5Fclose(fidin);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
     }
     if (travt)
         trav_table_free(travt);
@@ -1455,7 +1455,7 @@ done:
         {
             named_datatype_free(&named_dt_head, 1);
         }
-        H5E_END_TRY;
+        H5E_END_TRY
     }
 
     /* free link info path */
@@ -1480,7 +1480,7 @@ done:
         H5Tclose(type_in);
         H5Tclose(type_out);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     /* free */
     if (buf != NULL)
diff --git a/tools/src/h5repack/h5repack_parse.c b/tools/src/h5repack/h5repack_parse.c
index 9ffee0a..cee85ac 100644
--- a/tools/src/h5repack/h5repack_parse.c
+++ b/tools/src/h5repack/h5repack_parse.c
@@ -457,7 +457,7 @@ parse_filter(const char *str, unsigned *n_objs, filter_info_t *filt, pack_opt_t
             break;
         default:
             break;
-    };
+    }
 
     return obj_list;
 }
diff --git a/tools/src/h5repack/h5repack_refs.c b/tools/src/h5repack/h5repack_refs.c
index 3c0be30..6bc4a31 100644
--- a/tools/src/h5repack/h5repack_refs.c
+++ b/tools/src/h5repack/h5repack_refs.c
@@ -172,7 +172,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                              H5Rdereference2(dset_in, H5P_DEFAULT, H5R_OBJECT, &buf[u])) < 0)
                                         continue;
                                 }
-                                H5E_END_TRY;
+                                H5E_END_TRY
 
                                 /* get the name. a valid name could only occur
                                  * in the second traversal of the file
@@ -260,7 +260,7 @@ do_copy_refobjs(hid_t fidin, hid_t fidout, trav_table_t *travt, pack_opt_t *opti
                                                                      &buf[u])) < 0)
                                         continue;
                                 }
-                                H5E_END_TRY;
+                                H5E_END_TRY
 
                                 /* get the name. a valid name could only occur
                                  * in the second traversal of the file
@@ -408,7 +408,7 @@ done:
         H5Tclose(type_in);
         named_datatype_free(&named_dt_head, 1);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 }
@@ -795,7 +795,7 @@ done:
         H5Aclose(attr_id);
         H5Aclose(attr_out);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 }
@@ -876,7 +876,7 @@ done:
         H5Sclose(space_id);
         H5Oclose(ref_obj_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 }
diff --git a/tools/src/h5repack/h5repack_verify.c b/tools/src/h5repack/h5repack_verify.c
index bccf034..572aa48 100644
--- a/tools/src/h5repack/h5repack_verify.c
+++ b/tools/src/h5repack/h5repack_verify.c
@@ -286,7 +286,7 @@ done:
         if (travt)
             trav_table_free(travt);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 } /* h5repack_verify() */
@@ -475,7 +475,7 @@ done:
         if (trav)
             trav_table_free(trav);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return ret_value;
 }
diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c
index ef5b25f..f83b379 100644
--- a/tools/src/misc/h5delete.c
+++ b/tools/src/misc/h5delete.c
@@ -57,7 +57,7 @@ main(int argc, char *argv[])
         /* Only uses the environment variable at this time */
         ret = (int)H5Fdelete(name, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (ret < 0 && !quiet)
         HDfprintf(stderr, "Unable to delete storage at: %s\n", name);
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index c01ec0f..e0201f9 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -483,7 +483,7 @@ main(int argc, char *argv[])
     {
         file = H5Fopen(dst_gen_name, H5F_ACC_RDWR, fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (file >= 0) {
         if (H5Fclose(file) < 0) {
diff --git a/tools/test/h5diff/h5diffgentest.c b/tools/test/h5diff/h5diffgentest.c
index c59d3b5..bd1a50f 100644
--- a/tools/test/h5diff/h5diffgentest.c
+++ b/tools/test/h5diff/h5diffgentest.c
@@ -542,7 +542,7 @@ error:
         H5Sclose(space);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* test_onion_1d_dset */
@@ -976,7 +976,7 @@ error:
         H5Pclose(fapl_id);
         H5Pclose(onion_info.backing_fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* test_onion_dset_extension */
@@ -5688,7 +5688,7 @@ error:
         H5Tclose(tid1);
         H5Tclose(tid2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 static hid_t
@@ -8681,7 +8681,7 @@ out:
         H5Dclose(did);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -8735,7 +8735,7 @@ error:
         H5Fclose(fid1);
         H5Fclose(fid2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 /*-------------------------------------------------------------------------
@@ -8819,7 +8819,7 @@ error:
         H5Dclose(did);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* end write_dset() */
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 1fd512c..ba4f0a4 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -2677,7 +2677,7 @@ error:
         H5Sclose(space);
         H5Dclose(dset);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 static void
@@ -5396,7 +5396,7 @@ out:
     {
         H5Dclose(dsid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -6567,7 +6567,7 @@ out:
         H5Dclose(did);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 /*-------------------------------------------------------------------------
@@ -6752,7 +6752,7 @@ out:
         H5Pclose(fcpl_id);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 /*-------------------------------------------------------------------------
@@ -7011,7 +7011,7 @@ out:
         H5Pclose(tcpl_id);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 }
 
 /*-------------------------------------------------------------------------
@@ -11349,7 +11349,7 @@ error:
         H5Sclose(sid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 } /* gen_err_attr_dspace() */
 
 /* Structure to collect the onion filepaths in one place. */
@@ -11575,7 +11575,7 @@ error:
         H5Sclose(space);
         H5Fclose(file_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* gent_onion_1d_dset */
@@ -12012,7 +12012,7 @@ error:
         H5Pclose(fapl_id);
         H5Pclose(onion_info.backing_fapl_id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return -1;
 } /* gent_onion_dset_extension */
diff --git a/tools/test/h5format_convert/h5fc_gentest.c b/tools/test/h5format_convert/h5fc_gentest.c
index 26ee4ca..e0402b5 100644
--- a/tools/test/h5format_convert/h5fc_gentest.c
+++ b/tools/test/h5format_convert/h5fc_gentest.c
@@ -293,7 +293,7 @@ error:
         H5Fclose(fcpl);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
 } /* gen_non() */
 
@@ -373,7 +373,7 @@ error:
         H5Fclose(fid);
         H5Pclose(fapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
 } /* gen_edge() */
 
@@ -518,7 +518,7 @@ error:
         H5Pclose(fapl);
         H5Pclose(fcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
 } /* gen_err_level() */
 
@@ -774,7 +774,7 @@ error:
         H5Pclose(fapl);
         H5Pclose(fcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
 } /* end gen_ext() */
 
diff --git a/tools/test/h5jam/h5jamgentest.c b/tools/test/h5jam/h5jamgentest.c
index bfeb92d..1376e78 100644
--- a/tools/test/h5jam/h5jamgentest.c
+++ b/tools/test/h5jam/h5jamgentest.c
@@ -353,7 +353,7 @@ error:
         H5Sclose(space);
         H5Pclose(create_plist);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 }
diff --git a/tools/test/h5repack/h5repacktst.c b/tools/test/h5repack/h5repacktst.c
index d8a4732..fc0fe54 100644
--- a/tools/test/h5repack/h5repacktst.c
+++ b/tools/test/h5repack/h5repacktst.c
@@ -2303,7 +2303,7 @@ out:
         H5Tclose(tid);
         H5Pclose(gcplid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -2373,7 +2373,7 @@ out:
         H5Gclose(rid);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -2441,7 +2441,7 @@ out:
         H5Gclose(g2id);
         H5Gclose(g3id);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -2515,7 +2515,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -2600,7 +2600,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -2670,7 +2670,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -2743,7 +2743,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -2851,7 +2851,7 @@ error:
         H5Sclose(sid);
         H5Dclose(dsid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -2953,7 +2953,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -3137,7 +3137,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -3235,7 +3235,7 @@ out:
         H5Dclose(did);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -3331,7 +3331,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -3404,7 +3404,7 @@ error:
 
         H5Sclose(s_sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(s_buf);
 
@@ -3547,7 +3547,7 @@ error:
         H5Pclose(dcpl2);
         H5Pclose(dcpl3);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf1);
     HDfree(buf2);
@@ -3604,7 +3604,7 @@ out:
         H5Sclose(sid);
         H5Dclose(did);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -3686,7 +3686,7 @@ out:
         H5Sclose(m_sid);
         H5Dclose(did);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -3740,7 +3740,7 @@ out:
         H5Sclose(sid);
         H5Dclose(did);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -3800,7 +3800,7 @@ out:
         H5Pclose(fcpl);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (fd >= 0)
         HDclose(fd);
 
@@ -3870,7 +3870,7 @@ out:
         H5Pclose(fcpl);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     if (fd >= 0)
         HDclose(fd);
 
@@ -4640,7 +4640,7 @@ out:
         H5Dclose(did);
         H5Tclose(tid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -4749,7 +4749,7 @@ out:
         H5Dclose(did1);
         H5Dclose(did2);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return retval;
 }
@@ -5888,7 +5888,7 @@ out:
         H5Sclose(sid);
         H5Tclose(tid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -5941,7 +5941,7 @@ out:
     {
         H5Dclose(did);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -6003,7 +6003,7 @@ out:
         H5Dclose(did);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -6044,7 +6044,7 @@ out:
         H5Aclose(aid);
         H5Sclose(sid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 }
 
@@ -6170,7 +6170,7 @@ out:
         H5Dclose(did);
         H5Gclose(gid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return -1;
 } /* end make_named_dtype() */
 
diff --git a/tools/test/h5stat/h5stat_gentest.c b/tools/test/h5stat/h5stat_gentest.c
index a8aefba..47c06ad 100644
--- a/tools/test/h5stat/h5stat_gentest.c
+++ b/tools/test/h5stat/h5stat_gentest.c
@@ -143,7 +143,7 @@ error:
         H5Gclose(gid);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 } /* gen_newgrat_file() */
@@ -348,7 +348,7 @@ error:
         H5Sclose(sid4);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 
@@ -453,7 +453,7 @@ error:
         H5Dclose(did2);
 #endif
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 
@@ -575,7 +575,7 @@ error:
         H5Aclose(aid2);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     if (fd >= 0)
         HDclose(fd);
diff --git a/tools/test/misc/h5clear_gentest.c b/tools/test/misc/h5clear_gentest.c
index 666a3f7..3ea6788 100644
--- a/tools/test/misc/h5clear_gentest.c
+++ b/tools/test/misc/h5clear_gentest.c
@@ -138,7 +138,7 @@ error:
         H5Pclose(fapl);
         H5Pclose(dcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     HDfree(buf);
 
@@ -313,7 +313,7 @@ error:
         H5Fclose(fid);
         H5Pclose(fcpl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 } /* gen_enhance_files() */
 
diff --git a/tools/test/misc/repart_test.c b/tools/test/misc/repart_test.c
index 5c3ebf2..ac05aab 100644
--- a/tools/test/misc/repart_test.c
+++ b/tools/test/misc/repart_test.c
@@ -77,7 +77,7 @@ error:
         H5Pclose(fapl_id);
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 
@@ -116,7 +116,7 @@ error:
     {
         H5Fclose(fid);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     return FAIL;
 
diff --git a/tools/test/misc/talign.c b/tools/test/misc/talign.c
index 7764e34..4c145ba 100644
--- a/tools/test/misc/talign.c
+++ b/tools/test/misc/talign.c
@@ -66,7 +66,7 @@ main(void)
     {
         (void)H5Ldelete(fil, setname, H5P_DEFAULT);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
 
     cs6 = H5Tcopy(H5T_C_S1);
     H5Tset_size(cs6, sizeof(string5));
diff --git a/tools/test/perform/chunk_cache.c b/tools/test/perform/chunk_cache.c
index 9f6554d..7daeb68 100644
--- a/tools/test/perform/chunk_cache.c
+++ b/tools/test/perform/chunk_cache.c
@@ -144,7 +144,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(dataspace);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDfree(data);
 
     return 1;
@@ -209,7 +209,7 @@ error:
         H5Pclose(dcpl);
         H5Sclose(dataspace);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     HDfree(data);
 
     return 1;
@@ -286,7 +286,7 @@ error:
         H5Sclose(memspace);
         H5Pclose(dapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -365,7 +365,7 @@ error:
         H5Sclose(memspace);
         H5Pclose(dapl);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
diff --git a/tools/test/perform/direct_write_perf.c b/tools/test/perform/direct_write_perf.c
index 0d94cf5..016c9b7 100644
--- a/tools/test/perform/direct_write_perf.c
+++ b/tools/test/perform/direct_write_perf.c
@@ -272,7 +272,7 @@ error:
         H5Pclose(cparms);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -338,7 +338,7 @@ error:
         H5Pclose(dxpl);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -403,7 +403,7 @@ error:
         H5Pclose(dxpl);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -495,7 +495,7 @@ error:
         H5Pclose(dxpl);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }
 
@@ -587,7 +587,7 @@ error:
         H5Pclose(dxpl);
         H5Fclose(file);
     }
-    H5E_END_TRY;
+    H5E_END_TRY
     return 1;
 }