summaryrefslogtreecommitdiffstats
path: root/src/H5Opline.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/H5Opline.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/H5Opline.c')
-rw-r--r--src/H5Opline.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Opline.c b/src/H5Opline.c
index fed2861..20a9d26 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -33,8 +33,8 @@
/* PRIVATE PROTOTYPES */
static herr_t H5O_pline_encode(H5F_t *f, uint8_t *p, const void *mesg);
-static void *H5O_pline_decode(H5F_t *f, hid_t dxpl_id, unsigned mesg_flags,
- unsigned *ioflags, const uint8_t *p);
+static void *H5O_pline_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
+ unsigned mesg_flags, unsigned *ioflags, const uint8_t *p);
static void *H5O_pline_copy(const void *_mesg, void *_dest);
static size_t H5O_pline_size(const H5F_t *f, const void *_mesg);
static herr_t H5O_pline_reset(void *_mesg);
@@ -107,8 +107,8 @@ H5FL_DEFINE(H5O_pline_t);
*-------------------------------------------------------------------------
*/
static void *
-H5O_pline_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags,
- unsigned UNUSED *ioflags, const uint8_t *p)
+H5O_pline_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
+ unsigned UNUSED mesg_flags, unsigned UNUSED *ioflags, const uint8_t *p)
{
H5O_pline_t *pline = NULL; /* Pipeline message */
H5Z_filter_info_t *filter; /* Filter to decode */