summaryrefslogtreecommitdiffstats
path: root/src/H5H.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1998-01-28 20:24:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1998-01-28 20:24:49 (GMT)
commit55ac27633ba1984d4296159bf06f562d0adaec61 (patch)
tree96a3cd0deec4a113b915b8c527fd4d410074718c /src/H5H.c
parent9287018553d4bc83c1d7bb7691bb3a501604b942 (diff)
downloadhdf5-55ac27633ba1984d4296159bf06f562d0adaec61.zip
hdf5-55ac27633ba1984d4296159bf06f562d0adaec61.tar.gz
hdf5-55ac27633ba1984d4296159bf06f562d0adaec61.tar.bz2
[svn-r188] Changed hbool_t from an enum to 'int' and removed BTRUE/BFALSE/BFAIL from code.
Changed interface to the H5P..hyperslab functions to 'int' instead of 'size_t'. Cleaned up lots of warnings on IRIX 6.2 platform. Minor other tweaks to get to a mostly clean build on the SGI. It still whines about 'long long' being non-standard and some "pointless comparison of unsigned with 0" but those aren't big problems.
Diffstat (limited to 'src/H5H.c')
-rw-r--r--src/H5H.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/H5H.c b/src/H5H.c
index 65e26c3..5911330 100644
--- a/src/H5H.c
+++ b/src/H5H.c
@@ -111,7 +111,6 @@ H5H_create(H5F_t *f, H5H_type_t heap_type, size_t size_hint,
"heap\n");
#endif
}
- size_hint = MAX(0, size_hint);
if (size_hint && size_hint < H5H_SIZEOF_FREE(f)) {
size_hint = H5H_SIZEOF_FREE(f);
}
@@ -416,7 +415,6 @@ H5H_read(H5F_t *f, const haddr_t *addr, size_t offset, size_t size, void *buf)
if (!addr)
addr = &(f->shared->smallobj_addr);
assert(H5F_addr_defined(addr));
- assert(offset >= 0);
if (NULL == (heap = H5AC_find(f, H5AC_HEAP, addr, NULL, NULL))) {
HRETURN_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL,
@@ -478,7 +476,6 @@ H5H_peek(H5F_t *f, const haddr_t *addr, size_t offset)
if (!addr)
addr = &(f->shared->smallobj_addr);
assert(H5F_addr_defined(addr));
- assert(offset >= 0);
if (NULL == (heap = H5AC_find(f, H5AC_HEAP, addr, NULL, NULL))) {
HRETURN_ERROR(H5E_HEAP, H5E_CANTLOAD, NULL,
@@ -548,7 +545,7 @@ H5H_insert(H5F_t *f, const haddr_t *addr, size_t buf_size, const void *buf)
size_t need_size, old_size, need_more;
hbool_t found;
#ifndef NDEBUG
- static nmessages = 0;
+ static int nmessages = 0;
#endif
FUNC_ENTER(H5H_insert, (size_t)(-1));
@@ -604,7 +601,7 @@ H5H_insert(H5F_t *f, const haddr_t *addr, size_t buf_size, const void *buf)
* can extend that free chunk. Otherwise we'll have to make another
* free chunk. If the heap must expand, we double its size.
*/
- if (!found) {
+ if (found==FALSE) {
need_more = MAX3(need_size, heap->mem_alloc, H5H_SIZEOF_FREE(f));
@@ -719,7 +716,6 @@ H5H_write(H5F_t *f, const haddr_t *addr, size_t offset, size_t size,
if (!addr)
addr = &(f->shared->smallobj_addr);
assert(H5F_addr_defined(addr));
- assert(offset >= 0);
assert(buf);
if (NULL == (heap = H5AC_find(f, H5AC_HEAP, addr, NULL, NULL))) {
@@ -782,7 +778,6 @@ H5H_remove(H5F_t *f, const haddr_t *addr, size_t offset, size_t size)
if (!addr)
addr = &(f->shared->smallobj_addr);
assert(H5F_addr_defined(addr));
- assert(offset >= 0);
assert(size > 0);
if (NULL == (heap = H5AC_find(f, H5AC_HEAP, addr, NULL, NULL))) {