summaryrefslogtreecommitdiffstats
path: root/src/H5D.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>1999-09-30 00:02:13 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>1999-09-30 00:02:13 (GMT)
commit7c7bedb1ad91b4d0da2a8de0b0fd0a45cb934699 (patch)
tree59fa2c71cd354680db45abdbec59e976d30b5d7d /src/H5D.c
parent72cf03cdbdce7b7bdfcac89c644129ca8ec39463 (diff)
downloadhdf5-7c7bedb1ad91b4d0da2a8de0b0fd0a45cb934699.zip
hdf5-7c7bedb1ad91b4d0da2a8de0b0fd0a45cb934699.tar.gz
hdf5-7c7bedb1ad91b4d0da2a8de0b0fd0a45cb934699.tar.bz2
[svn-r1695] Fixed various compiler warnings..
Diffstat (limited to 'src/H5D.c')
-rw-r--r--src/H5D.c11
1 files changed, 5 insertions, 6 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() */