diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-13 15:30:40 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-13 15:30:40 (GMT) |
commit | 26205360a42b6a579f62a25810f34813582c84ab (patch) | |
tree | 5f995132fa65364e39e62f11096e67d0fe7ea653 /src | |
parent | 103da21db1713084eafe6a9e1a11ca2ad5c25f31 (diff) | |
download | hdf5-26205360a42b6a579f62a25810f34813582c84ab.zip hdf5-26205360a42b6a579f62a25810f34813582c84ab.tar.gz hdf5-26205360a42b6a579f62a25810f34813582c84ab.tar.bz2 |
[svn-r18792] Description:
Correct error in H5C_resize_entry() where protected entry sizes were
not updated if the entry being resized was both pinned and protected.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src')
-rw-r--r-- | src/H5C.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -3062,18 +3062,17 @@ H5C_resize_entry(void *thing, size_t new_size) } } - /* update the pinned or protected entry list */ + /* update the pinned and/or protected entry list */ if(entry_ptr->is_pinned) { H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pel_len), \ (cache_ptr->pel_size), \ (entry_ptr->size), (new_size)); } /* end if */ - else { - HDassert(entry_ptr->is_protected); + if(entry_ptr->is_protected) { H5C__DLL_UPDATE_FOR_SIZE_CHANGE((cache_ptr->pl_len), \ (cache_ptr->pl_size), \ (entry_ptr->size), (new_size)); - } /* end else */ + } /* end if */ /* update the hash table */ H5C__UPDATE_INDEX_FOR_SIZE_CHANGE((cache_ptr), (entry_ptr->size),\ |