diff options
| -rw-r--r-- | src/H5HFcache.c | 1 | ||||
| -rw-r--r-- | src/H5HFdbg.c | 3 | ||||
| -rw-r--r-- | src/H5HFdblock.c | 1 | ||||
| -rw-r--r-- | src/H5HFpkg.h | 1 | ||||
| -rw-r--r-- | src/H5HFspace.c | 4 |
5 files changed, 2 insertions, 8 deletions
diff --git a/src/H5HFcache.c b/src/H5HFcache.c index 8b29bc7..847c54e 100644 --- a/src/H5HFcache.c +++ b/src/H5HFcache.c @@ -1261,7 +1261,6 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_size, /* Set block's internal information */ dblock->size = *size; dblock->file_size = 0; - dblock->blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dblock->size); /* Allocate block buffer */ /* XXX: Change to using free-list factories */ diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 6f476b8..3931eb0 100644 --- a/src/H5HFdbg.c +++ b/src/H5HFdbg.c @@ -440,9 +440,6 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, "Size of block header:", blk_prefix_size); - HDfprintf(stream, "%*s%-*s %Zu\n", indent, "", fwidth, - "Size of block offsets:", - dblock->blk_off_size); /* Allocate space for the free space markers */ if(NULL == (marker = (uint8_t *)H5MM_calloc(dblock->size))) diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index a4ce8b2..c14249c 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -138,7 +138,6 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo dblock->size = hdr->man_dtable.cparam.start_block_size; } /* end else */ dblock->file_size = 0; - dblock->blk_off_size = H5HF_SIZEOF_OFFSET_LEN(dblock->size); free_space = dblock->size - H5HF_MAN_ABS_DIRECT_OVERHEAD(hdr); /* Allocate buffer for block */ diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h index bf80164..2997b3a 100644 --- a/src/H5HFpkg.h +++ b/src/H5HFpkg.h @@ -404,7 +404,6 @@ typedef struct H5HF_direct_t { unsigned par_entry; /* Entry in parent's table */ size_t size; /* Size of direct block */ hsize_t file_size; /* Size of direct block in file (only valid when block's space is being freed) */ - unsigned blk_off_size; /* Size of offsets in the block */ uint8_t *blk; /* Pointer to buffer containing block data */ /* Stored values */ diff --git a/src/H5HFspace.c b/src/H5HFspace.c index 7978a96..aa419de 100644 --- a/src/H5HFspace.c +++ b/src/H5HFspace.c @@ -121,7 +121,7 @@ H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create) if(H5F_addr_defined(hdr->fs_addr)) { /* Open an existing free space structure for the heap */ if(NULL == (hdr->fspace = H5FS_open(hdr->f, dxpl_id, hdr->fs_addr, - NELMTS(classes), classes, hdr, H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF))) + NELMTS(classes), classes, hdr, (hsize_t)H5HF_FSPACE_THRHD_DEF, (hsize_t)H5HF_FSPACE_ALIGN_DEF))) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info") } /* end if */ else { @@ -138,7 +138,7 @@ H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create) /* Create the free space structure for the heap */ if(NULL == (hdr->fspace = H5FS_create(hdr->f, dxpl_id, &hdr->fs_addr, - &fs_create, NELMTS(classes), classes, hdr, H5HF_FSPACE_THRHD_DEF, H5HF_FSPACE_ALIGN_DEF))) + &fs_create, NELMTS(classes), classes, hdr, (hsize_t)H5HF_FSPACE_THRHD_DEF, (hsize_t)H5HF_FSPACE_ALIGN_DEF))) HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize free space info") HDassert(H5F_addr_defined(hdr->fs_addr)); } /* end if */ |