Made HGOTO_ERROR a do-while loop (#3308)

* Made HGOTO_ERROR a do-while loop

1 files changed, 57 insertions, 57 deletions

diff --git a/src/H5Tref.c b/src/H5Tref.c
index 893a2b2..ddc73ac 100644
--- a/src/H5Tref.c
+++ b/src/H5Tref.c
@@ -184,7 +184,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
             /* Release owned file */
             if (dt->shared->owned_vol_obj) {
                 if (H5VL_free_object(dt->shared->owned_vol_obj) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCLOSEOBJ, FAIL, "unable to close owned VOL object")
+                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCLOSEOBJ, FAIL, "unable to close owned VOL object");
                 dt->shared->owned_vol_obj = NULL;
             } /* end if */
 
@@ -216,7 +216,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
                 dt->shared->u.atomic.u.r.cls = NULL;
             } /* end else-if */
             else
-                HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid location")
+                HGOTO_ERROR(H5E_DATATYPE, H5E_BADTYPE, FAIL, "invalid location");
             break;
 
         case H5T_LOC_DISK: /* Disk based reference datatype */
@@ -230,7 +230,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
 
             /* dt now owns a reference to file */
             if (H5T_own_vol_obj(dt, file) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "can't give ownership of VOL object")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "can't give ownership of VOL object");
 
             if (dt->shared->u.atomic.u.r.rtype == H5R_OBJECT1) {
                 H5F_t *f;
@@ -242,7 +242,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
                     /* Check if using native VOL connector */
                     if (H5VL_object_is_native(file, &is_native) < 0)
                         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL,
-                                    "can't query if file uses native VOL connector")
+                                    "can't query if file uses native VOL connector");
 
                     /* Must use native VOL connector for this operation */
                     assert(is_native);
@@ -251,7 +251,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
 
                 /* Retrieve file from VOL object */
                 if (NULL == (f = (H5F_t *)H5VL_object_data(file)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
                 /* Size on disk, memory size is different */
                 dt->shared->size          = H5T_REF_OBJ_DISK_SIZE(f);
@@ -270,7 +270,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
                     /* Check if using native VOL connector */
                     if (H5VL_object_is_native(file, &is_native) < 0)
                         HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL,
-                                    "can't query if file uses native VOL connector")
+                                    "can't query if file uses native VOL connector");
 
                     /* Must use native VOL connector for this operation */
                     assert(is_native);
@@ -279,7 +279,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
 
                 /* Retrieve file from VOL object */
                 if (NULL == (f = (H5F_t *)H5VL_object_data(file)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
                 /* Size on disk, memory size is different */
                 dt->shared->size          = H5T_REF_DSETREG_DISK_SIZE(f);
@@ -300,14 +300,14 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
 
                 /* Get container info */
                 if (H5VL_file_get(file, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL) < 0)
-                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get container info")
+                    HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get container info");
 
                 /* Retrieve min encode size (when references have no vlen part) */
                 memset(&fixed_ref, 0, sizeof(fixed_ref));
                 fixed_ref.type       = (int8_t)H5R_OBJECT2;
                 fixed_ref.token_size = (uint8_t)cont_info.token_size;
                 if (H5R__encode(NULL, &fixed_ref, NULL, &ref_encode_size, 0) < 0)
-                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't get encode size")
+                    HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't get encode size");
 
                 /* Size on disk, memory size is different */
                 dt->shared->size =
@@ -338,7 +338,7 @@ H5T__ref_set_loc(H5T_t *dt, H5VL_object_t *file, H5T_loc_t loc)
 
         case H5T_LOC_MAXLOC: /* MAXLOC is invalid */
         default:
-            HGOTO_ERROR(H5E_DATATYPE, H5E_BADRANGE, FAIL, "invalid reference datatype location")
+            HGOTO_ERROR(H5E_DATATYPE, H5E_BADRANGE, FAIL, "invalid reference datatype location");
     } /* end switch */
 
     /* Indicate that the location changed */
@@ -429,11 +429,11 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
 
         /* Retrieve VOL object */
         if (NULL == (vol_obj = H5VL_vol_object(src_ref->loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid location identifier")
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid location identifier");
 
         /* Set external flag if referenced file is not destination file */
         if (H5VL_file_is_same(vol_obj, dst_file, &files_equal) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOMPARE, 0, "can't check if files are equal")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOMPARE, 0, "can't check if files are equal");
         flags |= !files_equal ? H5R_IS_EXTERNAL : 0;
     }
 
@@ -451,14 +451,14 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
 
             /* Check if using native VOL connector */
             if (H5VL_object_is_native(dst_file, &is_native) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector");
 
             /* Set the file's libver bounds if using the native VOL connector */
             if (is_native) {
                 H5F_t *dst_f; /* Native file struct */
 
                 if (NULL == (dst_f = (H5F_t *)H5VL_object_data(dst_file)))
-                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object")
+                    HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object");
                 H5CX_set_libver_bounds(dst_f);
             } /* end if */
             else
@@ -474,13 +474,13 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
 
         /* Get file name */
         if (H5VL_file_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, NULL) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name");
 
         /* Check if we need to allocate a buffer for the file name */
         if (file_name_len >= sizeof(file_name_buf_static)) {
             /* Allocate file name buffer */
             if (NULL == (file_name_buf_dyn = H5MM_malloc(file_name_len + 1)))
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTALLOC, 0, "can't allocate space for file name")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTALLOC, 0, "can't allocate space for file name");
 
             /* Update VOL callback arguments */
             vol_cb_args.args.get_name.buf_size = file_name_len + 1;
@@ -488,7 +488,7 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
 
             /* Get file name again */
             if (H5VL_file_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, NULL) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name");
 
             file_name = file_name_buf_dyn;
         } /* end if */
@@ -497,7 +497,7 @@ H5T__ref_mem_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf
 
         /* Determine encoding size */
         if (H5R__encode(file_name, src_ref, NULL, &ret_value, flags) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTENCODE, 0, "unable to determine encoding size")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTENCODE, 0, "unable to determine encoding size");
     } /* end if */
     else {
         /* Can do a direct copy and skip blob decoding */
@@ -554,11 +554,11 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
     /* Retrieve VOL object */
     if (NULL == (vol_obj = H5VL_vol_object(src_ref->loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid location identifier")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid location identifier");
 
     /* Set external flag if referenced file is not destination file */
     if (H5VL_file_is_same(vol_obj, dst_file, &files_equal) < 0)
-        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOMPARE, FAIL, "can't check if files are equal")
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCOMPARE, FAIL, "can't check if files are equal");
     flags |= !files_equal ? H5R_IS_EXTERNAL : 0;
 
     /* Pass the correct encoding version for the selection depending on the
@@ -568,14 +568,14 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(dst_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector");
 
         /* Set the file's libver bounds if using the native VOL connector */
         if (is_native) {
             H5F_t *dst_f;
 
             if (NULL == (dst_f = (H5F_t *)H5VL_object_data(dst_file)))
-                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object")
+                HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object");
             H5CX_set_libver_bounds(dst_f);
         } /* end if */
         else
@@ -596,13 +596,13 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
         /* Get file name */
         if (H5VL_file_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, NULL) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name");
 
         /* Check if we need to allocate a buffer for the file name */
         if (file_name_len >= sizeof(file_name_buf_static)) {
             /* Allocate file name buffer */
             if (NULL == (file_name_buf_dyn = H5MM_malloc(file_name_len + 1)))
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTALLOC, 0, "can't allocate space for file name")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTALLOC, 0, "can't allocate space for file name");
 
             /* Update VOL callback arguments */
             vol_cb_args.args.get_name.buf_size = file_name_len + 1;
@@ -610,7 +610,7 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
             /* Get file name again */
             if (H5VL_file_get(vol_obj, &vol_cb_args, H5P_DATASET_XFER_DEFAULT, NULL) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't get file name");
 
             file_name = file_name_buf_dyn;
         } /* end if */
@@ -620,7 +620,7 @@ H5T__ref_mem_read(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf, s
 
     /* Encode reference */
     if (H5R__encode(file_name, src_ref, (unsigned char *)dst_buf, &dst_size, flags) < 0)
-        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTENCODE, FAIL, "Cannot encode reference")
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTENCODE, FAIL, "Cannot encode reference");
 
 done:
     H5MM_xfree(file_name_buf_dyn);
@@ -670,7 +670,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -679,7 +679,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
     /* Make sure reference buffer is correctly initialized */
     memset(&tmp_ref, 0, sizeof(tmp_ref));
@@ -689,7 +689,7 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
             size_t token_size = H5F_SIZEOF_ADDR(src_f);
 
             if (H5R__create_object((const H5O_token_t *)src_buf, token_size, &tmp_ref) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create object reference")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create object reference");
         } break;
 
         case H5R_DATASET_REGION1: {
@@ -697,11 +697,11 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
             size_t                       token_size = H5F_SIZEOF_ADDR(src_f);
 
             if (H5R__create_region(&src_reg->token, token_size, src_reg->space, &tmp_ref) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create region reference")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTCREATE, FAIL, "unable to create region reference");
 
             /* create_region creates its internal copy of the space */
             if (H5S_close(src_reg->space) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTFREE, FAIL, "Cannot close dataspace")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTFREE, FAIL, "Cannot close dataspace");
         } break;
 
         case H5R_DATASET_REGION2:
@@ -714,26 +714,26 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
         case H5R_ATTR:
             /* Decode reference */
             if (H5R__decode((const unsigned char *)src_buf, &src_size, &tmp_ref) < 0)
-                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Cannot decode reference")
+                HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "Cannot decode reference");
             break;
 
         case H5R_BADTYPE:
         case H5R_MAXTYPE:
         default:
             assert("unknown reference type" && 0);
-            HGOTO_ERROR(H5E_REFERENCE, H5E_UNSUPPORTED, FAIL, "internal error (unknown reference type)")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_UNSUPPORTED, FAIL, "internal error (unknown reference type)");
     } /* end switch */
 
     /* If no filename set, this is not an external reference */
     if (NULL == H5R_REF_FILENAME(&tmp_ref)) {
         /* TODO temporary hack to retrieve file object */
         if ((file_id = H5F_get_file_id(src_file, H5I_FILE, FALSE)) < 0)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object");
 
         /* Attach loc ID to reference and hold reference to it, this is a
          * user exposed reference so set app_ref to TRUE. */
         if (H5R__set_loc_id(&tmp_ref, file_id, TRUE, TRUE) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTSET, FAIL, "unable to attach location id to reference")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTSET, FAIL, "unable to attach location id to reference");
     } /* end if */
 
     /* Set output info */
@@ -795,7 +795,7 @@ H5T__ref_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbool_t
 
         /* Check if blob ID is "nil" */
         if (H5VL_blob_specific(src_file, (void *)p, &vol_cb_args) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to check if a blob ID is 'nil'")
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to check if a blob ID is 'nil'");
     }
 
 done:
@@ -836,7 +836,7 @@ H5T__ref_disk_setnull(H5VL_object_t *dst_file, void *dst_buf, void *bg_buf)
 
         /* Remove blob for old data */
         if (H5VL_blob_specific(dst_file, (void *)p_bg, &vol_cb_args) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREMOVE, FAIL, "unable to delete blob")
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREMOVE, FAIL, "unable to delete blob");
     } /* end if */
 
     /* Copy header manually so that it does not get encoded into the blob */
@@ -851,7 +851,7 @@ H5T__ref_disk_setnull(H5VL_object_t *dst_file, void *dst_buf, void *bg_buf)
 
     /* Set blob ID to "nil" */
     if (H5VL_blob_specific(dst_file, q, &vol_cb_args) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set a blob ID to 'nil'")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to set a blob ID to 'nil'");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -883,7 +883,7 @@ H5T__ref_disk_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_bu
     /* Set reference type */
     ref_type = (H5R_type_t)*p++;
     if (ref_type <= H5R_BADTYPE || ref_type >= H5R_MAXTYPE)
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid reference type")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, 0, "invalid reference type");
 
     /* Set flags */
     flags = (unsigned)*p++;
@@ -944,7 +944,7 @@ H5T__ref_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t H5_ATTR_
 
     /* Retrieve blob */
     if (H5VL_blob_get(src_file, p, q, blob_size, NULL) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get blob")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTGET, FAIL, "unable to get blob");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -994,7 +994,7 @@ H5T__ref_disk_write(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf,
 
         /* Remove blob for old data */
         if (H5VL_blob_specific(dst_file, (void *)p_bg, &vol_cb_args) < 0)
-            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREMOVE, FAIL, "unable to delete blob")
+            HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREMOVE, FAIL, "unable to delete blob");
     } /* end if */
 
     /* Copy header manually so that it does not get encoded into the blob */
@@ -1015,7 +1015,7 @@ H5T__ref_disk_write(H5VL_object_t H5_ATTR_UNUSED *src_file, const void *src_buf,
 
     /* Store blob */
     if (H5VL_blob_put(dst_file, p, src_size, q, NULL) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to put blob")
+        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "unable to put blob");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1052,7 +1052,7 @@ H5T__ref_obj_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbo
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -1061,7 +1061,7 @@ H5T__ref_obj_disk_isnull(const H5VL_object_t *src_file, const void *src_buf, hbo
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
     /* Get the object address */
     H5F_addr_decode(src_f, &p, &addr);
@@ -1102,7 +1102,7 @@ H5T__ref_obj_disk_getsize(H5VL_object_t *src_file, const void H5_ATTR_UNUSED *sr
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -1111,7 +1111,7 @@ H5T__ref_obj_disk_getsize(H5VL_object_t *src_file, const void H5_ATTR_UNUSED *sr
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object");
 
     assert(src_size == H5T_REF_OBJ_DISK_SIZE(src_f));
 
@@ -1150,7 +1150,7 @@ H5T__ref_obj_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t src_
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -1159,7 +1159,7 @@ H5T__ref_obj_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t src_
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
     assert(src_size == H5T_REF_OBJ_DISK_SIZE(src_f));
     assert(dst_size == H5F_SIZEOF_ADDR(src_f));
@@ -1167,7 +1167,7 @@ H5T__ref_obj_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t src_
     /* Get object address */
     if (H5R__decode_token_obj_compat((const unsigned char *)src_buf, &src_size, (H5O_token_t *)dst_buf,
                                      H5F_SIZEOF_ADDR(src_f)) < 0)
-        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "unable to get object address")
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "unable to get object address");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1204,7 +1204,7 @@ H5T__ref_dsetreg_disk_isnull(const H5VL_object_t *src_file, const void *src_buf,
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -1213,7 +1213,7 @@ H5T__ref_dsetreg_disk_isnull(const H5VL_object_t *src_file, const void *src_buf,
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
     /* Get the heap address */
     H5F_addr_decode(src_f, &p, &addr);
@@ -1257,14 +1257,14 @@ H5T__ref_dsetreg_disk_getsize(H5VL_object_t H5_ATTR_UNUSED *src_file, const void
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, 0, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
 
         /* Retrieve file from VOL object */
         if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object")
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, 0, "invalid VOL object");
 
         assert(src_size == H5T_REF_DSETREG_DISK_SIZE(src_f));
     }
@@ -1308,7 +1308,7 @@ H5T__ref_dsetreg_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t
 
         /* Check if using native VOL connector */
         if (H5VL_object_is_native(src_file, &is_native) < 0)
-            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector")
+            HGOTO_ERROR(H5E_REFERENCE, H5E_CANTGET, FAIL, "can't query if file uses native VOL connector");
 
         /* Must use native VOL connector for this operation */
         assert(is_native);
@@ -1317,14 +1317,14 @@ H5T__ref_dsetreg_disk_read(H5VL_object_t *src_file, const void *src_buf, size_t
 
     /* Retrieve file from VOL object */
     if (NULL == (src_f = (H5F_t *)H5VL_object_data(src_file)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid VOL object");
 
     assert(src_size == H5T_REF_DSETREG_DISK_SIZE(src_f));
 
     /* Retrieve object address and space */
     if (H5R__decode_token_region_compat(src_f, (const unsigned char *)src_buf, &src_size, &dst_reg->token,
                                         H5F_SIZEOF_ADDR(src_f), &dst_reg->space) < 0)
-        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "unable to get object address")
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDECODE, FAIL, "unable to get object address");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1352,7 +1352,7 @@ H5T__ref_reclaim(void *elem, const H5T_t *dt)
     assert(dt && (dt->shared->type == H5T_REFERENCE));
 
     if (dt->shared->u.atomic.u.r.opaque && H5R__destroy((H5R_ref_priv_t *)elem) < 0)
-        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTFREE, FAIL, "cannot free reference")
+        HGOTO_ERROR(H5E_REFERENCE, H5E_CANTFREE, FAIL, "cannot free reference");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)