diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
| commit | 45f6d4c1eed29c45476970a9703304378a5a1073 (patch) | |
| tree | 667240a5ea57e8a072bc8ffb59ecb7281867164c /src/H5Dint.c | |
| parent | ad4b4b2b90c340bb408ddf32dd5cae780547bad2 (diff) | |
| parent | 09fa6e9c54380362f6f283ad60daef679ec91b25 (diff) | |
| download | hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.zip hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.gz hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.bz2 | |
[svn-r22274] merge from trunk, resolve conflicts
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 31cd84b..e17c0f7 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -68,7 +68,6 @@ static herr_t H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space) static herr_t H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id); static herr_t H5D_open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id); -static herr_t H5D_flush_real(H5D_t *dataset, hid_t dxpl_id); /*********************/ @@ -2440,7 +2439,8 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id) udata.dxpl_id = dxpl_id; /* Iterate over all the open datasets */ - H5I_search(H5I_DATASET, H5D_flush_cb, &udata, FALSE); + if(H5I_iterate(H5I_DATASET, H5D_flush_cb, &udata, FALSE) < 0) + HGOTO_ERROR(H5E_DATASET, H5E_BADITER, FAIL, "unable to flush cached dataset info") done: FUNC_LEAVE_NOAPI(ret_value) |