Made HGOTO_ERROR a do-while loop (#3308)

* Made HGOTO_ERROR a do-while loop

1 files changed, 93 insertions, 87 deletions

diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index b126bf0..db9901f 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -100,7 +100,7 @@ H5HF__iblock_pin(H5HF_indirect_t *iblock)
 
     /* Mark block as un-evictable */
     if (H5AC_pin_protected_entry(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block");
 
     /* If this indirect block has a parent, update it's child iblock pointer */
     if (iblock->parent) {
@@ -162,7 +162,7 @@ H5HF__iblock_unpin(H5HF_indirect_t *iblock)
 
     /* Mark block as evictable again */
     if (H5AC_unpin_entry(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -191,7 +191,7 @@ H5HF__iblock_incr(H5HF_indirect_t *iblock)
     /* Mark block as un-evictable when a child block is depending on it */
     if (iblock->rc == 0)
         if (H5HF__iblock_pin(iblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTPIN, FAIL, "unable to pin fractal heap indirect block");
 
     /* Increment reference count on shared indirect block */
     iblock->rc++;
@@ -264,12 +264,12 @@ H5HF__iblock_decr(H5HF_indirect_t *iblock)
         if (!iblock->removed_from_cache) {
             /* Unpin the indirect block, making it evictable again */
             if (H5HF__iblock_unpin(iblock) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block")
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPIN, FAIL, "unable to unpin fractal heap indirect block");
         } /* end if */
         else {
             /* Destroy the indirect block */
             if (H5HF__man_iblock_dest(iblock) < 0)
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block")
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to destroy fractal heap indirect block");
         } /* end else */
     }     /* end if */
 
@@ -298,7 +298,7 @@ H5HF__iblock_dirty(H5HF_indirect_t *iblock)
 
     /* Mark indirect block as dirty in cache */
     if (H5AC_mark_entry_dirty(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap indirect block as dirty")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTMARKDIRTY, FAIL, "unable to mark fractal heap indirect block as dirty");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -347,14 +347,14 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
 
     /* Allocate root indirect block */
     if (H5HF__man_iblock_create(hdr, NULL, 0, nrows, hdr->man_dtable.max_root_rows, &iblock_addr) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap indirect block");
 
     /* Move current direct block (used as root) into new indirect block */
 
     /* Lock new indirect block */
     if (NULL == (iblock = H5HF__man_iblock_protect(hdr, iblock_addr, nrows, NULL, 0, FALSE,
                                                    H5AC__NO_FLAGS_SET, &did_protect)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block");
 
     /* Check if there's already a direct block as root) */
     have_direct_block = H5_addr_defined(hdr->man_dtable.table_addr);
@@ -365,7 +365,7 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
         if (NULL == (dblock = H5HF__man_dblock_protect(hdr, hdr->man_dtable.table_addr,
                                                        hdr->man_dtable.cparam.start_block_size, NULL, 0,
                                                        H5AC__NO_FLAGS_SET)))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block");
 
         /* Attach direct block to new root indirect block */
         dblock->parent    = iblock;
@@ -373,17 +373,17 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
 
         /* Destroy flush dependency between direct block and header */
         if (H5AC_destroy_flush_dependency(dblock->fd_parent, dblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency");
         dblock->fd_parent = NULL;
 
         /* Create flush dependency between direct block and new root indirect block */
         if (H5AC_create_flush_dependency(iblock, dblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEPEND, FAIL, "unable to create flush dependency")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEPEND, FAIL, "unable to create flush dependency");
         dblock->fd_parent = iblock;
 
         if (H5HF__man_iblock_attach(iblock, 0, hdr->man_dtable.table_addr) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL,
-                        "can't attach root direct block to parent indirect block")
+                        "can't attach root direct block to parent indirect block");
 
         /* Check for I/O filters on this heap */
         if (hdr->filter_len > 0) {
@@ -399,12 +399,12 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
         /* Scan free space sections to set any 'parent' pointers to new indirect block */
         if (H5HF__space_create_root(hdr, iblock) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL,
-                        "can't set free space section info to new root indirect block")
+                        "can't set free space section info to new root indirect block");
 
         /* Unlock first (previously the root) direct block */
         if (H5AC_unprotect(hdr->f, H5AC_FHEAP_DBLOCK, hdr->man_dtable.table_addr, dblock,
                            H5AC__NO_FLAGS_SET) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap direct block");
         dblock = NULL;
     } /* end if */
 
@@ -412,22 +412,22 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
     if (H5HF__hdr_start_iter(hdr, iblock,
                              (hsize_t)(have_direct_block ? hdr->man_dtable.cparam.start_block_size : 0),
                              have_direct_block) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize block iterator")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize block iterator");
 
     /* Check for skipping over direct blocks, in order to get to large enough block */
     if (min_dblock_size > hdr->man_dtable.cparam.start_block_size)
         /* Add skipped blocks to heap's free space */
         if (H5HF__hdr_skip_blocks(hdr, iblock, have_direct_block,
                                   ((nrows - 1) * hdr->man_dtable.cparam.width) - have_direct_block) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space");
 
     /* Mark indirect block as modified */
     if (H5HF__iblock_dirty(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty");
 
     /* Unprotect root indirect block (it's pinned by the iterator though) */
     if (H5HF__man_iblock_unprotect(iblock, H5AC__DIRTIED_FLAG, did_protect) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block");
     iblock = NULL;
 
     /* Point heap header at new indirect block */
@@ -445,7 +445,7 @@ H5HF__man_iblock_root_create(H5HF_hdr_t *hdr, size_t min_dblock_size)
 
     /* Extend heap to cover new root indirect block */
     if (H5HF__hdr_adjust_heap(hdr, hdr->man_dtable.row_block_off[nrows], (hssize_t)acc_dblock_free) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -482,7 +482,7 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
 
     /* Get "new block" iterator information */
     if (H5HF__man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "unable to retrieve current block iterator location");
     next_size = hdr->man_dtable.row_block_size[next_row];
 
     /* Make certain the iterator is at the root indirect block */
@@ -515,7 +515,8 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
     if (!H5F_IS_TMP_ADDR(hdr->f, iblock->addr))
         /* Free previous indirect block disk space */
         if (H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, iblock->addr, (hsize_t)iblock->size) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block file space")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                        "unable to free fractal heap indirect block file space");
 
     /* Compute size of buffer needed for new indirect block */
     iblock->nrows   = new_nrows;
@@ -525,36 +526,38 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
     /* Allocate [temporary] space for the new indirect block on disk */
     if (H5F_USE_TMP_SPACE(hdr->f)) {
         if (HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block");
     } /* end if */
     else {
         if (HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block");
     } /* end else */
 
     /* Resize pinned indirect block in the cache, if its changed size */
     if (old_iblock_size != iblock->size) {
         if (H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block");
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
     if (H5_addr_ne(iblock->addr, new_addr)) {
         if (H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move fractal heap root indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move fractal heap root indirect block");
         iblock->addr = new_addr;
     } /* end if */
 
     /* Re-allocate child block entry array */
     if (NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents,
                                                  (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries")
+        HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries");
 
     /* Check for skipping over rows and add free section for skipped rows */
     if (skip_direct_rows)
         /* Add skipped blocks to heap's free space */
         if (H5HF__hdr_skip_blocks(hdr, iblock, next_entry, (new_next_entry - next_entry)) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't add skipped blocks to heap's free space");
 
     /* Initialize new direct block entries in rows added */
     acc_dblock_free = 0;
@@ -577,7 +580,7 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
         /* Re-allocate filtered direct block entry array */
         if (NULL == (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents,
                                                           (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries");
 
         /* Initialize new entries allocated */
         for (u = (old_nrows * hdr->man_dtable.cparam.width); u < (dir_rows * hdr->man_dtable.cparam.width);
@@ -599,7 +602,7 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
         if (NULL ==
             (iblock->child_iblocks = H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks,
                                                       (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries");
 
         /* Compute the previous # of indirect rows in this block */
         if (old_nrows < hdr->man_dtable.max_direct_rows)
@@ -615,7 +618,7 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
 
     /* Mark indirect block as dirty */
     if (H5HF__iblock_dirty(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty");
 
     /* Update other shared header info */
     hdr->man_dtable.curr_root_rows = new_nrows;
@@ -624,7 +627,7 @@ H5HF__man_iblock_root_double(H5HF_hdr_t *hdr, size_t min_dblock_size)
     /* Extend heap to cover new root indirect block */
     if (H5HF__hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1],
                               (hssize_t)acc_dblock_free) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -670,7 +673,8 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
     if (!H5F_IS_TMP_ADDR(hdr->f, iblock->addr))
         /* Free previous indirect block disk space */
         if (H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, iblock->addr, (hsize_t)iblock->size) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "unable to free fractal heap indirect block file space")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
+                        "unable to free fractal heap indirect block file space");
 
     /* Compute free space in rows to delete */
     acc_dblock_free = 0;
@@ -686,30 +690,32 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
     /* Allocate [temporary] space for the new indirect block on disk */
     if (H5F_USE_TMP_SPACE(hdr->f)) {
         if (HADDR_UNDEF == (new_addr = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block");
     } /* end if */
     else {
         if (HADDR_UNDEF == (new_addr = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, (hsize_t)iblock->size)))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "file allocation failed for fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
+                        "file allocation failed for fractal heap indirect block");
     } /* end else */
 
     /* Resize pinned indirect block in the cache, if it has changed size */
     if (old_size != iblock->size) {
         if (H5AC_resize_entry(iblock, (size_t)iblock->size) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block");
     } /* end if */
 
     /* Move object in cache, if it actually was relocated */
     if (H5_addr_ne(iblock->addr, new_addr)) {
         if (H5AC_move_entry(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block");
         iblock->addr = new_addr;
     } /* end if */
 
     /* Re-allocate child block entry array */
     if (NULL == (iblock->ents = H5FL_SEQ_REALLOC(H5HF_indirect_ent_t, iblock->ents,
                                                  (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for direct entries");
 
     /* Check for needing to re-allocate filtered entry array */
     if (hdr->filter_len > 0 && new_nrows < hdr->man_dtable.max_direct_rows) {
@@ -717,7 +723,7 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
         if (NULL ==
             (iblock->filt_ents = H5FL_SEQ_REALLOC(H5HF_indirect_filt_ent_t, iblock->filt_ents,
                                                   (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries")
+            HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL, "memory allocation failed for filtered direct entries");
     } /* end if */
 
     /* Check for needing to re-allocate child iblock pointer array */
@@ -734,7 +740,7 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
                              H5FL_SEQ_REALLOC(H5HF_indirect_ptr_t, iblock->child_iblocks,
                                               (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
                 HGOTO_ERROR(H5E_HEAP, H5E_NOSPACE, FAIL,
-                            "memory allocation failed for filtered direct entries")
+                            "memory allocation failed for filtered direct entries");
         } /* end if */
         else
             iblock->child_iblocks =
@@ -743,7 +749,7 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
 
     /* Mark indirect block as dirty */
     if (H5HF__iblock_dirty(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty");
 
     /* Update other shared header info */
     hdr->man_dtable.curr_root_rows = new_nrows;
@@ -752,7 +758,7 @@ H5HF__man_iblock_root_halve(H5HF_indirect_t *iblock)
     /* Shrink heap to only cover new root indirect block */
     if (H5HF__hdr_adjust_heap(hdr, 2 * hdr->man_dtable.row_block_off[new_nrows - 1],
                               -(hssize_t)acc_dblock_free) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce space to cover root direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce space to cover root direct block");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -794,7 +800,7 @@ H5HF__man_iblock_root_revert(H5HF_indirect_t *root_iblock)
     /* Get pointer to last direct block */
     if (NULL == (dblock = H5HF__man_dblock_protect(hdr, dblock_addr, dblock_size, root_iblock, 0,
                                                    H5AC__NO_FLAGS_SET)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap direct block");
     assert(dblock->parent == root_iblock);
     assert(dblock->par_entry == 0);
 
@@ -807,18 +813,18 @@ H5HF__man_iblock_root_revert(H5HF_indirect_t *root_iblock)
 
     /* Destroy flush dependency between old root iblock and new root direct block */
     if (H5AC_destroy_flush_dependency(dblock->fd_parent, dblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency");
     dblock->fd_parent = NULL;
 
     /* Detach direct block from parent */
     if (H5HF__man_iblock_detach(dblock->parent, 0) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach direct block from parent indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach direct block from parent indirect block");
     dblock->parent    = NULL;
     dblock->par_entry = 0;
 
     /* Create flush dependency between header and new root direct block */
     if (H5AC_create_flush_dependency(hdr, dblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEPEND, FAIL, "unable to create flush dependency")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEPEND, FAIL, "unable to create flush dependency");
     dblock->fd_parent = hdr;
 
     /* Point root at direct block */
@@ -827,16 +833,16 @@ H5HF__man_iblock_root_revert(H5HF_indirect_t *root_iblock)
 
     /* Reset 'next block' iterator */
     if (H5HF__hdr_reset_iter(hdr, (hsize_t)dblock_size) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTRELEASE, FAIL, "can't reset block iterator");
 
     /* Extend heap to just cover first direct block */
     if (H5HF__hdr_adjust_heap(hdr, (hsize_t)hdr->man_dtable.cparam.start_block_size,
                               (hssize_t)hdr->man_dtable.row_tot_dblock_free[0]) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTEXTEND, FAIL, "can't increase space to cover root direct block");
 
     /* Scan free space sections to reset any 'parent' pointers */
     if (H5HF__space_revert_root(hdr) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTRESET, FAIL, "can't reset free space section info")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTRESET, FAIL, "can't reset free space section info");
 
 done:
     if (dblock && H5AC_unprotect(hdr->f, H5AC_FHEAP_DBLOCK, dblock_addr, dblock, H5AC__NO_FLAGS_SET) < 0)
@@ -882,24 +888,24 @@ H5HF__man_iblock_alloc_row(H5HF_hdr_t *hdr, H5HF_free_section_t **sec_node)
         (TRUE == old_sec_node->u.row.under->u.indirect.u.iblock->removed_from_cache))
         /* Revive row and / or indirect section */
         if (H5HF__sect_row_revive(hdr, old_sec_node) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTREVIVE, FAIL, "can't revive indirect section");
 
     /* Get a pointer to the indirect block covering the section */
     if (NULL == (iblock = H5HF__sect_row_get_iblock(old_sec_node)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve indirect block for row section")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL, "can't retrieve indirect block for row section");
 
     /* Hold indirect block in memory, until direct block can point to it */
     if (H5HF__iblock_incr(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block");
     iblock_held = TRUE;
 
     /* Reduce (& possibly re-add) 'row' section */
     if (H5HF__sect_row_reduce(hdr, old_sec_node, &dblock_entry) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce row section node")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce row section node");
 
     /* Create direct block & single section */
     if (H5HF__man_dblock_create(hdr, iblock, dblock_entry, NULL, sec_node) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't allocate fractal heap direct block");
 
 done:
     /* Release hold on indirect block */
@@ -942,7 +948,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
      */
     if (NULL == (iblock = H5FL_MALLOC(H5HF_indirect_t)))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
-                    "memory allocation failed for fractal heap indirect block")
+                    "memory allocation failed for fractal heap indirect block");
 
     /* Reset the metadata cache info for the heap header */
     memset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
@@ -950,7 +956,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
     /* Share common heap information */
     iblock->hdr = hdr;
     if (H5HF__hdr_incr(hdr) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header");
 
     /* Set info for indirect block */
     iblock->rc                 = 0;
@@ -964,7 +970,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
     /* Allocate child block entry array */
     if (NULL == (iblock->ents = H5FL_SEQ_MALLOC(H5HF_indirect_ent_t,
                                                 (size_t)(iblock->nrows * hdr->man_dtable.cparam.width))))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries");
 
     /* Initialize indirect block entry tables */
     for (u = 0; u < (iblock->nrows * hdr->man_dtable.cparam.width); u++)
@@ -980,7 +986,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
         /* Allocate & initialize indirect block filtered entry array */
         if (NULL == (iblock->filt_ents = H5FL_SEQ_CALLOC(H5HF_indirect_filt_ent_t,
                                                          (size_t)(dir_rows * hdr->man_dtable.cparam.width))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries");
     } /* end if */
     else
         iblock->filt_ents = NULL;
@@ -995,7 +1001,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
         /* Allocate & initialize child indirect block pointer array */
         if (NULL == (iblock->child_iblocks = H5FL_SEQ_CALLOC(
                          H5HF_indirect_ptr_t, (size_t)(indir_rows * hdr->man_dtable.cparam.width))))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries")
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for block entries");
     } /* end if */
     else
         iblock->child_iblocks = NULL;
@@ -1004,12 +1010,12 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
     if (H5F_USE_TMP_SPACE(hdr->f)) {
         if (HADDR_UNDEF == (*addr_p = H5MF_alloc_tmp(hdr->f, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
-                        "file allocation failed for fractal heap indirect block")
+                        "file allocation failed for fractal heap indirect block");
     } /* end if */
     else {
         if (HADDR_UNDEF == (*addr_p = H5MF_alloc(hdr->f, H5FD_MEM_FHEAP_IBLOCK, (hsize_t)iblock->size)))
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
-                        "file allocation failed for fractal heap indirect block")
+                        "file allocation failed for fractal heap indirect block");
     } /* end else */
     iblock->addr = *addr_p;
 
@@ -1020,7 +1026,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
         /* Attach new block to parent */
         if (H5HF__man_iblock_attach(iblock->parent, par_entry, *addr_p) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL,
-                        "can't attach indirect block to parent indirect block")
+                        "can't attach indirect block to parent indirect block");
 
         /* Compute the indirect block's offset in the heap's address space */
         /* (based on parent's block offset) */
@@ -1045,7 +1051,7 @@ H5HF__man_iblock_create(H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblock, unsigned p
 
     /* Cache the new indirect block */
     if (H5AC_insert_entry(hdr->f, H5AC_FHEAP_IBLOCK, *addr_p, iblock, H5AC__NO_FLAGS_SET) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't add fractal heap indirect block to cache");
 
 done:
     if (ret_value < 0)
@@ -1147,7 +1153,7 @@ H5HF__man_iblock_protect(H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned iblock_n
         /* Protect the indirect block */
         if (NULL == (iblock = (H5HF_indirect_t *)H5AC_protect(hdr->f, H5AC_FHEAP_IBLOCK, iblock_addr,
                                                               &cache_udata, flags)))
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, NULL, "unable to protect fractal heap indirect block");
 
         /* Set the indirect block's address */
         iblock->addr = iblock_addr;
@@ -1222,7 +1228,7 @@ H5HF__man_iblock_unprotect(H5HF_indirect_t *iblock, unsigned cache_flags, hbool_
 
         /* Unprotect the indirect block */
         if (H5AC_unprotect(iblock->hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, iblock, cache_flags) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block");
     } /* end if */
 
 done:
@@ -1254,7 +1260,7 @@ H5HF__man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_a
 
     /* Increment the reference count on this indirect block */
     if (H5HF__iblock_incr(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared indirect block");
 
     /* Point at the child block */
     iblock->ents[entry].addr = child_addr;
@@ -1283,7 +1289,7 @@ H5HF__man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_a
 
     /* Mark indirect block as modified */
     if (H5HF__iblock_dirty(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty");
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1377,7 +1383,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
         if (iblock->nchildren == 1 && H5_addr_defined(iblock->ents[0].addr))
             if (H5HF__man_iblock_root_revert(iblock) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL,
-                            "can't convert root indirect block back to root direct block")
+                            "can't convert root indirect block back to root direct block");
 
         /* If the indirect block wasn't removed already (by reverting it) */
         if (!iblock->removed_from_cache) {
@@ -1393,7 +1399,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
                 if (iblock->nrows > 1 && max_child_row <= (iblock->nrows / 2))
                     if (H5HF__man_iblock_root_halve(iblock) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL,
-                                    "can't reduce size of root indirect block")
+                                    "can't reduce size of root indirect block");
             } /* end if */
         }     /* end if */
     }         /* end if */
@@ -1402,7 +1408,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
     if (!iblock->removed_from_cache) {
         /* Mark indirect block as modified */
         if (H5HF__iblock_dirty(iblock) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDIRTY, FAIL, "can't mark indirect block as dirty");
 
         /* Check for last child being removed from indirect block */
         if (iblock->nchildren == 0) {
@@ -1422,25 +1428,25 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
             if (NULL == (del_iblock = H5HF__man_iblock_protect(hdr, iblock->addr, iblock->nrows,
                                                                iblock->parent, iblock->par_entry, TRUE,
                                                                H5AC__NO_FLAGS_SET, &did_protect)))
-                HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block");
             assert(did_protect == TRUE);
 
             /* Check for deleting root indirect block (and no root direct block) */
             if (iblock->block_off == 0 && hdr->man_dtable.curr_root_rows > 0)
                 /* Reset header information back to "empty heap" state */
                 if (H5HF__hdr_empty(hdr) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't make heap empty")
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't make heap empty");
 
             /* Detach from parent indirect block */
             if (iblock->parent) {
                 /* Destroy flush dependency between indirect block and parent */
                 if (H5AC_destroy_flush_dependency(iblock->fd_parent, iblock) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency")
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTUNDEPEND, FAIL, "unable to destroy flush dependency");
                 iblock->fd_parent = NULL;
 
                 /* Detach from parent indirect block */
                 if (H5HF__man_iblock_detach(iblock->parent, iblock->par_entry) < 0)
-                    HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block")
+                    HGOTO_ERROR(H5E_HEAP, H5E_CANTATTACH, FAIL, "can't detach from parent indirect block");
                 iblock->parent    = NULL;
                 iblock->par_entry = 0;
             } /* end if */
@@ -1453,7 +1459,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
      * not being deleted)
      */
     if (H5HF__iblock_decr(iblock) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared indirect block");
     iblock = NULL;
 
     /* Delete indirect block from cache, if appropriate */
@@ -1482,7 +1488,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
 
         /* Unprotect the indirect block, with appropriate flags */
         if (H5HF__man_iblock_unprotect(del_iblock, cache_flags, TRUE) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block");
 
         /* if took ownership, free file space & mark block as removed from cache */
         if (took_ownership) {
@@ -1491,7 +1497,7 @@ H5HF__man_iblock_detach(H5HF_indirect_t *iblock, unsigned entry)
                 if (H5MF_xfree(hdr->f, H5FD_MEM_FHEAP_IBLOCK, del_iblock->addr, (hsize_t)del_iblock->size) <
                     0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
-                                "unable to free fractal heap indirect block file space")
+                                "unable to free fractal heap indirect block file space");
             del_iblock->addr = HADDR_UNDEF;
 
             /* Mark block as removed from the cache */
@@ -1565,7 +1571,7 @@ H5HF__man_iblock_delete(H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned iblock_nr
     /* Lock indirect block */
     if (NULL == (iblock = H5HF__man_iblock_protect(hdr, iblock_addr, iblock_nrows, par_iblock, par_entry,
                                                    TRUE, H5AC__NO_FLAGS_SET, &did_protect)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to protect fractal heap indirect block");
     assert(iblock->nchildren > 0);
     assert(did_protect == TRUE);
 
@@ -1589,7 +1595,7 @@ H5HF__man_iblock_delete(H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned iblock_nr
                     /* Delete child direct block */
                     if (H5HF__man_dblock_delete(hdr->f, iblock->ents[entry].addr, dblock_size) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
-                                    "unable to release fractal heap child direct block")
+                                    "unable to release fractal heap child direct block");
                 } /* end if */
                 else {
                     hsize_t  row_block_size; /* The size of blocks in this row */
@@ -1605,7 +1611,7 @@ H5HF__man_iblock_delete(H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned iblock_nr
                     if (H5HF__man_iblock_delete(hdr, iblock->ents[entry].addr, child_nrows, iblock, entry) <
                         0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL,
-                                    "unable to release fractal heap child indirect block")
+                                    "unable to release fractal heap child indirect block");
                 } /* end else */
             }     /* end if */
         }         /* end for */
@@ -1618,7 +1624,7 @@ H5HF__man_iblock_delete(H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned iblock_nr
         /* Check the indirect block's status in the metadata cache */
         if (H5AC_get_entry_status(hdr->f, iblock_addr, &iblock_status) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTGET, FAIL,
-                        "unable to check metadata cache status for indirect block")
+                        "unable to check metadata cache status for indirect block");
 
         /* Check if indirect block is pinned */
         assert(!(iblock_status & H5AC_ES__IS_PINNED));
@@ -1673,7 +1679,7 @@ H5HF__man_iblock_size(H5F_t *f, H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned n
     /* Protect the indirect block */
     if (NULL == (iblock = H5HF__man_iblock_protect(hdr, iblock_addr, nrows, par_iblock, par_entry, FALSE,
                                                    H5AC__READ_ONLY_FLAG, &did_protect)))
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL, "unable to load fractal heap indirect block");
 
     /* Accumulate size of this indirect block */
     *heap_size += iblock->size;
@@ -1699,14 +1705,14 @@ H5HF__man_iblock_size(H5F_t *f, H5HF_hdr_t *hdr, haddr_t iblock_addr, unsigned n
                     if (H5HF__man_iblock_size(f, hdr, iblock->ents[entry].addr, num_indirect_rows, iblock,
                                               entry, heap_size) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, FAIL,
-                                    "unable to get fractal heap storage info for indirect block")
+                                    "unable to get fractal heap storage info for indirect block");
         } /* end for */
     }     /* end if */
 
 done:
     /* Release the indirect block */
     if (iblock && H5HF__man_iblock_unprotect(iblock, H5AC__NO_FLAGS_SET, did_protect) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block");
     iblock = NULL;
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1745,7 +1751,7 @@ H5HF__man_iblock_parent_info(const H5HF_hdr_t *hdr, hsize_t block_off, hsize_t *
 
     /* Look up row & column for object */
     if (H5HF__dtable_lookup(&hdr->man_dtable, block_off, &row, &col) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of block");
 
     /* Sanity check - first lookup must be an indirect block */
     assert(row >= hdr->man_dtable.max_direct_rows);
@@ -1769,7 +1775,7 @@ H5HF__man_iblock_parent_info(const H5HF_hdr_t *hdr, hsize_t block_off, hsize_t *
 
         /* Look up row & column in new indirect block for object */
         if (H5HF__dtable_lookup(&hdr->man_dtable, (block_off - par_block_off), &row, &col) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTCOMPUTE, FAIL, "can't compute row & column of block");
     } /* end while */
 
     /* Sanity check */
@@ -1809,11 +1815,11 @@ H5HF__man_iblock_dest(H5HF_indirect_t *iblock)
     /* Decrement reference count on shared info */
     assert(iblock->hdr);
     if (H5HF__hdr_decr(iblock->hdr) < 0)
-        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header");
     if (iblock->parent)
         if (H5HF__iblock_decr(iblock->parent) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL,
-                        "can't decrement reference count on shared indirect block")
+                        "can't decrement reference count on shared indirect block");
 
     /* Release entry tables */
     if (iblock->ents)