diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-20 22:20:00 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2011-10-20 22:20:00 (GMT) |
| commit | c36a79fd91206a67cc159e6881cb1b9fce2d2b83 (patch) | |
| tree | 3733581c711178e6cd0f23ee0fdfa9959e1896f5 /src/H5Omessage.c | |
| parent | fd619754ac6c01025528e878497aae032b9a5b78 (diff) | |
| download | hdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.zip hdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.tar.gz hdf5-c36a79fd91206a67cc159e6881cb1b9fce2d2b83.tar.bz2 | |
[svn-r21631] Port revisions 21629 and 21630 to 1.8 branch
Purpose: Update fix committed in r21556
Description:
An old patch was mistakenly committed in r21556. Replaced this fix with the
latest.
Tested: jam, koala, heiwa (h5committest)
Diffstat (limited to 'src/H5Omessage.c')
| -rw-r--r-- | src/H5Omessage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Omessage.c b/src/H5Omessage.c index e2d3ac4..467df3d 100644 --- a/src/H5Omessage.c +++ b/src/H5Omessage.c @@ -419,7 +419,7 @@ H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *ty * XXX: This doesn't handle freeing extra space in object header from * a message shrinking. */ - if((status = H5SM_try_share(f, dxpl_id, ((mesg_flags & H5O_MSG_FLAG_SHARED) ? NULL : oh), FALSE, idx_msg->type->id, mesg, &mesg_flags)) < 0) + if((status = H5SM_try_share(f, dxpl_id, ((mesg_flags & H5O_MSG_FLAG_SHARED) ? NULL : oh), 0, idx_msg->type->id, mesg, &mesg_flags)) < 0) HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "error while trying to share message") if(status == FALSE && (mesg_flags & H5O_MSG_FLAG_SHARED)) HGOTO_ERROR(H5E_OHDR, H5E_BADMESG, FAIL, "message changed sharing status") @@ -1932,7 +1932,7 @@ H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, } /* end if */ else { /* Attempt to share message */ - if(H5SM_try_share(f, dxpl_id, oh, FALSE, type->id, native, mesg_flags) < 0) + if(H5SM_try_share(f, dxpl_id, oh, 0, type->id, native, mesg_flags) < 0) HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, FAIL, "error determining if message should be shared") } /* end else */ |