summaryrefslogtreecommitdiffstats
path: root/src/H5HFcache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-09-11 12:36:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-09-11 12:36:08 (GMT)
commit80b958d8b48b0e0467f2816d783bedf2164612a5 (patch)
tree85fd5d2e366fb8dbf49a948396b60995060b3c0a /src/H5HFcache.c
parentd517c77bc0fe9c9dbfd013d720e1533289decd9f (diff)
downloadhdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.zip
hdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.tar.gz
hdf5-80b958d8b48b0e0467f2816d783bedf2164612a5.tar.bz2
[svn-r15613] Description:
Bring back r15612 from trunk: Minor cleanups of formatting, etc. Tested on: Mac OS X/32 10.5.4. (amazon) Too minor to require h5committest
Diffstat (limited to 'src/H5HFcache.c')
-rw-r--r--src/H5HFcache.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index 579af46..23e63ca 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -733,7 +733,6 @@ HDfprintf(stderr, "%s: Load indirect block, addr = %a\n", FUNC, addr);
/* Allocate space for the fractal heap indirect block */
if(NULL == (iblock = H5FL_CALLOC(H5HF_indirect_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
- HDmemset(&iblock->cache_info, 0, sizeof(H5AC_info_t));
/* Get the pointer to the shared heap header */
hdr = par_info->hdr;
@@ -1074,7 +1073,7 @@ done:
*/
/* ARGSUSED */
herr_t
-H5HF_cache_iblock_dest(H5F_t UNUSED *f, H5HF_indirect_t *iblock)
+H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -1085,6 +1084,7 @@ H5HF_cache_iblock_dest(H5F_t UNUSED *f, H5HF_indirect_t *iblock)
*/
HDassert(iblock);
HDassert(iblock->rc == 0);
+ HDassert(iblock->hdr);
#ifdef QAK
HDfprintf(stderr, "%s: Destroying indirect block\n", FUNC);
#endif /* QAK */
@@ -1093,7 +1093,6 @@ HDfprintf(stderr, "%s: Destroying indirect block\n", FUNC);
iblock->hdr->f = f;
/* Decrement reference count on shared info */
- HDassert(iblock->hdr);
if(H5HF_hdr_decr(iblock->hdr) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
if(iblock->parent)
@@ -1625,7 +1624,7 @@ done:
*/
/* ARGSUSED */
herr_t
-H5HF_cache_dblock_dest(H5F_t UNUSED *f, H5HF_direct_t *dblock)
+H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */