summaryrefslogtreecommitdiffstats
path: root/src/H5O.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-01-31 18:19:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-01-31 18:19:49 (GMT)
commit2d74d46d3fe259ed51b2b996b56559563999e852 (patch)
treefaff172323e140a2446f90e935589708f9bd0830 /src/H5O.c
parent7191f26717255667e86c86559ffc316f73f4c1bd (diff)
downloadhdf5-2d74d46d3fe259ed51b2b996b56559563999e852.zip
hdf5-2d74d46d3fe259ed51b2b996b56559563999e852.tar.gz
hdf5-2d74d46d3fe259ed51b2b996b56559563999e852.tar.bz2
[svn-r16392] Description:
Bring r16367:16391 back from trunk into revise_chunks branch. Tested on: FreeBSD 6.3/32 (duty) (h5committest not required on this branch)
Diffstat (limited to 'src/H5O.c')
-rw-r--r--src/H5O.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/H5O.c b/src/H5O.c
index 52338cc..1d640fa 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -2273,8 +2273,7 @@ H5O_get_info(H5O_loc_t *oloc, hid_t dxpl_id, hbool_t want_ih_info, H5O_info_t *o
HDassert(oinfo);
/* Get the object header */
- if(NULL == (oh = (H5O_t *)H5AC_protect(oloc->file, dxpl_id, H5AC_OHDR, oloc->addr, NULL, NULL,
- (H5F_get_intent(oloc->file) & H5F_ACC_RDWR) ? H5AC_WRITE : H5AC_READ)))
+ if(NULL == (oh = (H5O_t *)H5AC_protect(oloc->file, dxpl_id, H5AC_OHDR, oloc->addr, NULL, NULL, H5AC_READ)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
/* Reset the object info structure */