diff options
author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-09-26 17:45:07 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2018-09-26 17:45:07 (GMT) |
commit | 06fa8a94558939400dc43e99c08a784e26dfa01d (patch) | |
tree | 8d353cf95fb7f0dab2ab7a53a24035805017b781 /src/H5AC.c | |
parent | c8b38985ff8f6cf38ada4a4d13e6d977aec260d5 (diff) | |
parent | ab84c029c492ce8c9d3bac8e03bf07e760de9cd7 (diff) | |
download | hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.zip hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.tar.gz hdf5-06fa8a94558939400dc43e99c08a784e26dfa01d.tar.bz2 |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~vchoi/my_hdf5_fork into feature/vfd_swmr
Conflicts:
src/H5AC.c
src/H5F.c
src/H5Pfapl.c
Resolve conflicts for H5AC.c, H5F.c and H5Pfapl.c
Diffstat (limited to 'src/H5AC.c')
-rw-r--r-- | src/H5AC.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -2620,7 +2620,7 @@ done: * * Purpose: Sets the metadata tag property in the provided property list. * - * Return: SUCCEED on success, FAIL otherwise. + * Return: void * * Programmer: Mike McGreevy * December 1, 2009 @@ -2924,16 +2924,15 @@ done: /*------------------------------------------------------------------------- - * Function: H5AC_set_ring + * Function: H5AC_set_ring * - * Purpose: Routine to set the ring on a DXPL (for passing through - * to the metadata cache). + * Purpose: Routine to set the ring on a DXPL (for passing through + * to the metadata cache). * - * Return: Success: Non-negative - * Failure: Negative + * Return: void * - * Programmer: Quincey Koziol - * Tuesday, September 8, 2015 + * Programmer: Quincey Koziol + * Tuesday, September 8, 2015 * *------------------------------------------------------------------------- */ @@ -2942,6 +2941,8 @@ H5AC_set_ring(H5AC_ring_t ring, H5AC_ring_t *orig_ring) { FUNC_ENTER_NOAPI_NOINIT_NOERR + /* Note: orig_ring can be NULL so don't check it with HDassert() */ + /* Get the current ring value and return that (if orig_ring is NOT null) */ if(orig_ring) *orig_ring = H5CX_get_ring(); |