summaryrefslogtreecommitdiffstats
path: root/src/H5SM.c
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2009-02-12 18:50:21 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2009-02-12 18:50:21 (GMT)
commitb487c22c4266a53c916c575fa7282deac447a64e (patch)
treeb83b5608ec23a5cbd6a67bafe7eaa2b91c4e1089 /src/H5SM.c
parentb566fea225bcbe95aa1e3c356803a5b8288e5106 (diff)
downloadhdf5-b487c22c4266a53c916c575fa7282deac447a64e.zip
hdf5-b487c22c4266a53c916c575fa7282deac447a64e.tar.gz
hdf5-b487c22c4266a53c916c575fa7282deac447a64e.tar.bz2
[svn-r16474] Purpose: fix problems related to 'self-referential' attributes
Description: When an attribute was created with a datatype or dataspace that was shared in the same object header that the attribute was in, the attribute could not be deleted. Changes made to ensure that the attribute can be deleted both when the attribute is in the object header and when it is shared in the heap. Object header message decode routines now take an "open_oh" parameter to enable them to avoid opening the same object header twice. Tested: jam, smirom (h5committest)
Diffstat (limited to 'src/H5SM.c')
-rwxr-xr-xsrc/H5SM.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5SM.c b/src/H5SM.c
index d942399..c383877 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -1402,7 +1402,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
* master table needs to be unprotected when we do this.
*/
if(mesg_buf) {
- if(NULL == (native_mesg = H5O_msg_decode(f, dxpl_id, type_id, (const unsigned char *)mesg_buf)))
+ if(NULL == (native_mesg = H5O_msg_decode(f, dxpl_id, open_oh, type_id, (const unsigned char *)mesg_buf)))
HGOTO_ERROR(H5E_OHDR, H5E_CANTDECODE, FAIL, "can't decode shared message.")
if(H5O_msg_delete(f, dxpl_id, open_oh, type_id, native_mesg) < 0)