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, 135 insertions, 135 deletions

diff --git a/src/H5EAtest.c b/src/H5EAtest.c
index 9442cd9..0a85729 100644
--- a/src/H5EAtest.c
+++ b/src/H5EAtest.c
@@ -121,24 +121,24 @@ H5FL_DEFINE_STATIC(H5EA__ctx_cb_t);
  */
 BEGIN_FUNC(STATIC, ERR, void *, NULL, NULL, H5EA__test_crt_context(void *_udata))
 
-/* Local variables */
-H5EA__test_ctx_t *ctx;                              /* Context for callbacks */
-H5EA__ctx_cb_t *  udata = (H5EA__ctx_cb_t *)_udata; /* User data for context */
+    /* Local variables */
+    H5EA__test_ctx_t *ctx;                              /* Context for callbacks */
+    H5EA__ctx_cb_t *  udata = (H5EA__ctx_cb_t *)_udata; /* User data for context */
 
-/* Sanity checks */
+    /* Sanity checks */
 
-/* Allocate new context structure */
-if (NULL == (ctx = H5FL_MALLOC(H5EA__test_ctx_t)))
-    H5E_THROW(H5E_CANTALLOC, "can't allocate extensible array client callback context")
+    /* Allocate new context structure */
+    if (NULL == (ctx = H5FL_MALLOC(H5EA__test_ctx_t)))
+        H5E_THROW(H5E_CANTALLOC, "can't allocate extensible array client callback context")
 
-/* Initialize the context */
-ctx->bogus = H5EA__TEST_BOGUS_VAL;
-ctx->cb    = udata;
+    /* Initialize the context */
+    ctx->bogus = H5EA__TEST_BOGUS_VAL;
+    ctx->cb    = udata;
 
-/* Set return value */
-ret_value = ctx;
+    /* Set return value */
+    ret_value = ctx;
 
-CATCH
+    CATCH
 
 END_FUNC(STATIC) /* end H5EA__test_crt_context() */
 
@@ -157,14 +157,14 @@ END_FUNC(STATIC) /* end H5EA__test_crt_context() */
  */
 BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -, H5EA__test_dst_context(void *_ctx))
 
-/* Local variables */
-H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
+    /* Local variables */
+    H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
 
-/* Sanity checks */
-HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
+    /* Sanity checks */
+    HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
 
-/* Release context structure */
-ctx = H5FL_FREE(H5EA__test_ctx_t, ctx);
+    /* Release context structure */
+    ctx = H5FL_FREE(H5EA__test_ctx_t, ctx);
 
 END_FUNC(STATIC) /* end H5EA__test_dst_context() */
 
@@ -183,14 +183,14 @@ END_FUNC(STATIC) /* end H5EA__test_dst_context() */
  */
 BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -, H5EA__test_fill(void *nat_blk, size_t nelmts))
 
-/* Local variables */
-uint64_t fill_val = H5EA_TEST_FILL; /* Value to fill elements with */
+    /* Local variables */
+    uint64_t fill_val = H5EA_TEST_FILL; /* Value to fill elements with */
 
-/* Sanity checks */
-HDassert(nat_blk);
-HDassert(nelmts);
+    /* Sanity checks */
+    HDassert(nat_blk);
+    HDassert(nelmts);
 
-H5VM_array_fill(nat_blk, &fill_val, sizeof(uint64_t), nelmts);
+    H5VM_array_fill(nat_blk, &fill_val, sizeof(uint64_t), nelmts);
 
 END_FUNC(STATIC) /* end H5EA__test_fill() */
 
@@ -210,36 +210,36 @@ END_FUNC(STATIC) /* end H5EA__test_fill() */
 BEGIN_FUNC(STATIC, ERR, herr_t, SUCCEED, FAIL,
            H5EA__test_encode(void *raw, const void *_elmt, size_t nelmts, void *_ctx))
 
-/* Local variables */
-H5EA__test_ctx_t *ctx  = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
-const uint64_t *  elmt = (const uint64_t *)_elmt;  /* Convenience pointer to native elements */
+    /* Local variables */
+    H5EA__test_ctx_t *ctx  = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
+    const uint64_t *  elmt = (const uint64_t *)_elmt;  /* Convenience pointer to native elements */
 
-/* Sanity checks */
-HDassert(raw);
-HDassert(elmt);
-HDassert(nelmts);
-HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
+    /* Sanity checks */
+    HDassert(raw);
+    HDassert(elmt);
+    HDassert(nelmts);
+    HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
 
-/* Check for callback action */
-if (ctx->cb) {
-    if ((*ctx->cb->encode)(elmt, nelmts, ctx->cb->udata) < 0)
-        H5E_THROW(H5E_BADVALUE, "extensible array testing callback action failed")
-} /* end if */
+    /* Check for callback action */
+    if (ctx->cb) {
+        if ((*ctx->cb->encode)(elmt, nelmts, ctx->cb->udata) < 0)
+            H5E_THROW(H5E_BADVALUE, "extensible array testing callback action failed")
+    } /* end if */
 
-/* Encode native elements into raw elements */
-while (nelmts) {
-    /* Encode element */
-    /* (advances 'raw' pointer) */
-    UINT64ENCODE(raw, *elmt);
+    /* Encode native elements into raw elements */
+    while (nelmts) {
+        /* Encode element */
+        /* (advances 'raw' pointer) */
+        UINT64ENCODE(raw, *elmt);
 
-    /* Advance native element pointer */
-    elmt++;
+        /* Advance native element pointer */
+        elmt++;
 
-    /* Decrement # of elements to encode */
-    nelmts--;
-} /* end while */
+        /* Decrement # of elements to encode */
+        nelmts--;
+    } /* end while */
 
-CATCH
+    CATCH
 
 END_FUNC(STATIC) /* end H5EA__test_encode() */
 
@@ -261,29 +261,29 @@ BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
 
 /* Local variables */
 #ifndef NDEBUG
-H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
-#endif                                            /* NDEBUG */
-uint64_t *     elmt = (uint64_t *)_elmt;          /* Convenience pointer to native elements */
-const uint8_t *raw  = (const uint8_t *)_raw;      /* Convenience pointer to raw elements */
-
-/* Sanity checks */
-HDassert(raw);
-HDassert(elmt);
-HDassert(nelmts);
-HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
-
-/* Decode raw elements into native elements */
-while (nelmts) {
-    /* Decode element */
-    /* (advances 'raw' pointer) */
-    UINT64DECODE(raw, *elmt);
-
-    /* Advance native element pointer */
-    elmt++;
-
-    /* Decrement # of elements to decode */
-    nelmts--;
-} /* end while */
+    H5EA__test_ctx_t *ctx = (H5EA__test_ctx_t *)_ctx; /* Callback context to destroy */
+#endif                                                /* NDEBUG */
+    uint64_t *     elmt = (uint64_t *)_elmt;          /* Convenience pointer to native elements */
+    const uint8_t *raw  = (const uint8_t *)_raw;      /* Convenience pointer to raw elements */
+
+    /* Sanity checks */
+    HDassert(raw);
+    HDassert(elmt);
+    HDassert(nelmts);
+    HDassert(H5EA__TEST_BOGUS_VAL == ctx->bogus);
+
+    /* Decode raw elements into native elements */
+    while (nelmts) {
+        /* Decode element */
+        /* (advances 'raw' pointer) */
+        UINT64DECODE(raw, *elmt);
+
+        /* Advance native element pointer */
+        elmt++;
+
+        /* Decrement # of elements to decode */
+        nelmts--;
+    } /* end while */
 
 END_FUNC(STATIC) /* end H5EA__test_decode() */
 
@@ -303,17 +303,17 @@ END_FUNC(STATIC) /* end H5EA__test_decode() */
 BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -,
            H5EA__test_debug(FILE *stream, int indent, int fwidth, hsize_t idx, const void *elmt))
 
-/* Local variables */
-char temp_str[128]; /* Temporary string, for formatting */
+    /* Local variables */
+    char temp_str[128]; /* Temporary string, for formatting */
 
-/* Sanity checks */
-HDassert(stream);
-HDassert(elmt);
+    /* Sanity checks */
+    HDassert(stream);
+    HDassert(elmt);
 
-/* Print element */
-HDsprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
-HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
-          (unsigned long long)*(const uint64_t *)elmt);
+    /* Print element */
+    HDsprintf(temp_str, "Element #%llu:", (unsigned long long)idx);
+    HDfprintf(stream, "%*s%-*s %llu\n", indent, "", fwidth, temp_str,
+              (unsigned long long)*(const uint64_t *)elmt);
 
 END_FUNC(STATIC) /* end H5EA__test_debug() */
 
@@ -332,17 +332,17 @@ END_FUNC(STATIC) /* end H5EA__test_debug() */
 BEGIN_FUNC(STATIC, ERR, void *, NULL, NULL,
            H5EA__test_crt_dbg_context(H5F_t H5_ATTR_UNUSED *f, haddr_t H5_ATTR_UNUSED obj_addr))
 
-/* Local variables */
-H5EA__ctx_cb_t *ctx; /* Context for callbacks */
+    /* Local variables */
+    H5EA__ctx_cb_t *ctx; /* Context for callbacks */
 
-/* Allocate new context structure */
-if (NULL == (ctx = H5FL_MALLOC(H5EA__ctx_cb_t)))
-    H5E_THROW(H5E_CANTALLOC, "can't allocate extensible array client callback context")
+    /* Allocate new context structure */
+    if (NULL == (ctx = H5FL_MALLOC(H5EA__ctx_cb_t)))
+        H5E_THROW(H5E_CANTALLOC, "can't allocate extensible array client callback context")
 
-/* Set return value */
-ret_value = ctx;
+    /* Set return value */
+    ret_value = ctx;
 
-CATCH
+    CATCH
 
 END_FUNC(STATIC) /* end H5EA__test_crt_dbg_context() */
 
@@ -360,13 +360,13 @@ END_FUNC(STATIC) /* end H5EA__test_crt_dbg_context() */
  */
 BEGIN_FUNC(STATIC, NOERR, herr_t, SUCCEED, -, H5EA__test_dst_dbg_context(void *_ctx))
 
-/* Local variables */
-H5EA__ctx_cb_t *ctx = (H5EA__ctx_cb_t *)_ctx; /* Callback context to destroy */
+    /* Local variables */
+    H5EA__ctx_cb_t *ctx = (H5EA__ctx_cb_t *)_ctx; /* Callback context to destroy */
 
-HDassert(_ctx);
+    HDassert(_ctx);
 
-/* Release context structure */
-ctx = H5FL_FREE(H5EA__ctx_cb_t, ctx);
+    /* Release context structure */
+    ctx = H5FL_FREE(H5EA__ctx_cb_t, ctx);
 
 END_FUNC(STATIC) /* end H5EA__test_dst_dbg_context() */
 
@@ -385,17 +385,17 @@ END_FUNC(STATIC) /* end H5EA__test_dst_dbg_context() */
  */
 BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5EA__get_cparam_test(const H5EA_t *ea, H5EA_create_t *cparam))
 
-/* Check arguments. */
-HDassert(ea);
-HDassert(cparam);
+    /* Check arguments. */
+    HDassert(ea);
+    HDassert(cparam);
 
-/* Get extensible array creation parameters */
-cparam->raw_elmt_size             = ea->hdr->cparam.raw_elmt_size;
-cparam->max_nelmts_bits           = ea->hdr->cparam.max_nelmts_bits;
-cparam->idx_blk_elmts             = ea->hdr->cparam.idx_blk_elmts;
-cparam->sup_blk_min_data_ptrs     = ea->hdr->cparam.sup_blk_min_data_ptrs;
-cparam->data_blk_min_elmts        = ea->hdr->cparam.data_blk_min_elmts;
-cparam->max_dblk_page_nelmts_bits = ea->hdr->cparam.max_dblk_page_nelmts_bits;
+    /* Get extensible array creation parameters */
+    cparam->raw_elmt_size             = ea->hdr->cparam.raw_elmt_size;
+    cparam->max_nelmts_bits           = ea->hdr->cparam.max_nelmts_bits;
+    cparam->idx_blk_elmts             = ea->hdr->cparam.idx_blk_elmts;
+    cparam->sup_blk_min_data_ptrs     = ea->hdr->cparam.sup_blk_min_data_ptrs;
+    cparam->data_blk_min_elmts        = ea->hdr->cparam.data_blk_min_elmts;
+    cparam->max_dblk_page_nelmts_bits = ea->hdr->cparam.max_dblk_page_nelmts_bits;
 
 END_FUNC(PKG) /* end H5EA__get_cparam_test() */
 
@@ -415,36 +415,36 @@ END_FUNC(PKG) /* end H5EA__get_cparam_test() */
 BEGIN_FUNC(PKG, ERRCATCH, int, 0, -,
            H5EA__cmp_cparam_test(const H5EA_create_t *cparam1, const H5EA_create_t *cparam2))
 
-/* Check arguments. */
-HDassert(cparam1);
-HDassert(cparam2);
-
-/* Compare creation parameters for array */
-if (cparam1->raw_elmt_size < cparam2->raw_elmt_size)
-    H5_LEAVE(-1)
-else if (cparam1->raw_elmt_size > cparam2->raw_elmt_size)
-    H5_LEAVE(1)
-if (cparam1->max_nelmts_bits < cparam2->max_nelmts_bits)
-    H5_LEAVE(-1)
-else if (cparam1->max_nelmts_bits > cparam2->max_nelmts_bits)
-    H5_LEAVE(1)
-if (cparam1->idx_blk_elmts < cparam2->idx_blk_elmts)
-    H5_LEAVE(-1)
-else if (cparam1->idx_blk_elmts > cparam2->idx_blk_elmts)
-    H5_LEAVE(1)
-if (cparam1->sup_blk_min_data_ptrs < cparam2->sup_blk_min_data_ptrs)
-    H5_LEAVE(-1)
-else if (cparam1->sup_blk_min_data_ptrs > cparam2->sup_blk_min_data_ptrs)
-    H5_LEAVE(1)
-if (cparam1->data_blk_min_elmts < cparam2->data_blk_min_elmts)
-    H5_LEAVE(-1)
-else if (cparam1->data_blk_min_elmts > cparam2->data_blk_min_elmts)
-    H5_LEAVE(1)
-if (cparam1->max_dblk_page_nelmts_bits < cparam2->max_dblk_page_nelmts_bits)
-    H5_LEAVE(-1)
-else if (cparam1->max_dblk_page_nelmts_bits > cparam2->max_dblk_page_nelmts_bits)
-    H5_LEAVE(1)
-
-CATCH
+    /* Check arguments. */
+    HDassert(cparam1);
+    HDassert(cparam2);
+
+    /* Compare creation parameters for array */
+    if (cparam1->raw_elmt_size < cparam2->raw_elmt_size)
+        H5_LEAVE(-1)
+    else if (cparam1->raw_elmt_size > cparam2->raw_elmt_size)
+        H5_LEAVE(1)
+    if (cparam1->max_nelmts_bits < cparam2->max_nelmts_bits)
+        H5_LEAVE(-1)
+    else if (cparam1->max_nelmts_bits > cparam2->max_nelmts_bits)
+        H5_LEAVE(1)
+    if (cparam1->idx_blk_elmts < cparam2->idx_blk_elmts)
+        H5_LEAVE(-1)
+    else if (cparam1->idx_blk_elmts > cparam2->idx_blk_elmts)
+        H5_LEAVE(1)
+    if (cparam1->sup_blk_min_data_ptrs < cparam2->sup_blk_min_data_ptrs)
+        H5_LEAVE(-1)
+    else if (cparam1->sup_blk_min_data_ptrs > cparam2->sup_blk_min_data_ptrs)
+        H5_LEAVE(1)
+    if (cparam1->data_blk_min_elmts < cparam2->data_blk_min_elmts)
+        H5_LEAVE(-1)
+    else if (cparam1->data_blk_min_elmts > cparam2->data_blk_min_elmts)
+        H5_LEAVE(1)
+    if (cparam1->max_dblk_page_nelmts_bits < cparam2->max_dblk_page_nelmts_bits)
+        H5_LEAVE(-1)
+    else if (cparam1->max_dblk_page_nelmts_bits > cparam2->max_dblk_page_nelmts_bits)
+        H5_LEAVE(1)
+
+    CATCH
 
 END_FUNC(PKG) /* end H5EA__cmp_cparam_test() */