summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2006-08-13 04:18:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2006-08-13 04:18:45 (GMT)
commitc4a5b8e16cdf66d1cf4b70587a6747f03557b2ef (patch)
tree387131d5f9a887c2f85fb60eec5a1357e7882702 /src
parent23d1007926379cc0ff896bedf325215e0d101e1c (diff)
downloadhdf5-c4a5b8e16cdf66d1cf4b70587a6747f03557b2ef.zip
hdf5-c4a5b8e16cdf66d1cf4b70587a6747f03557b2ef.tar.gz
hdf5-c4a5b8e16cdf66d1cf4b70587a6747f03557b2ef.tar.bz2
[svn-r12573] Description:
Clean up a couple of compiler warnings in the 'huge' object code in the library. Add a bunch of 'huge' object regression tests Tested on: FreeBSD 4.11 (sleipnir) Linux/64 2.4 (mir) Solaris/64 2.9 (shanti)
Diffstat (limited to 'src')
-rw-r--r--src/H5HFhuge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index 517367b..ca256e6 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -121,7 +121,7 @@ H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id)
rrec_size = hdr->sizeof_addr + hdr->sizeof_size + hdr->huge_id_size;
/* Create v2 B-tree for tracking 'huge' objects */
- if(H5B2_create(hdr->f, dxpl_id, &hdr->huge_bt2_class, H5HF_HUGE_BT2_NODE_SIZE, rrec_size,
+ if(H5B2_create(hdr->f, dxpl_id, &hdr->huge_bt2_class, (size_t)H5HF_HUGE_BT2_NODE_SIZE, rrec_size,
H5HF_HUGE_BT2_SPLIT_PERC, H5HF_HUGE_BT2_MERGE_PERC, &hdr->huge_bt2_addr/*out*/) < 0)
HGOTO_ERROR(H5E_HEAP, H5E_CANTCREATE, FAIL, "can't create v2 B-tree for tracking 'huge' heap objects")
@@ -373,7 +373,7 @@ herr_t
H5HF_huge_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
{
haddr_t obj_addr; /* Object's address in the file */
- hsize_t obj_size; /* Object's size in the file */
+ hsize_t obj_size = 0; /* Object's size in the file */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_read)