diff options
Diffstat (limited to 'src/H5HL.c')
| -rw-r--r-- | src/H5HL.c | 25 |
1 files changed, 14 insertions, 11 deletions
@@ -110,7 +110,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/) /* allocate file version */ total_size = H5HL_SIZEOF_HDR(f) + size_hint; - if (H5MF_alloc(f, H5MF_META, total_size, addr/*out*/) < 0) { + if (H5MF_alloc(f, H5MF_META, (hsize_t)total_size, addr/*out*/) < 0) { HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate file memory"); } @@ -118,7 +118,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/) /* allocate memory version */ heap = H5MM_xcalloc(1, sizeof(H5HL_t)); heap->addr = *addr; - H5F_addr_inc(&(heap->addr), H5HL_SIZEOF_HDR(f)); + H5F_addr_inc(&(heap->addr), (hsize_t)H5HL_SIZEOF_HDR(f)); heap->disk_alloc = size_hint; heap->mem_alloc = size_hint; heap->chunk = H5MM_xcalloc(1, H5HL_SIZEOF_HDR(f) + size_hint); @@ -162,7 +162,8 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr/*out*/) *------------------------------------------------------------------------- */ static H5HL_t * -H5HL_load(H5F_t *f, const haddr_t *addr, const void *udata1, void *udata2) +H5HL_load(H5F_t *f, const haddr_t *addr, const void __unused__ *udata1, + void __unused__ *udata2) { uint8 hdr[52]; const uint8 *p = NULL; @@ -180,7 +181,7 @@ H5HL_load(H5F_t *f, const haddr_t *addr, const void *udata1, void *udata2) assert(!udata1); assert(!udata2); - if (H5F_block_read(f, addr, H5HL_SIZEOF_HDR(f), hdr) < 0) { + if (H5F_block_read(f, addr, (hsize_t)H5HL_SIZEOF_HDR(f), hdr) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_READERROR, NULL, "unable to read heap header"); } @@ -212,7 +213,7 @@ H5HL_load(H5F_t *f, const haddr_t *addr, const void *udata1, void *udata2) H5F_addr_decode(f, &p, &(heap->addr)); heap->chunk = H5MM_xcalloc(1, H5HL_SIZEOF_HDR(f) + heap->mem_alloc); if (heap->disk_alloc && - H5F_block_read(f, &(heap->addr), heap->disk_alloc, + H5F_block_read(f, &(heap->addr), (hsize_t)(heap->disk_alloc), heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) { HGOTO_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL, "unable to read heap data"); @@ -296,13 +297,13 @@ H5HL_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5HL_t *heap) */ if (heap->mem_alloc > heap->disk_alloc) { haddr_t old_addr = heap->addr, new_addr; - if (H5MF_alloc(f, H5MF_META, heap->mem_alloc, + if (H5MF_alloc(f, H5MF_META, (hsize_t)(heap->mem_alloc), &new_addr/*out*/)<0) { HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate file space for heap"); } heap->addr = new_addr; - H5MF_free(f, &old_addr, heap->disk_alloc); + H5MF_free(f, &old_addr, (hsize_t)(heap->disk_alloc)); H5E_clear(); /*don't really care if the free failed */ heap->disk_alloc = heap->mem_alloc; } @@ -339,20 +340,22 @@ H5HL_flush(H5F_t *f, hbool_t destroy, const haddr_t *addr, H5HL_t *heap) * Copy buffer to disk. */ hdr_end_addr = *addr; - H5F_addr_inc(&hdr_end_addr, H5HL_SIZEOF_HDR(f)); + H5F_addr_inc(&hdr_end_addr, (hsize_t)H5HL_SIZEOF_HDR(f)); if (H5F_addr_eq(&(heap->addr), &hdr_end_addr)) { /* The header and data are contiguous */ - if (H5F_block_write(f, addr, H5HL_SIZEOF_HDR(f) + heap->disk_alloc, + if (H5F_block_write(f, addr, + (hsize_t)(H5HL_SIZEOF_HDR(f)+heap->disk_alloc), heap->chunk) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap header and data to file"); } } else { - if (H5F_block_write(f, addr, H5HL_SIZEOF_HDR(f), heap->chunk)<0) { + if (H5F_block_write(f, addr, (hsize_t)H5HL_SIZEOF_HDR(f), + heap->chunk)<0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap header to file"); } - if (H5F_block_write(f, &(heap->addr), heap->disk_alloc, + if (H5F_block_write(f, &(heap->addr), (hsize_t)(heap->disk_alloc), heap->chunk + H5HL_SIZEOF_HDR(f)) < 0) { HRETURN_ERROR(H5E_HEAP, H5E_WRITEERROR, FAIL, "unable to write heap data to file"); |