summaryrefslogtreecommitdiffstats
path: root/src/H5HLint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@lbl.gov>2020-10-06 22:37:42 (GMT)
committerGitHub <noreply@github.com>2020-10-06 22:37:42 (GMT)
commit66bcfd97a80870fb8336ba218541e2b477448d89 (patch)
tree3de7490ae27b7e9a30315b3672f65d4d682cdcd4 /src/H5HLint.c
parentc0e087a65a2f1ab354d3016bc29262eeec722d6f (diff)
downloadhdf5-66bcfd97a80870fb8336ba218541e2b477448d89.zip
hdf5-66bcfd97a80870fb8336ba218541e2b477448d89.tar.gz
hdf5-66bcfd97a80870fb8336ba218541e2b477448d89.tar.bz2
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
Diffstat (limited to 'src/H5HLint.c')
-rw-r--r--src/H5HLint.c108
1 files changed, 54 insertions, 54 deletions
diff --git a/src/H5HLint.c b/src/H5HLint.c
index 9b6667f..ef5c712 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -83,29 +83,29 @@ H5FL_DEFINE_STATIC(H5HL_t);
BEGIN_FUNC(PKG, ERR, H5HL_t *, NULL, NULL,
H5HL__new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size))
-H5HL_t *heap = NULL; /* New local heap */
+ H5HL_t *heap = NULL; /* New local heap */
-/* check arguments */
-HDassert(sizeof_size > 0);
-HDassert(sizeof_addr > 0);
-HDassert(prfx_size > 0);
+ /* check arguments */
+ HDassert(sizeof_size > 0);
+ HDassert(sizeof_addr > 0);
+ HDassert(prfx_size > 0);
-/* Allocate new local heap structure */
-if (NULL == (heap = H5FL_CALLOC(H5HL_t)))
- H5E_THROW(H5E_CANTALLOC, "memory allocation failed");
+ /* Allocate new local heap structure */
+ if (NULL == (heap = H5FL_CALLOC(H5HL_t)))
+ H5E_THROW(H5E_CANTALLOC, "memory allocation failed");
-/* Initialize non-zero fields */
-heap->sizeof_size = sizeof_size;
-heap->sizeof_addr = sizeof_addr;
-heap->prfx_size = prfx_size;
+ /* Initialize non-zero fields */
+ heap->sizeof_size = sizeof_size;
+ heap->sizeof_addr = sizeof_addr;
+ heap->prfx_size = prfx_size;
-/* Set the return value */
-ret_value = heap;
+ /* Set the return value */
+ ret_value = heap;
-CATCH
-if (!ret_value && heap != NULL)
- if (NULL == (heap = H5FL_FREE(H5HL_t, heap)))
- H5E_THROW(H5E_CANTFREE, "can't free heap memory");
+ CATCH
+ if (!ret_value && heap != NULL)
+ if (NULL == (heap = H5FL_FREE(H5HL_t, heap)))
+ H5E_THROW(H5E_CANTFREE, "can't free heap memory");
END_FUNC(PKG) /* end H5HL__new() */
@@ -123,11 +123,11 @@ END_FUNC(PKG) /* end H5HL__new() */
*/
BEGIN_FUNC(PKG, NOERR, herr_t, SUCCEED, -, H5HL__inc_rc(H5HL_t *heap))
-/* check arguments */
-HDassert(heap);
+ /* check arguments */
+ HDassert(heap);
-/* Increment heap's ref. count */
-heap->rc++;
+ /* Increment heap's ref. count */
+ heap->rc++;
END_FUNC(PKG) /* end H5HL__inc_rc() */
@@ -145,16 +145,16 @@ END_FUNC(PKG) /* end H5HL__inc_rc() */
*/
BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dec_rc(H5HL_t *heap))
-/* check arguments */
-HDassert(heap);
+ /* check arguments */
+ HDassert(heap);
-/* Decrement heap's ref. count */
-heap->rc--;
+ /* Decrement heap's ref. count */
+ heap->rc--;
-CATCH
-/* Check if we should destroy the heap */
-if (heap->rc == 0 && FAIL == H5HL__dest(heap))
- H5E_THROW(H5E_CANTFREE, "unable to destroy local heap");
+ CATCH
+ /* Check if we should destroy the heap */
+ if (heap->rc == 0 && FAIL == H5HL__dest(heap))
+ H5E_THROW(H5E_CANTFREE, "unable to destroy local heap");
END_FUNC(PKG) /* end H5HL__dec_rc() */
@@ -172,29 +172,29 @@ END_FUNC(PKG) /* end H5HL__dec_rc() */
*/
BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dest(H5HL_t *heap))
-/* check arguments */
-HDassert(heap);
-
-/* Verify that node is unused */
-HDassert(heap->prots == 0);
-HDassert(heap->rc == 0);
-HDassert(heap->prfx == NULL);
-HDassert(heap->dblk == NULL);
-
-CATCH
-if (heap->dblk_image)
- if (NULL != (heap->dblk_image = H5FL_BLK_FREE(lheap_chunk, heap->dblk_image)))
- H5E_THROW(H5E_CANTFREE, "unable to free local heap data block image");
-while (heap->freelist) {
- H5HL_free_t *fl;
-
- fl = heap->freelist;
- heap->freelist = fl->next;
- if (NULL != (fl = H5FL_FREE(H5HL_free_t, fl)))
- H5E_THROW(H5E_CANTFREE, "unable to free local heap free list");
-} /* end while */
-
-if (NULL != (heap = H5FL_FREE(H5HL_t, heap)))
- H5E_THROW(H5E_CANTFREE, "unable to free local heap");
+ /* check arguments */
+ HDassert(heap);
+
+ /* Verify that node is unused */
+ HDassert(heap->prots == 0);
+ HDassert(heap->rc == 0);
+ HDassert(heap->prfx == NULL);
+ HDassert(heap->dblk == NULL);
+
+ CATCH
+ if (heap->dblk_image)
+ if (NULL != (heap->dblk_image = H5FL_BLK_FREE(lheap_chunk, heap->dblk_image)))
+ H5E_THROW(H5E_CANTFREE, "unable to free local heap data block image");
+ while (heap->freelist) {
+ H5HL_free_t *fl;
+
+ fl = heap->freelist;
+ heap->freelist = fl->next;
+ if (NULL != (fl = H5FL_FREE(H5HL_free_t, fl)))
+ H5E_THROW(H5E_CANTFREE, "unable to free local heap free list");
+ } /* end while */
+
+ if (NULL != (heap = H5FL_FREE(H5HL_t, heap)))
+ H5E_THROW(H5E_CANTFREE, "unable to free local heap");
END_FUNC(PKG) /* end H5HL__dest() */