diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-14 13:09:42 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-01-14 13:09:42 (GMT) |
| commit | a365f0e6aabfa6a13b008e0263e6a2d6c86d5d7e (patch) | |
| tree | a99fc3c171fc1fd0080f8ca9519e907450fba744 /src/H5HFman.c | |
| parent | 84a14c0f25b52a9bba1e2be59051b18cb0317b15 (diff) | |
| download | hdf5-a365f0e6aabfa6a13b008e0263e6a2d6c86d5d7e.zip hdf5-a365f0e6aabfa6a13b008e0263e6a2d6c86d5d7e.tar.gz hdf5-a365f0e6aabfa6a13b008e0263e6a2d6c86d5d7e.tar.bz2 | |
[svn-r16306] Description:
Bring r16305 back from revise_chunks branch:
Add detection of C99 "designated initializers" to configure script and
use new H5_HAVE_C99_DESIGNATED_INITIALIZER macro to conditionally compile
default layout variables in src/H5Pdcpl.c
Also, minor code cleanups, etc.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(Other platforms tested on branch)
Diffstat (limited to 'src/H5HFman.c')
| -rw-r--r-- | src/H5HFman.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/H5HFman.c b/src/H5HFman.c index e069e82..5bdc769 100644 --- a/src/H5HFman.c +++ b/src/H5HFman.c @@ -174,7 +174,8 @@ HDfprintf(stderr, "%s: sec_node->u.single.par_entry = %u\n", FUNC, sec_node->u.s /* Insert object into block */ /* Get the offset of the object within the block */ - blk_off = sec_node->sect_info.addr - dblock->block_off; + H5_CHECK_OVERFLOW((sec_node->sect_info.addr - dblock->block_off), hsize_t, size_t); + blk_off = (size_t)(sec_node->sect_info.addr - dblock->block_off); #ifdef QAK HDfprintf(stderr, "%s: blk_off = %Zu\n", FUNC, blk_off); HDfprintf(stderr, "%s: dblock->block_off = %Hu\n", FUNC, dblock->block_off); @@ -328,7 +329,8 @@ HDfprintf(stderr, "%s: entry address = %a\n", FUNC, iblock->ents[entry].addr); /* Set direct block info */ dblock_addr = iblock->ents[entry].addr; - dblock_size = hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width]; + H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width]), hsize_t, size_t); + dblock_size = (size_t)hdr->man_dtable.row_block_size[entry / hdr->man_dtable.cparam.width]; /* Check for offset of invalid direct block */ if(!H5F_addr_defined(dblock_addr)) { @@ -582,7 +584,8 @@ HDfprintf(stderr, "%s: entry address = %a\n", FUNC, iblock->ents[dblock_entry].a HGOTO_ERROR(H5E_HEAP, H5E_BADRANGE, FAIL, "fractal heap ID not in allocated direct block") /* Set direct block info */ - dblock_size = hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]; + H5_CHECK_OVERFLOW((hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]), hsize_t, size_t); + dblock_size = (size_t)(hdr->man_dtable.row_block_size[dblock_entry / hdr->man_dtable.cparam.width]); /* Compute the direct block's offset in the heap's address space */ /* (based on parent indirect block's block offset) */ |