From 7c7bedb1ad91b4d0da2a8de0b0fd0a45cb934699 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 29 Sep 1999 19:02:13 -0500 Subject: [svn-r1695] Fixed various compiler warnings.. --- src/H5D.c | 11 +++++------ src/H5Distore.c | 3 ++- src/H5FDcore.c | 6 +++--- src/H5FDmulti.c | 4 ++-- src/H5FDsec2.c | 6 +++--- src/H5Fistore.c | 3 ++- src/H5I.c | 2 ++ src/H5Shyper.c | 2 +- 8 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/H5D.c b/src/H5D.c index 18e39fc..ab3823a 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -2665,10 +2665,8 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, /* Check args */ if (NULL==op) HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid operator"); -#ifdef OLD_WAY if (buf==NULL) HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid buffer"); -#endif /* OLD_WAY */ if (H5I_DATATYPE != H5I_get_type(type_id)) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid datatype"); if (H5I_DATASPACE != H5I_get_type(space_id) || @@ -2701,7 +2699,8 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, herr_t H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf) { - const H5F_xfer_t *xfer_parms = NULL; + H5F_xfer_t tmp_xfer_parms; /* Temporary copy of the default xfer parms */ + H5F_xfer_t *xfer_parms = NULL; /* xfer parms as iterator op_data */ herr_t ret_value=FAIL; FUNC_ENTER(H5Dvlen_reclaim, FAIL); @@ -2716,15 +2715,15 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf) /* Retrieve dataset transfer property list */ if (H5P_DEFAULT == plist_id) { - xfer_parms = &H5F_xfer_dflt; + HDmemcpy(&tmp_xfer_parms,&H5F_xfer_dflt,sizeof(H5F_xfer_t)); + xfer_parms = &tmp_xfer_parms; } else if (H5P_DATA_XFER != H5P_get_class(plist_id) || NULL == (xfer_parms = H5I_object(plist_id))) { HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms"); } /* Call H5Diterate with args, etc. */ - ret_value=H5Diterate(buf,type_id,space_id,H5T_vlen_reclaim, - (void*/*FIXME*/)xfer_parms); + ret_value=H5Diterate(buf,type_id,space_id,H5T_vlen_reclaim,xfer_parms); FUNC_LEAVE(ret_value); } /* end H5Dvlen_reclaim() */ diff --git a/src/H5Distore.c b/src/H5Distore.c index 44b0ce3..a5bbac7 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -2146,6 +2146,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, * *------------------------------------------------------------------------- */ +#ifdef HAVE_PARALLEL static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, const hssize_t offset[], void *_udata/*out*/) @@ -2161,7 +2162,6 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, assert(offset); assert(udata); - for (i=0; indims; i++) { udata->key.offset[i] = offset[i]; } @@ -2174,6 +2174,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, FUNC_LEAVE (FAIL); } +#endif /* HAVE_PARALLEL */ /*------------------------------------------------------------------------- diff --git a/src/H5FDcore.c b/src/H5FDcore.c index ab9b2a0..6953ca7 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -239,7 +239,7 @@ H5FD_core_fapl_get(H5FD_t *_file) *------------------------------------------------------------------------- */ static H5FD_t * -H5FD_core_open(const char *name, unsigned flags/*unused*/, hid_t fapl_id, +H5FD_core_open(const char *name, unsigned UNUSED flags, hid_t fapl_id, haddr_t maxaddr) { H5FD_core_t *file=NULL; @@ -438,7 +438,7 @@ H5FD_core_get_eof(H5FD_t *_file) *------------------------------------------------------------------------- */ static herr_t -H5FD_core_read(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, +H5FD_core_read(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr, hsize_t size, void *buf/*out*/) { H5FD_core_t *file = (H5FD_core_t*)_file; @@ -488,7 +488,7 @@ H5FD_core_read(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, *------------------------------------------------------------------------- */ static herr_t -H5FD_core_write(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, +H5FD_core_write(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr, hsize_t size, const void *buf) { H5FD_core_t *file = (H5FD_core_t*)_file; diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index b484812..bcae358 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -765,8 +765,8 @@ H5FD_multi_sb_decode(H5FD_t *_file, const char *name, const unsigned char *buf) /* Decode name templates */ UNIQUE_MEMBERS(map, mt) { - size_t n = strlen((char *)buf)+1; - memb_name[_unmapped] = (char *)buf; + size_t n = strlen((const char *)buf)+1; + memb_name[_unmapped] = (const char *)buf; buf += (n+7) & ~0x0007; } END_MEMBERS; diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 2819300..de887c9 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -236,7 +236,7 @@ H5Pset_fapl_sec2(hid_t fapl_id) *------------------------------------------------------------------------- */ static H5FD_t * -H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id/*unused*/, +H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, haddr_t maxaddr) { unsigned o_flags; @@ -455,7 +455,7 @@ H5FD_sec2_get_eof(H5FD_t *_file) *------------------------------------------------------------------------- */ static herr_t -H5FD_sec2_read(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, +H5FD_sec2_read(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr, hsize_t size, void *buf/*out*/) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; @@ -528,7 +528,7 @@ H5FD_sec2_read(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, *------------------------------------------------------------------------- */ static herr_t -H5FD_sec2_write(H5FD_t *_file, hid_t dxpl_id/*unused*/, haddr_t addr, +H5FD_sec2_write(H5FD_t *_file, hid_t UNUSED dxpl_id, haddr_t addr, hsize_t size, const void *buf) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 44b0ce3..a5bbac7 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -2146,6 +2146,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, intn indent, * *------------------------------------------------------------------------- */ +#ifdef HAVE_PARALLEL static herr_t H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, const hssize_t offset[], void *_udata/*out*/) @@ -2161,7 +2162,6 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, assert(offset); assert(udata); - for (i=0; indims; i++) { udata->key.offset[i] = offset[i]; } @@ -2174,6 +2174,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout, FUNC_LEAVE (FAIL); } +#endif /* HAVE_PARALLEL */ /*------------------------------------------------------------------------- diff --git a/src/H5I.c b/src/H5I.c index 54026e9..126cb3d 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -1158,6 +1158,7 @@ H5I_release_id_node(H5I_id_info_t *id) * *------------------------------------------------------------------------- */ +#ifdef H5I_DEBUG static herr_t H5I_debug(H5I_type_t grp) { @@ -1204,4 +1205,5 @@ H5I_debug(H5I_type_t grp) FUNC_LEAVE(SUCCEED); } +#endif /* H5I_DEBUG */ diff --git a/src/H5Shyper.c b/src/H5Shyper.c index f56f3fa..14d36de 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -2975,7 +2975,7 @@ H5S_hyper_select_contiguous(const H5S_t *space) */ ret_value=TRUE; /* assume true and reset if the dimensions don't match */ for(i=1; iend[i]-node->start[i])+1)!=space->extent.u.simple.size[i]) { + if(((node->end[i]-node->start[i])+1)!=(hssize_t)space->extent.u.simple.size[i]) { ret_value=FALSE; break; } /* end if */ -- cgit v0.12