diff options
Diffstat (limited to 'src/H5HLint.c')
-rw-r--r-- | src/H5HLint.c | 138 |
1 files changed, 59 insertions, 79 deletions
diff --git a/src/H5HLint.c b/src/H5HLint.c index 17527c1..9b6667f 100644 --- a/src/H5HLint.c +++ b/src/H5HLint.c @@ -26,48 +26,40 @@ /* Module Setup */ /****************/ -#include "H5HLmodule.h" /* This source code file is part of the H5HL module */ - +#include "H5HLmodule.h" /* This source code file is part of the H5HL module */ /***********/ /* Headers */ /***********/ -#include "H5private.h" /* Generic Functions */ -#include "H5Eprivate.h" /* Error handling */ -#include "H5FLprivate.h" /* Free lists */ -#include "H5HLpkg.h" /* Local Heaps */ - +#include "H5private.h" /* Generic Functions */ +#include "H5Eprivate.h" /* Error handling */ +#include "H5FLprivate.h" /* Free lists */ +#include "H5HLpkg.h" /* Local Heaps */ /****************/ /* Local Macros */ /****************/ - /******************/ /* Local Typedefs */ /******************/ - /********************/ /* Package Typedefs */ /********************/ - /********************/ /* Local Prototypes */ /********************/ - /*********************/ /* Package Variables */ /*********************/ - /*****************************/ /* Library Private Variables */ /*****************************/ - /*******************/ /* Local Variables */ /*******************/ @@ -75,8 +67,6 @@ /* Declare a free list to manage the H5HL_t struct */ H5FL_DEFINE_STATIC(H5HL_t); - - /*------------------------------------------------------------------------- * Function: H5HL__new * @@ -90,37 +80,35 @@ 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)) +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"); +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() */ - /*------------------------------------------------------------------------- * Function: H5HL__inc_rc * @@ -133,19 +121,16 @@ END_FUNC(PKG) /* end H5HL__new() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, NOERR, -herr_t, SUCCEED, -, -H5HL__inc_rc(H5HL_t *heap)) +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() */ - /*------------------------------------------------------------------------- * Function: H5HL__dec_rc * @@ -158,24 +143,21 @@ END_FUNC(PKG) /* end H5HL__inc_rc() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5HL__dec_rc(H5HL_t *heap)) +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"); +/* 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() */ - /*------------------------------------------------------------------------- * Function: H5HL__dest * @@ -188,33 +170,31 @@ END_FUNC(PKG) /* end H5HL__dec_rc() */ * *------------------------------------------------------------------------- */ -BEGIN_FUNC(PKG, ERR, -herr_t, SUCCEED, FAIL, -H5HL__dest(H5HL_t *heap)) +BEGIN_FUNC(PKG, ERR, herr_t, SUCCEED, FAIL, H5HL__dest(H5HL_t *heap)) - /* check arguments */ - HDassert(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); +/* 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"); +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() */ |