summaryrefslogtreecommitdiffstats
path: root/src/H5F.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2002-06-10 15:31:06 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2002-06-10 15:31:06 (GMT)
commit41aa2ec07316bafd2652d61f0fe2738610537f8f (patch)
tree5fece94bf985c7b0d0fb9bb7ee66bf633e548211 /src/H5F.c
parent5f2b8eee135acaa09d5b6686e1abf472eb97ecc1 (diff)
downloadhdf5-41aa2ec07316bafd2652d61f0fe2738610537f8f.zip
hdf5-41aa2ec07316bafd2652d61f0fe2738610537f8f.tar.gz
hdf5-41aa2ec07316bafd2652d61f0fe2738610537f8f.tar.bz2
[svn-r5562] Purpose:
Code cleanup Description: Allow H5FD_free to return successfully (but ignore) freeing objects with size 0. Platforms tested: FreeBSD 4.5 (sleipnir)
Diffstat (limited to 'src/H5F.c')
-rw-r--r--src/H5F.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5F.c b/src/H5F.c
index b111971..fcf0d84 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -2371,7 +2371,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate,
if(invalidate) {
if(f->shared->lf->feature_flags&H5FD_FEAT_AGGREGATE_METADATA) {
/* Return the unused portion of the metadata block to a free list */
- if(f->shared->lf->eoma!=0 && f->shared->lf->cur_meta_block_size!=0)
+ if(f->shared->lf->eoma!=0)
if(H5FD_free(f->shared->lf,H5FD_MEM_DEFAULT,f->shared->lf->eoma,f->shared->lf->cur_meta_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free metadata block");
@@ -2381,7 +2381,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate,
} /* end if */
if(f->shared->lf->feature_flags&H5FD_FEAT_AGGREGATE_SMALLDATA) {
/* Return the unused portion of the "small data" block to a free list */
- if(f->shared->lf->eosda!=0 && f->shared->lf->cur_sdata_block_size!=0)
+ if(f->shared->lf->eosda!=0)
if(H5FD_free(f->shared->lf,H5FD_MEM_DRAW,f->shared->lf->eosda,f->shared->lf->cur_sdata_block_size)<0)
HRETURN_ERROR(H5E_VFL, H5E_CANTFREE, FAIL, "can't free 'small data' block");