diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-07 21:24:29 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2006-08-07 21:24:29 (GMT) |
| commit | d17d42acd0fbba4b3433937f448c99930553b038 (patch) | |
| tree | a6535d4c7f313315ad6e326ded953cdaf6df1ce9 /src/H5HFdtable.c | |
| parent | 4f289e5b9240807d9fa5561fd793981334a9f086 (diff) | |
| download | hdf5-d17d42acd0fbba4b3433937f448c99930553b038.zip hdf5-d17d42acd0fbba4b3433937f448c99930553b038.tar.gz hdf5-d17d42acd0fbba4b3433937f448c99930553b038.tar.bz2 | |
[svn-r12552] Description:
More tweaks on fractal heap statistics, to better separate information
about managed objects from information about "huge" objects.
Also, clean up some compiler warnings, etc. on 64-bit platforms & Windows.
Platforms tested:
Linux/32 2.6 (chicago)
Linux/64 2.6 (chicago)
Diffstat (limited to 'src/H5HFdtable.c')
| -rw-r--r-- | src/H5HFdtable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5HFdtable.c b/src/H5HFdtable.c index e0e2ff9..700ae9e 100644 --- a/src/H5HFdtable.c +++ b/src/H5HFdtable.c @@ -103,10 +103,10 @@ H5HF_dtable_init(H5HF_dtable_t *dtable) HDassert(dtable); /* Compute/cache some values */ - dtable->start_bits = H5V_log2_of2(dtable->cparam.start_block_size); + dtable->start_bits = H5V_log2_of2((uint32_t)dtable->cparam.start_block_size); dtable->first_row_bits = dtable->start_bits + H5V_log2_of2(dtable->cparam.width); dtable->max_root_rows = (dtable->cparam.max_index - dtable->first_row_bits) + 1; - dtable->max_direct_bits = H5V_log2_of2(dtable->cparam.max_direct_size); + dtable->max_direct_bits = H5V_log2_of2((uint32_t)dtable->cparam.max_direct_size); dtable->max_direct_rows = (dtable->max_direct_bits - dtable->start_bits) + 2; dtable->num_id_first_row = dtable->cparam.start_block_size * dtable->cparam.width; dtable->max_dir_blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dtable->cparam.max_direct_size); @@ -245,7 +245,7 @@ H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size) if(block_size == dtable->cparam.start_block_size) row = 0; else - row = (H5V_log2_of2((uint32_t)block_size) - H5V_log2_of2(dtable->cparam.start_block_size)) + 1; + row = (H5V_log2_of2((uint32_t)block_size) - H5V_log2_of2((uint32_t)dtable->cparam.start_block_size)) + 1; FUNC_LEAVE_NOAPI(row) } /* end H5HF_dtable_size_to_row() */ |