diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2013-08-18 00:31:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2013-08-18 00:31:01 (GMT) |
| commit | 6e58f671ec62120246a94101a80a47259ffb96c3 (patch) | |
| tree | 204ba14aa8e2fad6bb78ef8128c3f98c48e26f39 /src | |
| parent | b5a5441e7c5eb09cb53677326c3e84f80acdf108 (diff) | |
| download | hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.zip hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.gz hdf5-6e58f671ec62120246a94101a80a47259ffb96c3.tar.bz2 | |
[svn-r24021] Description:
Bring r24020 from trunk to 1.8 branch:
Clean up compiler warnings
Tested on:
Mac OSX/64 10.8.4 (amazon) w/C++ & FORTRAN
(too minor to require h5committest)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5B2hdr.c | 2 | ||||
| -rw-r--r-- | src/H5C.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c index c90b296..b73c29a 100644 --- a/src/H5B2hdr.c +++ b/src/H5B2hdr.c @@ -601,6 +601,6 @@ done: if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_BT2_HDR, hdr->addr, hdr, cache_flags) < 0) HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree header") - FUNC_LEAVE_NOAPI(SUCCEED) + FUNC_LEAVE_NOAPI(ret_value) } /* end H5B2_hdr_delete() */ @@ -3140,7 +3140,9 @@ H5C_move_entry(H5C_t * cache_ptr, haddr_t old_addr, haddr_t new_addr) { +#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS hbool_t was_dirty; +#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ H5C_cache_entry_t * entry_ptr = NULL; H5C_cache_entry_t * test_entry_ptr = NULL; #if H5C_DO_SANITY_CHECKS @@ -3237,7 +3239,9 @@ H5C_move_entry(H5C_t * cache_ptr, if ( ! ( entry_ptr->destroy_in_progress ) ) { +#if H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS was_dirty = entry_ptr->is_dirty; +#endif /* H5C_MAINTAIN_CLEAN_AND_DIRTY_LRU_LISTS */ if ( ! ( entry_ptr->flush_in_progress ) ) { |