Fixes the last of the -Wextra-semi-stmt warnings (#3326)

* Fixed extra semi warning by adjusting alternative macro definitions

* Find-replace H5E_END_TRY; -> H5E_END_TRY

* Made H5Epush_goto a do-while loop, fixed indentation

* Made GOTOERROR and ERRMSG do-while loops

* Made Hgoto_error and Hgoto_done  do-while loops

* Made vrfy_cint_type and vrfy_ctype  do-while loops

* Made TEST_TYPE_CONTIG and others do-while loops

* Removed extraneous semi-colons

* Committing clang-format changes

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/test/use_disable_mdc_flushes.c b/test/use_disable_mdc_flushes.c
index d11f71c..49dfa96 100644
--- a/test/use_disable_mdc_flushes.c
+++ b/test/use_disable_mdc_flushes.c
@@ -35,10 +35,10 @@ static const char *progname_g = "use_disable_mdc_flushes"; /* program name */
 #define UC_RANK       3                /* use case dataset rank */
 #define Chunksize_DFT 256              /* chunksize default */
 #define Hgoto_error(val)                                                                                     \
-    {                                                                                                        \
+    do {                                                                                                     \
         ret_value = val;                                                                                     \
         goto done;                                                                                           \
-    }
+    } while (0)
 
 static char   *filename_g;
 static hsize_t nplanes_g;
@@ -112,14 +112,14 @@ parse_option(int argc, char *const argv[])
                     fprintf(stderr, "bad number of planes %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
-                };
+                }
                 break;
             case 's': /* use swmr file open mode */
                 if ((use_swmr_g = atoi(optarg)) < 0) {
                     fprintf(stderr, "swmr value should be 0(no) or 1(yes)\n");
                     usage(progname_g);
                     Hgoto_error(-1);
-                };
+                }
                 break;
             case 'y': /* Number of planes per chunk */
                 if ((chunkplanes_g = atoi(optarg)) <= 0) {
@@ -127,14 +127,14 @@ parse_option(int argc, char *const argv[])
                             optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
-                };
+                }
                 break;
             case 'z': /* size of chunk=(z,z) */
                 if ((chunksize_g = atoi(optarg)) <= 0) {
                     fprintf(stderr, "bad chunksize %s, must be a positive integer\n", optarg);
                     usage(progname_g);
                     Hgoto_error(-1);
-                };
+                }
                 break;
             case '?':
                 fprintf(stderr, "getopt returned '%c'.\n", c);
@@ -152,7 +152,7 @@ parse_option(int argc, char *const argv[])
         if ((filename_g = (char *)malloc(HDstrlen(progname_g) + 4)) == NULL) {
             fprintf(stderr, "malloc: failed\n");
             Hgoto_error(-1);
-        };
+        }
         HDstrcpy(filename_g, progname_g);
         HDstrcat(filename_g, ".h5");
     }
@@ -375,7 +375,7 @@ write_file(void)
     if ((buffer = (UC_CTYPE *)malloc((size_t)memdims[1] * (size_t)memdims[2] * sizeof(UC_CTYPE))) == NULL) {
         fprintf(stderr, "malloc: failed\n");
         return -1;
-    };
+    }
 
     /*
      * Get dataset rank and dimension.
@@ -403,7 +403,7 @@ write_file(void)
     if ((m_sid = H5Screate_simple(rank, memdims, NULL)) < 0) {
         fprintf(stderr, "H5Screate_simple for memory failed\n");
         return -1;
-    };
+    }
 
     /* write planes */
     count[0] = 1;