summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-03-01 15:24:12 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-03-01 15:24:12 (GMT)
commit5fc283da8e7b76177ced8beceda0c0359254da63 (patch)
tree7ea167fd4192f7ac715c7a6416da0fe81e329c30
parent5abf6785cbfe3fefa63c7cfb5b88ef6268b6d2f8 (diff)
parenta01ac97ba509e51905b816e8a29b5d0b2bc8be87 (diff)
downloadhdf5-5fc283da8e7b76177ced8beceda0c0359254da63.zip
hdf5-5fc283da8e7b76177ced8beceda0c0359254da63.tar.gz
hdf5-5fc283da8e7b76177ced8beceda0c0359254da63.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit 'a01ac97ba509e51905b816e8a29b5d0b2bc8be87': Fix incorrect FUNC_LEAVE macro (should match FUNC_ENTER_*_TAG).
-rw-r--r--src/H5Dchunk.c4
-rw-r--r--src/H5Ochunk.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index 58dfbc5..e760f63 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -7203,7 +7203,7 @@ H5D__get_num_chunks(const H5D_t *dset, const H5S_t H5_ATTR_UNUSED *space, hsize_
} /* end else */
done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI_TAG(ret_value)
} /* end H5D__get_num_chunks() */
@@ -7341,7 +7341,7 @@ H5D__get_chunk_info(const H5D_t *dset, const H5S_t H5_ATTR_UNUSED *space, hsize_
} /* end if H5F_addr_defined */
done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI_TAG(ret_value)
} /* end H5D__get_chunk_info() */
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index 9ce5a46..72402e4 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -358,7 +358,7 @@ H5O__chunk_update_idx(H5F_t *f, H5O_t *oh, unsigned idx)
HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header chunk")
done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI_TAG(ret_value)
} /* end H5O__chunk_update_idx() */