Update reformatting settings, trace wrapping, and printf-format strings (#22)

* Add BEGIN_FUNC / CATCH / END_FUNC to macros

* Remove incorrect trailing '{'

* Update trace script to wrap H5TRACE macros at 110 characters and improve
comments for code that performs this operation.

* Clean up printf-formatting in H5public.h and correct some oversights in the code.

* Reformat with BEGIN_FUNC / END_FUNC handled correctly by clang-format

* Run clang-format on changes.

* Correct H5_SIZEOF_HSIZE_T/H5_SIZEOF_HSSIZE_T macros to match typedef.

* And make the undef value match also.

* Update comment

* Update clang-format actions to exclude generated files.

* Post-process generated H5LTparse.h file as well as H5LTparse.c file.

* Fix formatting

* Update version of github clang-format action

1 files changed, 66 insertions, 66 deletions

diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index 237738b..bca7855 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -47,71 +47,71 @@
 BEGIN_FUNC(PRIV, ERR, herr_t, SUCCEED, FAIL,
            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;
-
-/* check arguments */
-HDassert(f);
-HDassert(H5F_addr_defined(addr));
-HDassert(stream);
-HDassert(indent >= 0);
-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");
-
-HDfprintf(stream, "%*sLocal Heap...\n", indent, "");
-HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size (in bytes):", h->prfx_size);
-HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of heap data:", h->dblk_addr);
-HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data bytes allocated for heap:", h->dblk_size);
-
-/* Traverse the free list and check that all free blocks fall within
- * the heap and that no two free blocks point to the same region of
- * the heap.
- */
-if (NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
-    H5E_THROW(H5E_CANTALLOC, "memory allocation failed");
-
-HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
-for (free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
-    char temp_str[32];
-
-    HDsnprintf(temp_str, sizeof(temp_str), "Block #%d:", free_block);
-    HDfprintf(stream, "%*s%-*s %8zu, %8zu\n", indent + 3, "", MAX(0, fwidth - 9), temp_str, freelist->offset,
-              freelist->size);
-    if ((freelist->offset + freelist->size) > h->dblk_size)
-        HDfprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
-    else {
-        int    overlap = 0;
-        size_t i;
-
-        for (i = 0; i < freelist->size; i++) {
-            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:",
-              ((double)100.0f * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
-
-/* 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
-if (h && FAIL == H5HL_unprotect(h))
-    H5E_THROW(H5E_CANTUNPROTECT, "unable to release/unprotect local heap");
-
-if (marker && NULL != (marker = (uint8_t *)H5MM_xfree(marker)))
-    H5E_THROW(H5E_CANTFREE, "can't free marker buffer");
+    H5HL_t *     h = NULL;
+    int          free_block;
+    H5HL_free_t *freelist;
+    uint8_t *    marker      = NULL;
+    size_t       amount_free = 0;
+
+    /* check arguments */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(stream);
+    HDassert(indent >= 0);
+    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");
+
+    HDfprintf(stream, "%*sLocal Heap...\n", indent, "");
+    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Header size (in bytes):", h->prfx_size);
+    HDfprintf(stream, "%*s%-*s %" PRIuHADDR "\n", indent, "", fwidth, "Address of heap data:", h->dblk_addr);
+    HDfprintf(stream, "%*s%-*s %zu\n", indent, "", fwidth, "Data bytes allocated for heap:", h->dblk_size);
+
+    /* Traverse the free list and check that all free blocks fall within
+     * the heap and that no two free blocks point to the same region of
+     * the heap.
+     */
+    if (NULL == (marker = (uint8_t *)H5MM_calloc(h->dblk_size)))
+        H5E_THROW(H5E_CANTALLOC, "memory allocation failed");
+
+    HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
+    for (free_block = 0, freelist = h->freelist; freelist; freelist = freelist->next, free_block++) {
+        char temp_str[32];
+
+        HDsnprintf(temp_str, sizeof(temp_str), "Block #%d:", free_block);
+        HDfprintf(stream, "%*s%-*s %8zu, %8zu\n", indent + 3, "", MAX(0, fwidth - 9), temp_str,
+                  freelist->offset, freelist->size);
+        if ((freelist->offset + freelist->size) > h->dblk_size)
+            HDfprintf(stream, "***THAT FREE BLOCK IS OUT OF BOUNDS!\n");
+        else {
+            int    overlap = 0;
+            size_t i;
+
+            for (i = 0; i < freelist->size; i++) {
+                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:",
+                  ((double)100.0f * (double)(h->dblk_size - amount_free) / (double)h->dblk_size));
+
+    /* 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
+    if (h && FAIL == H5HL_unprotect(h))
+        H5E_THROW(H5E_CANTUNPROTECT, "unable to release/unprotect local heap");
+
+    if (marker && NULL != (marker = (uint8_t *)H5MM_xfree(marker)))
+        H5E_THROW(H5E_CANTFREE, "can't free marker buffer");
 
 END_FUNC(PRIV) /* end H5HL_debug() */