diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-31 01:48:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-31 01:48:28 (GMT) |
| commit | f555ac654b71f0bcaab99775f8c2fe1dac26bfab (patch) | |
| tree | 4373fd37a09817506dffc1df8940a5c6cb45110c /src/H5Aint.c | |
| parent | 077369969266846a92701bc7296749707db6d8f2 (diff) | |
| download | hdf5-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/H5Aint.c')
| -rw-r--r-- | src/H5Aint.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/H5Aint.c b/src/H5Aint.c index 456717b..3bfb494 100644 --- a/src/H5Aint.c +++ b/src/H5Aint.c @@ -135,20 +135,9 @@ H5A_compact_build_table_cb(H5O_t UNUSED *oh, H5O_mesg_t *mesg/*in,out*/, udata->atable->nattrs = n; } /* end if */ - /* Check for shared message */ - if(mesg->flags & H5O_MSG_FLAG_SHARED) { - /* - * If the message is shared then then the native pointer points to an - * H5O_MSG_SHARED message. We use that information to look up the real - * message in the global heap or some other object header. - */ - if(NULL == H5O_shared_read(udata->f, udata->dxpl_id, (const H5O_shared_t *)mesg->native, H5O_MSG_ATTR, &udata->atable->attrs[udata->curr_attr])) - HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to read shared attribute") - } /* end if */ - else { - if(NULL == H5A_copy(&udata->atable->attrs[udata->curr_attr], (const H5A_t *)mesg->native)) - HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute") - } /* end else */ + /* Copy attribute into table */ + if(NULL == H5A_copy(&udata->atable->attrs[udata->curr_attr], (const H5A_t *)mesg->native)) + HGOTO_ERROR(H5E_ATTR, H5E_CANTCOPY, H5_ITER_ERROR, "can't copy attribute") /* Increment current attribute */ udata->curr_attr++; |