summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2013-08-17 20:05:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2013-08-17 20:05:27 (GMT)
commit308c378ccd9310b19c12d524d123cf5d352b6260 (patch)
tree69a4527bd8f8777151cd71832ecbc6e802cc0171 /src
parentd663d78cd274a48b702a2d3ce17fa6bb01be1ae1 (diff)
downloadhdf5-308c378ccd9310b19c12d524d123cf5d352b6260.zip
hdf5-308c378ccd9310b19c12d524d123cf5d352b6260.tar.gz
hdf5-308c378ccd9310b19c12d524d123cf5d352b6260.tar.bz2
[svn-r24020] Description:
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.c2
-rw-r--r--src/H5C.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index 60eff61..2148f1e 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() */
diff --git a/src/H5C.c b/src/H5C.c
index 0946af9..a63f98e 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -3339,7 +3339,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
@@ -3436,7 +3438,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 ) ) {