diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 05:19:52 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-24 05:19:52 (GMT) |
| commit | 53a286f7dad9343ee174bc83d8e39bb0e107daa7 (patch) | |
| tree | 1e037890c66fcdcd5a607586819eabb687130421 | |
| parent | caf3b0db1486e35d237181ae50b189d6fca5f417 (diff) | |
| download | hdf5-53a286f7dad9343ee174bc83d8e39bb0e107daa7.zip hdf5-53a286f7dad9343ee174bc83d8e39bb0e107daa7.tar.gz hdf5-53a286f7dad9343ee174bc83d8e39bb0e107daa7.tar.bz2 | |
[svn-r29552] Normalization with revise_chunks in preparation for big merge.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial
| -rw-r--r-- | src/H5Oainfo.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c index ab26c17..44c6611 100644 --- a/src/H5Oainfo.c +++ b/src/H5Oainfo.c @@ -324,7 +324,9 @@ H5O_ainfo_free(void *mesg) /*------------------------------------------------------------------------- * Function: H5O_ainfo_delete * - * Purpose: Free file space referenced by message + * Purpose: Free file space referenced by message. Note that open_oh + * *must* be non-NULL - this means that calls to + * H5O_msg_delete must include an oh if the type is ainfo. * * Return: Non-negative on success/Negative on failure * @@ -334,7 +336,7 @@ H5O_ainfo_free(void *mesg) *------------------------------------------------------------------------- */ static herr_t -H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_mesg) +H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg) { H5O_ainfo_t *ainfo = (H5O_ainfo_t *)_mesg; herr_t ret_value = SUCCEED; /* Return value */ @@ -344,6 +346,7 @@ H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t H5_ATTR_UNUSED *open_oh, void *_ /* check args */ HDassert(f); HDassert(ainfo); + HDassert(open_oh); /* If the object is using "dense" attribute storage, delete it */ if(H5F_addr_defined(ainfo->fheap_addr)) { |