summaryrefslogtreecommitdiffstats
path: root/src/H5B.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2012-10-12 03:23:08 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2012-10-12 03:23:08 (GMT)
commit75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d (patch)
tree231f8995f999d21e2ee96d6be012b1f2805d4134 /src/H5B.c
parentd2f3c1b991b1990fe70afa64b3ca1941165a94c4 (diff)
downloadhdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.zip
hdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.tar.gz
hdf5-75cdc2dedf20a0fefb44e69e9744e7a1fc778d0d.tar.bz2
[svn-r22887] Purpose:
Fixes a variety of compile warnings and issues in the B-tree and heap code. Tested on: jam
Diffstat (limited to 'src/H5B.c')
-rw-r--r--src/H5B.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5B.c b/src/H5B.c
index 36d901e..b75939c 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -1939,7 +1939,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
/* Get shared info for B-tree */
if(NULL == (rc_shared = (type->get_shared)(f, udata)))
- HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
+ HGOTO_ERROR(H5E_BTREE, H5E_CANTGET, FAIL, "can't retrieve B-tree's shared ref. count object")
shared = (H5B_shared_t *)H5RC_GET_OBJ(rc_shared);
HDassert(shared);
@@ -1949,7 +1949,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
cache_udata.parent = parent;
cache_udata.rc_shared = rc_shared;
if(NULL == (bt = (H5B_t *)H5AC_protect(f, dxpl_id, H5AC_BT, addr, &cache_udata, H5AC_WRITE)))
- HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
+ HGOTO_ERROR(H5E_BTREE, H5E_CANTPROTECT, FAIL, "unable to load B-tree node")
/* Iterate over all children in tree, deleting them */
if(bt->level > 0) {
@@ -1976,7 +1976,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
} /* end else */
done:
- if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, H5AC__DELETED_FLAG | (shared->swmr_write ? 0 : H5AC__FREE_FILE_SPACE_FLAG)) < 0)
+ if(bt && H5AC_unprotect(f, dxpl_id, H5AC_BT, addr, bt, (unsigned)(H5AC__DELETED_FLAG | (shared->swmr_write ? 0 : H5AC__FREE_FILE_SPACE_FLAG))) < 0)
HDONE_ERROR(H5E_BTREE, H5E_CANTUNPROTECT, FAIL, "unable to release B-tree node in cache")
FUNC_LEAVE_NOAPI(ret_value)