summaryrefslogtreecommitdiffstats
path: root/src/H5Omessage.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-01-31 01:48:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-01-31 01:48:28 (GMT)
commitf555ac654b71f0bcaab99775f8c2fe1dac26bfab (patch)
tree4373fd37a09817506dffc1df8940a5c6cb45110c /src/H5Omessage.c
parent077369969266846a92701bc7296749707db6d8f2 (diff)
downloadhdf5-f555ac654b71f0bcaab99775f8c2fe1dac26bfab.zip
hdf5-f555ac654b71f0bcaab99775f8c2fe1dac26bfab.tar.gz
hdf5-f555ac654b71f0bcaab99775f8c2fe1dac26bfab.tar.bz2
[svn-r13226] Description:
Add attributes to the message classes that use the shared message method calling interface, completing the transition. The other mechanism will be removed shortly. Tested on: Mac OS X/32 10.4.8 (amazon) FreeBSD/32 6.2 (duty)
Diffstat (limited to 'src/H5Omessage.c')
-rw-r--r--src/H5Omessage.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 6d4a15c..1c9235e 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -2086,7 +2086,7 @@ H5O_new_mesg(H5F_t *f, H5O_t *oh, unsigned *mesg_flags, const H5O_msg_class_t *o
/* Check if message is already shared */
if((shared_mesg = H5O_msg_is_shared((*new_type)->id, (*new_mesg))) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_WRITEERROR, UFAIL, "error determining if message is shared")
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, UFAIL, "error determining if message is shared")
else if(shared_mesg > 0) {
/* Increment message's reference count */
if((*new_type)->link && ((*new_type)->link)(f, dxpl_id, (*new_mesg)) < 0)
@@ -2094,7 +2094,7 @@ H5O_new_mesg(H5F_t *f, H5O_t *oh, unsigned *mesg_flags, const H5O_msg_class_t *o
*mesg_flags |= H5O_MSG_FLAG_SHARED;
} /* end if */
else {
- /* Check for unsharable message */
+ /* Avoid unsharable messages */
if(!(*mesg_flags & H5O_MSG_FLAG_DONTSHARE)) {
/* Attempt to share message */
if((shared_mesg = H5SM_try_share(f, dxpl_id, (*new_type)->id, (*new_mesg))) > 0)
@@ -2222,7 +2222,7 @@ H5O_msg_delete(H5F_t *f, hid_t dxpl_id, unsigned type_id, const void *mesg)
HDassert(type);
/* delete */
- if((type->del) && (type->del)(f, dxpl_id, mesg, 1) < 0)
+ if((type->del) && (type->del)(f, dxpl_id, mesg, TRUE) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
done: