From 498b6fed119c222277cb0db5c4d4653b5038efc0 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Thu, 12 Jul 2001 11:49:09 -0500 Subject: [svn-r4197] Purpose: Code cleanup Description: Clean up a few warnings in the library and tests, since it looks like we are going to have to roll another prelease tarball. Platforms tested: FreeBSD 4.3 (hawkwind) --- src/H5FD.c | 6 +++--- src/H5Sall.c | 4 ++-- src/H5Tprivate.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/H5FD.c b/src/H5FD.c index e53a565..a10f3b6 100644 --- a/src/H5FD.c +++ b/src/H5FD.c @@ -1296,7 +1296,7 @@ H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size) #endif assert(tmp); /* bark in debug mode */ if (tmp){ - if (tmp->size = best->size - head - size){ + if ((tmp->size = best->size - head - size)){ tmp->addr = best->addr + head + size; tmp->next = best->next; best->next = tmp; @@ -1406,8 +1406,8 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size) "driver allocation request failed"); } } else { - hsize_t wasted, tmpsize; - haddr_t oldeoa; + hsize_t wasted; + haddr_t oldeoa=0; haddr_t eoa = (file->cls->get_eoa)(file); #ifdef H5F_DEBUG diff --git a/src/H5Sall.c b/src/H5Sall.c index 80abaea..09b013d 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -284,7 +284,7 @@ H5S_all_fscat (H5F_t *f, const struct H5O_layout_t *layout, */ static hsize_t H5S_all_mgath (const void *_buf, size_t elmt_size, - const H5S_t *mem_space, H5S_sel_iter_t *mem_iter, + const H5S_t UNUSED *mem_space, H5S_sel_iter_t *mem_iter, hsize_t nelmts, void *tconv_buf/*out*/) { const uint8_t *buf=(const uint8_t*)_buf; /* Get local copies for address arithmetic */ @@ -334,7 +334,7 @@ H5S_all_mgath (const void *_buf, size_t elmt_size, */ static herr_t H5S_all_mscat (const void *tconv_buf, size_t elmt_size, - const H5S_t *mem_space, H5S_sel_iter_t *mem_iter, + const H5S_t UNUSED *mem_space, H5S_sel_iter_t *mem_iter, hsize_t nelmts, void *_buf/*out*/) { uint8_t *buf=(uint8_t *)_buf; diff --git a/src/H5Tprivate.h b/src/H5Tprivate.h index 079ea1e..28d505c 100644 --- a/src/H5Tprivate.h +++ b/src/H5Tprivate.h @@ -130,7 +130,7 @@ __DLL__ char *H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size); __DLL__ herr_t H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/); -__DLL__ herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t UNUSED ndim, hssize_t UNUSED *point, void UNUSED *_op_data); +__DLL__ herr_t H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t ndim, hssize_t *point, void *_op_data); __DLL__ htri_t H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc); /* Reference specific functions */ -- cgit v0.12