Removes alternative function enter/leave macro scheme (#678)

* Committing clang-format changes

* Converted BEGIN_FUNC, etc. macros to FUNC_ENTER

* Rips out the BEGIN_FUNC, etc. macros

* Removes 'end if', etc. comments from H5HL package

* Committing clang-format changes

* Fixes an H5EA iterate issue

* Fixes an issue in the H5FA iterator code

* Further cleanup in bin/trace after macro removal

* Iterator changes in H5EA and H5FA

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

1 files changed, 48 insertions, 34 deletions

diff --git a/src/H5HLdblk.c b/src/H5HLdblk.c
index f771de5..9e6fc4a 100644
--- a/src/H5HLdblk.c
+++ b/src/H5HLdblk.c
@@ -81,20 +81,24 @@ H5FL_DEFINE_STATIC(H5HL_dblk_t);
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, H5HL_dblk_t *, NULL, NULL, H5HL__dblk_new(H5HL_t *heap))
+H5HL_dblk_t *
+H5HL__dblk_new(H5HL_t *heap)
+{
+    H5HL_dblk_t *dblk      = NULL; /* New local heap data block */
+    H5HL_dblk_t *ret_value = NULL;
 
-    H5HL_dblk_t *dblk = NULL; /* New local heap data block */
+    FUNC_ENTER_PACKAGE
 
     /* check arguments */
     HDassert(heap);
 
     /* Allocate new local heap data block */
     if (NULL == (dblk = H5FL_CALLOC(H5HL_dblk_t)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed for local heap data block")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, NULL, "memory allocation failed for local heap data block")
 
     /* Increment ref. count on heap data structure */
     if (FAIL == H5HL__inc_rc(heap))
-        H5E_THROW(H5E_CANTINC, "can't increment heap ref. count")
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, NULL, "can't increment heap ref. count")
 
     /* Link the heap & the data block */
     dblk->heap = heap;
@@ -103,13 +107,14 @@ BEGIN_FUNC(PKG, ERR, H5HL_dblk_t *, NULL, NULL, H5HL__dblk_new(H5HL_t *heap))
     /* Set the return value */
     ret_value = dblk;
 
-    CATCH
+done:
     /* Ensure that the data block memory is deallocated on errors */
     if (!ret_value && dblk != NULL)
         /* H5FL_FREE always returns NULL so we can't check for errors */
         dblk = H5FL_FREE(H5HL_dblk_t, dblk);
 
-END_FUNC(PKG) /* end H5HL__dblk_new() */
+    FUNC_LEAVE_NOAPI(ret_value);
+} /* end H5HL__dblk_new() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5HL__dblk_dest
@@ -123,7 +128,12 @@ END_FUNC(PKG) /* end H5HL__dblk_new() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_dest(H5HL_dblk_t *dblk))
+herr_t
+H5HL__dblk_dest(H5HL_dblk_t *dblk)
+{
+    herr_t ret_value = SUCCEED;
+
+    FUNC_ENTER_PACKAGE
 
     /* check arguments */
     HDassert(dblk);
@@ -135,18 +145,19 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_dest(H5HL_dblk_t *dblk))
 
         /* Decrement ref. count on heap data structure */
         if (FAIL == H5HL__dec_rc(dblk->heap))
-            H5E_THROW(H5E_CANTDEC, "can't decrement heap ref. count")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement heap ref. count")
 
         /* Unlink heap from data block */
         dblk->heap = NULL;
-    } /* end if */
+    }
 
-    CATCH
+done:
     /* Free local heap data block */
     /* H5FL_FREE always returns NULL so we can't check for errors */
     dblk = H5FL_FREE(H5HL_dblk_t, dblk);
 
-END_FUNC(PKG) /* end H5HL__dblk_dest() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HL__dblk_dest() */
 
 /*-------------------------------------------------------------------------
  * Function:    H5HL__dblk_realloc
@@ -160,14 +171,18 @@ END_FUNC(PKG) /* end H5HL__dblk_dest() */
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size))
-
+herr_t
+H5HL__dblk_realloc(H5F_t *f, H5HL_t *heap, size_t new_heap_size)
+{
     H5HL_dblk_t *dblk;          /* Local heap data block */
     haddr_t      old_addr;      /* Old location of heap data block */
     haddr_t      new_addr;      /* New location of heap data block */
     size_t       old_heap_size; /* Old size of heap data block */
+    herr_t       ret_value = SUCCEED;
 
-    /* check arguments */
+    FUNC_ENTER_PACKAGE
+
+    /* Check arguments */
     HDassert(heap);
     HDassert(new_heap_size > 0);
 
@@ -176,12 +191,12 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_realloc(H5F_t *f, H5HL_t
     old_heap_size = heap->dblk_size;
     H5_CHECK_OVERFLOW(old_heap_size, size_t, hsize_t);
     if (FAIL == H5MF_xfree(f, H5FD_MEM_LHEAP, old_addr, (hsize_t)old_heap_size))
-        H5E_THROW(H5E_CANTFREE, "can't free old local heap data");
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "can't free old local heap data");
 
     /* Allocate new space on disk */
     H5_CHECK_OVERFLOW(new_heap_size, size_t, hsize_t);
     if (HADDR_UNDEF == (new_addr = H5MF_alloc(f, H5FD_MEM_LHEAP, (hsize_t)new_heap_size)))
-        H5E_THROW(H5E_CANTALLOC, "unable to allocate file space for local heap");
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate file space for local heap");
 
     /* Update heap info*/
     heap->dblk_addr = new_addr;
@@ -197,8 +212,8 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_realloc(H5F_t *f, H5HL_t
 
             /* Resize the heap prefix in the cache */
             if (FAIL == H5AC_resize_entry(heap->prfx, (size_t)(heap->prfx_size + new_heap_size)))
-                H5E_THROW(H5E_CANTRESIZE, "unable to resize heap in cache");
-        } /* end if */
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap in cache");
+        }
         else {
             /* Sanity check */
             HDassert(H5F_addr_ne(heap->prfx_addr + heap->prfx_size, old_addr));
@@ -206,50 +221,49 @@ BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dblk_realloc(H5F_t *f, H5HL_t
 
             /* Resize the heap data block in the cache */
             if (H5AC_resize_entry(heap->dblk, (size_t)new_heap_size) < 0)
-                H5E_THROW(H5E_CANTRESIZE, "unable to resize heap (data block) in cache");
-        } /* end else */
-    }     /* end if */
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap (data block) in cache");
+        }
+    }
     else {
         /* Check if heap data block was contiguous w/prefix previously */
         if (heap->single_cache_obj) {
             /* Create new heap data block */
             if (NULL == (dblk = H5HL__dblk_new(heap)))
-                H5E_THROW(H5E_CANTALLOC, "unable to allocate local heap data block");
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "unable to allocate local heap data block");
 
             /* Resize current heap prefix */
             heap->prfx_size = H5HL_SIZEOF_HDR(f);
             if (FAIL == H5AC_resize_entry(heap->prfx, (size_t)heap->prfx_size))
-                H5E_THROW(H5E_CANTRESIZE, "unable to resize heap prefix in cache");
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap prefix in cache");
 
             /* Insert data block into cache (pinned) */
             if (FAIL == H5AC_insert_entry(f, H5AC_LHEAP_DBLK, new_addr, dblk, H5AC__PIN_ENTRY_FLAG))
-                H5E_THROW(H5E_CANTINIT, "unable to cache local heap data block");
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "unable to cache local heap data block");
 
             dblk = NULL;
 
             /* Reset 'single cache object' flag */
             heap->single_cache_obj = FALSE;
-        } /* end if */
+        }
         else {
             /* Resize the heap data block in the cache */
             /* (ignore [unlikely] case where heap data block ends up
              *      contiguous w/heap prefix again.
              */
             if (FAIL == H5AC_resize_entry(heap->dblk, (size_t)new_heap_size))
-                H5E_THROW(H5E_CANTRESIZE, "unable to resize heap data block in cache");
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize heap data block in cache");
 
             /* Relocate the heap data block in the cache */
             if (FAIL == H5AC_move_entry(f, H5AC_LHEAP_DBLK, old_addr, new_addr))
-                H5E_THROW(H5E_CANTMOVE, "unable to move heap data block in cache");
-
-        } /* end else */
-    }     /* end else */
+                HGOTO_ERROR(H5E_HEAP, H5E_CANTMOVE, FAIL, "unable to move heap data block in cache");
+        }
+    }
 
-    CATCH
+done:
     /* Restore old heap address & size on errors */
     if (FAIL == ret_value) {
         heap->dblk_addr = old_addr;
         heap->dblk_size = old_heap_size;
-    } /* end if */
-
-END_FUNC(PKG) /* end H5HL__dblk_realloc() */
+    }
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HL__dblk_realloc() */