diff options
| author | Neil Fortner <nfortne2@hdfgroup.org> | 2009-02-12 18:47:04 (GMT) |
|---|---|---|
| committer | Neil Fortner <nfortne2@hdfgroup.org> | 2009-02-12 18:47:04 (GMT) |
| commit | fb81174e767b62bcccd45b68611255982e96d449 (patch) | |
| tree | 55735c9f26b3e1720a061856cd14f497b356e16b /src/H5Oname.c | |
| parent | e52b18bf2c3ad7c2a58176617001d05e50cc3f51 (diff) | |
| download | hdf5-fb81174e767b62bcccd45b68611255982e96d449.zip hdf5-fb81174e767b62bcccd45b68611255982e96d449.tar.gz hdf5-fb81174e767b62bcccd45b68611255982e96d449.tar.bz2 | |
[svn-r16473] 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/H5Oname.c')
| -rw-r--r-- | src/H5Oname.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Oname.c b/src/H5Oname.c index 915546b..5ffa870 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -33,8 +33,8 @@ /* PRIVATE PROTOTYPES */ -static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, unsigned mesg_flags, - unsigned *ioflags, const uint8_t *p); +static void *H5O_name_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, + unsigned mesg_flags, unsigned *ioflags, const uint8_t *p); static herr_t H5O_name_encode(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mesg); static void *H5O_name_copy(const void *_mesg, void *_dest); static size_t H5O_name_size(const H5F_t *f, hbool_t disable_shared, const void *_mesg); @@ -84,8 +84,8 @@ const H5O_msg_class_t H5O_MSG_NAME[1] = {{ *------------------------------------------------------------------------- */ static void * -H5O_name_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, unsigned UNUSED mesg_flags, - unsigned UNUSED *ioflags, const uint8_t *p) +H5O_name_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_name_t *mesg; void *ret_value; /* Return value */ |