diff options
| author | Kimmy Mu <kmu@hdfgroup.org> | 2020-01-23 01:46:53 (GMT) |
|---|---|---|
| committer | kmu <kmu@hdfgroup.org> | 2020-01-28 02:39:58 (GMT) |
| commit | 066b874e5a6eb828afea655b6ea5c2ac70abb9e8 (patch) | |
| tree | 86505edf2affdf6c2e898725e95e72fe8dca63d3 /src/H5C.c | |
| parent | d038d8510032696e4defd86f1906e7d4fa133ba9 (diff) | |
| download | hdf5-066b874e5a6eb828afea655b6ea5c2ac70abb9e8.zip hdf5-066b874e5a6eb828afea655b6ea5c2ac70abb9e8.tar.gz hdf5-066b874e5a6eb828afea655b6ea5c2ac70abb9e8.tar.bz2 | |
Merge pull request #2094 in HDFFV/hdf5 from ~KMU/hdf5:bugfix/unused to develop
* commit '145ef3ceee20c28a443bd11507c58858bea3f889':
more cleanup
change it back
pick up missing piece
fix unused related warnings
removed unused parameter
more fix and address comments
remove unsed var,function,macro, etc
Diffstat (limited to 'src/H5C.c')
| -rw-r--r-- | src/H5C.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -1056,7 +1056,6 @@ H5C_flush_cache(H5F_t *f, unsigned flags) H5C_ring_t ring; H5C_t * cache_ptr; hbool_t destroy; - hbool_t ignore_protected; herr_t ret_value = SUCCEED; FUNC_ENTER_NOAPI(FAIL) @@ -1101,9 +1100,8 @@ H5C_flush_cache(H5F_t *f, unsigned flags) HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "an extreme sanity check failed on entry") #endif /* H5C_DO_EXTREME_SANITY_CHECKS */ - ignore_protected = ( (flags & H5C__FLUSH_IGNORE_PROTECTED_FLAG) != 0 ); destroy = ( (flags & H5C__FLUSH_INVALIDATE_FLAG) != 0 ); - HDassert( ! ( destroy && ignore_protected ) ); + HDassert( ! ( destroy && ( (flags & H5C__FLUSH_IGNORE_PROTECTED_FLAG) != 0 )) ); HDassert( ! ( cache_ptr->flush_in_progress ) ); cache_ptr->flush_in_progress = TRUE; @@ -3856,7 +3854,11 @@ H5C__unpin_entry_real(H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr, { herr_t ret_value = SUCCEED; /* Return value */ +#if H5C_DO_SANITY_CHECKS FUNC_ENTER_STATIC +#else + FUNC_ENTER_STATIC_NOERR +#endif /* Sanity checking */ HDassert(cache_ptr); @@ -3873,7 +3875,9 @@ H5C__unpin_entry_real(H5C_t *cache_ptr, H5C_cache_entry_t *entry_ptr, /* Update the stats for an unpin operation */ H5C__UPDATE_STATS_FOR_UNPIN(cache_ptr, entry_ptr) +#if H5C_DO_SANITY_CHECKS done: +#endif FUNC_LEAVE_NOAPI(ret_value) } /* H5C__unpin_entry_real() */ |