diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:05:36 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2017-03-10 15:05:36 (GMT) |
| commit | 281c24a5a91b16eaf498e5dd5af783773c228758 (patch) | |
| tree | 4777cd13a47ce3bc7a043090598c0682b9372ee7 /src/H5Cquery.c | |
| parent | 104d63f25a8cb6e156bc901eb85aafc0b67775ee (diff) | |
| download | hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.zip hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.tar.gz hdf5-281c24a5a91b16eaf498e5dd5af783773c228758.tar.bz2 | |
Revert "Merge latest changes from develop"
This reverts commit 104d63f25a8cb6e156bc901eb85aafc0b67775ee.
Diffstat (limited to 'src/H5Cquery.c')
| -rw-r--r-- | src/H5Cquery.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Cquery.c b/src/H5Cquery.c index 33a322d..f5409f7 100644 --- a/src/H5Cquery.c +++ b/src/H5Cquery.c @@ -131,7 +131,7 @@ H5C_get_cache_size(H5C_t * cache_ptr, size_t * max_size_ptr, size_t * min_clean_size_ptr, size_t * cur_size_ptr, - uint32_t * cur_num_entries_ptr) + int32_t * cur_num_entries_ptr) { herr_t ret_value = SUCCEED; /* Return value */ @@ -444,8 +444,7 @@ H5C_get_entry_ring(const H5F_t *f, haddr_t addr, H5C_ring_t *ring) /* Locate the entry at the address */ H5C__SEARCH_INDEX(cache_ptr, addr, entry_ptr, FAIL) - if(entry_ptr == NULL) - HGOTO_ERROR(H5E_CACHE, H5E_NOTFOUND, FAIL, "can't find entry in index") + HDassert(entry_ptr); /* Return the ring value */ *ring = entry_ptr->ring; |