diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-11 12:30:35 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-09-11 12:30:35 (GMT) |
| commit | 37ebc24cf85a9aca975181f67afea59ddf08a5ed (patch) | |
| tree | b5747a2329a7f4419dc8ca9af02f0847181a29fd /src/H5HFcache.c | |
| parent | c465e18a68f2a77550d93366a5b6c8fac2e24502 (diff) | |
| download | hdf5-37ebc24cf85a9aca975181f67afea59ddf08a5ed.zip hdf5-37ebc24cf85a9aca975181f67afea59ddf08a5ed.tar.gz hdf5-37ebc24cf85a9aca975181f67afea59ddf08a5ed.tar.bz2 | |
[svn-r15612] Description:
Minor formatting cleanups
Tested on:
Mac OS X/32 10.5.4 (amazon) in debug mode
Mac OS X/32 10.5.4 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5HFcache.c')
| -rw-r--r-- | src/H5HFcache.c | 7 |
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 */ |