Merge Made HGOTO_ERROR a do-while loop changes from develop (#3334)

1 files changed, 19 insertions, 19 deletions

diff --git a/src/H5Doh.c b/src/H5Doh.c
index 30d43fa..f4a9934 100644
--- a/src/H5Doh.c
+++ b/src/H5Doh.c
@@ -99,7 +99,7 @@ H5O__dset_get_copy_file_udata(void)
 
     /* Allocate space for the 'copy file' user data for copying datasets */
     if (NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -169,13 +169,13 @@ H5O__dset_isa(const H5O_t *oh)
 
     /* Datatype */
     if ((exists = H5O_msg_exists_oh(oh, H5O_DTYPE_ID)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header");
     else if (!exists)
         HGOTO_DONE(FALSE);
 
     /* Layout */
     if ((exists = H5O_msg_exists_oh(oh, H5O_SDSPACE_ID)) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to read object header");
     else if (!exists)
         HGOTO_DONE(FALSE);
 
@@ -220,9 +220,9 @@ H5O__dset_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type)
 
         /* Check class of LAPL from API context */
         if ((is_lapl = H5P_isa_class(dapl_id, H5P_LINK_ACCESS)) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "unable to get LAPL status")
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "unable to get LAPL status");
         if ((is_dapl = H5P_isa_class(dapl_id, H5P_DATASET_ACCESS)) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "unable to get DAPL status")
+            HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, NULL, "unable to get DAPL status");
 
         /* Switch to default DAPL if not an actual DAPL in the API context */
         if (!is_dapl && is_lapl)
@@ -231,7 +231,7 @@ H5O__dset_open(const H5G_loc_t *obj_loc, H5I_type_t *opened_type)
 
     /* Open the dataset */
     if (NULL == (dset = H5D_open(obj_loc, dapl_id)))
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "unable to open dataset")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, NULL, "unable to open dataset");
 
     ret_value = (void *)dset;
 
@@ -270,13 +270,13 @@ H5O__dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc)
     /* Create the dataset */
     if (NULL ==
         (dset = H5D__create(f, crt_info->type_id, crt_info->space, crt_info->dcpl_id, crt_info->dapl_id)))
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to create dataset")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, NULL, "unable to create dataset");
 
     /* Set up the new dataset's location */
     if (NULL == (obj_loc->oloc = H5D_oloc(dset)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of dataset")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get object location of dataset");
     if (NULL == (obj_loc->path = H5D_nameof(dset)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of dataset")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "unable to get path of dataset");
 
     /* Set the return value */
     ret_value = dset;
@@ -309,11 +309,11 @@ H5O__dset_get_oloc(hid_t obj_id)
 
     /* Get the dataset */
     if (NULL == (dset = (H5D_t *)H5VL_object(obj_id)))
-        HGOTO_ERROR(H5E_OHDR, H5E_BADID, NULL, "couldn't get object from ID")
+        HGOTO_ERROR(H5E_OHDR, H5E_BADID, NULL, "couldn't get object from ID");
 
     /* Get the dataset's object header location */
     if (NULL == (ret_value = H5D_oloc(dset)))
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object")
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from object");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -351,14 +351,14 @@ H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info)
 
     /* Get the layout message from the object header */
     if (NULL == H5O_msg_read_oh(loc->file, oh, H5O_LAYOUT_ID, &layout))
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find layout message")
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find layout message");
     layout_read = TRUE;
 
     /* Check for chunked dataset storage */
     if (layout.type == H5D_CHUNKED && H5D__chunk_is_space_alloc(&layout.storage)) {
         /* Get size of chunk index */
         if (H5D__chunk_bh_info(loc, oh, &layout, &(bh_info->index_size)) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine chunked dataset btree info")
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine chunked dataset btree info");
     } /* end if */
     else if (layout.type == H5D_VIRTUAL && (layout.storage.u.virt.serial_list_hobjid.addr != HADDR_UNDEF)) {
         size_t virtual_heap_size;
@@ -366,7 +366,7 @@ H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info)
         /* Get size of global heap object for virtual dataset */
         if (H5HG_get_obj_size(loc->file, &(layout.storage.u.virt.serial_list_hobjid), &virtual_heap_size) < 0)
             HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL,
-                        "can't get global heap size for virtual dataset mapping")
+                        "can't get global heap size for virtual dataset mapping");
 
         /* Return heap size */
         bh_info->heap_size = (hsize_t)virtual_heap_size;
@@ -374,7 +374,7 @@ H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info)
 
     /* Check for External File List message in the object header */
     if ((exists = H5O_msg_exists_oh(oh, H5O_EFL_ID)) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for EFL message")
+        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for EFL message");
 
     if (exists && H5D__efl_is_space_alloc(&layout.storage)) {
         /* Start with clean EFL info */
@@ -382,12 +382,12 @@ H5O__dset_bh_info(const H5O_loc_t *loc, H5O_t *oh, H5_ih_info_t *bh_info)
 
         /* Get External File List message from the object header */
         if (NULL == H5O_msg_read_oh(loc->file, oh, H5O_EFL_ID, &efl))
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find EFL message")
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't find EFL message");
         efl_read = TRUE;
 
         /* Get size of local heap for EFL message's file list */
         if (H5D__efl_bh_info(loc->file, &efl, &(bh_info->heap_size)) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine EFL heap info")
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't determine EFL heap info");
     } /* end if */
 
 done:
@@ -424,9 +424,9 @@ H5O__dset_flush(void *_obj_ptr)
 
     /* Check that the object found is the correct type */
     if (H5O_obj_type(&dset->oloc, &obj_type) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type")
+        HGOTO_ERROR(H5E_DATASET, H5E_CANTGET, FAIL, "can't get object type");
     if (obj_type != H5O_TYPE_DATASET)
-        HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset")
+        HGOTO_ERROR(H5E_DATASET, H5E_BADTYPE, FAIL, "not a dataset");
 
     if (H5D__flush_real(dset) < 0)
         HDONE_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "unable to flush cached dataset info");