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, 16 insertions, 12 deletions

diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index 76e4ec0..305014b 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -44,14 +44,17 @@
  *
  *-------------------------------------------------------------------------
  */
-BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
-           H5HL_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth))
-
+herr_t
+H5HL_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth)
+{
     H5HL_t *     h = NULL;
     int          free_block;
     H5HL_free_t *freelist;
     uint8_t *    marker      = NULL;
     size_t       amount_free = 0;
+    herr_t       ret_value   = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI(FAIL)
 
     /* check arguments */
     HDassert(f);
@@ -61,7 +64,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
     HDassert(fwidth >= 0);
 
     if (NULL == (h = (H5HL_t *)H5HL_protect(f, addr, H5AC__READ_ONLY_FLAG)))
-        H5E_THROW(H5E_CANTPROTECT, "unable to load/protect local heap");
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTPROTECT, FAIL, "unable to load/protect local heap")
 
     HDfprintf(stream, "%*sLocal Heap...\n", indent, "");
     HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size (in bytes):", h->prfx_size);
@@ -73,7 +76,7 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
      * the heap.
      */
     if (NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
-        H5E_THROW(H5E_CANTALLOC, "memory allocation failed");
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "memory allocation failed")
 
     HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
     for (free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
@@ -92,13 +95,13 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
                 if (marker[freelist->offset + i])
                     overlap++;
                 marker[freelist->offset + i] = 1;
-            } /* end for */
+            }
             if (overlap)
                 HDfprintf(stream, "***THAT FREE BLOCK OVERLAPPED A PREVIOUS ONE!\n");
             else
                 amount_free += freelist->size;
-        } /* end else */
-    }     /* end for */
+        }
+    }
 
     if (h->dblk_size)
         HDfprintf(stream, "%*s%-*s %.2f%%\n", indent, "", fwidth, "Percent of heap used:",
@@ -107,11 +110,12 @@ BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
     /* Print the data in a VMS-style octal dump */
     H5_buffer_dump(stream, indent, h->dblk_image, marker, (size_t)0, h->dblk_size);
 
-    CATCH
+done:
     if (h && FAIL == H5HL_unprotect(h))
-        H5E_THROW(H5E_CANTUNPROTECT, "unable to release/unprotect local heap");
+        HDONE_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release/unprotect local heap")
 
     if (marker && NULL != (marker = (uint8_t *)H5MM_xfree(marker)))
-        H5E_THROW(H5E_CANTFREE, "can't free marker buffer");
+        HDONE_ERROR(H5E_HEAP, H5E_CANTFREE, FAIL, "can't free marker buffer")
 
-END_FUNC(PRIV) /* end H5HL_debug() */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5HL_debug() */