From 89c9bfc05b97068c7b1649e85f9cfeff87be7441 Mon Sep 17 00:00:00 2001 From: James Laird Date: Thu, 15 Jul 2004 10:43:18 -0500 Subject: [svn-r8881] Purpose: Bug fix Description: Replaced "unsigned long long" with hsize_t in H5MF Added "return 0" at end of reserved.c test Platforms tested: arabica, sleipnir --- src/H5HG.c | 2 +- src/H5MF.c | 4 ++-- test/reserved.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/H5HG.c b/src/H5HG.c index 2741fe7..6ccc0fe 100644 --- a/src/H5HG.c +++ b/src/H5HG.c @@ -962,7 +962,7 @@ H5HG_insert (H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out* new_need -= f->shared->cwfs[cwfsno]->obj[0].size; new_need = MAX(f->shared->cwfs[cwfsno]->size, new_need); - if((f->shared->cwfs[cwfsno]->size+need)<=H5HG_MAXSIZE && H5MF_can_extend(f,H5FD_MEM_GHEAP,f->shared->cwfs[cwfsno]->addr,(hsize_t)f->shared->cwfs[cwfsno]->size,(hsize_t)new_need)) { + if((f->shared->cwfs[cwfsno]->size+new_need)<=H5HG_MAXSIZE && H5MF_can_extend(f,H5FD_MEM_GHEAP,f->shared->cwfs[cwfsno]->addr,(hsize_t)f->shared->cwfs[cwfsno]->size,(hsize_t)new_need)) { if(H5HG_extend(f,f->shared->cwfs[cwfsno],size)<0) HGOTO_ERROR (H5E_HEAP, H5E_CANTINIT, FAIL, "unable to extend global heap collection"); addr = f->shared->cwfs[cwfsno]->addr; diff --git a/src/H5MF.c b/src/H5MF.c index bc241e8..7761796 100644 --- a/src/H5MF.c +++ b/src/H5MF.c @@ -304,8 +304,8 @@ void H5MF_free_reserved(H5F_t *f, hsize_t size) */ int H5MF_alloc_overflow(H5F_t *f, hsize_t size) { - unsigned long long space_needed; /* Accumulator variable */ - hsize_t c; + hsize_t space_needed; /* Accumulator variable */ + size_t c; /* Start with the current end of the file's address. */ space_needed = f->shared->lf->cls->get_eoa(f->shared->lf); diff --git a/test/reserved.c b/test/reserved.c index 99cc53d..3fb5827 100755 --- a/test/reserved.c +++ b/test/reserved.c @@ -395,5 +395,7 @@ main(void) rsrv_ohdr(); rsrv_heap(); rsrv_vlen(); + + return 0; } -- cgit v0.12