diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 03:58:43 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 03:58:43 (GMT) |
| commit | 9333a2e39c9a496f2a21a97d772493932c3f66d4 (patch) | |
| tree | 45875ff8c9f35c0020dc5ef5abd6cb8733002d15 /src/H5Oainfo.c | |
| parent | 32f21214bb0215e77c4819be9462e254c4532b85 (diff) | |
| download | hdf5-9333a2e39c9a496f2a21a97d772493932c3f66d4.zip hdf5-9333a2e39c9a496f2a21a97d772493932c3f66d4.tar.gz hdf5-9333a2e39c9a496f2a21a97d772493932c3f66d4.tar.bz2 | |
[svn-r29548] Minor normalization w/ trunk in preparation for big merge.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial
autotools parallel (MPICH 3.1.4)
Diffstat (limited to 'src/H5Oainfo.c')
| -rw-r--r-- | src/H5Oainfo.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index c5f692d..ab26c17 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -346,9 +346,11 @@ H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_ HDassert(ainfo); /* If the object is using "dense" attribute storage, delete it */ - if(H5F_addr_defined(ainfo->fheap_addr)) + if(H5F_addr_defined(ainfo->fheap_addr)) { + /* Delete the attribute */ if(H5A_dense_delete(f, dxpl_id, ainfo) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free dense attribute storage") + } /* end if */ done: FUNC_LEAVE_NOAPI(ret_value) @@ -428,7 +430,7 @@ H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, *ainfo_dst = *ainfo_src; if(H5F_addr_defined(ainfo_src->fheap_addr)) { - /* copy dense attribute */ + /* Prepare to copy dense attributes - actual copy in post_copy */ /* Set copied metadata tag */ H5_BEGIN_TAG(dxpl_id, H5AC__COPIED_TAG, NULL); |