diff options
author | Dana Robinson <derobins@hdfgroup.org> | 2019-08-15 00:34:56 (GMT) |
---|---|---|
committer | Dana Robinson <derobins@hdfgroup.org> | 2019-08-15 00:34:56 (GMT) |
commit | 6b8d369a0c8e3f317fd7c3b665254c75265ceba0 (patch) | |
tree | 7771ca616d493148457793926a17f71892e0489e /src/H5ACmpio.c | |
parent | 300372ce33ce22794f24301bc29008eb4ee2b661 (diff) | |
parent | bd8da502cf5b763433e3c628a4043a4264529cec (diff) | |
download | hdf5-6b8d369a0c8e3f317fd7c3b665254c75265ceba0.zip hdf5-6b8d369a0c8e3f317fd7c3b665254c75265ceba0.tar.gz hdf5-6b8d369a0c8e3f317fd7c3b665254c75265ceba0.tar.bz2 |
Merge pull request #1873 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:H5Pset_fapl_mpi to develop
* commit 'bd8da502cf5b763433e3c628a4043a4264529cec':
Some refactoring prior to implementing new H5P MPI functions. * Macro cleanup and obvious warning fixes in parallel code. * Moved H5FD comm and info dup/free wrapper code to a new H5mpi.c file and separated it to deal with each MPI type separately.
Diffstat (limited to 'src/H5ACmpio.c')
-rw-r--r-- | src/H5ACmpio.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c index b60b933..e4b81fa 100644 --- a/src/H5ACmpio.c +++ b/src/H5ACmpio.c @@ -821,9 +821,8 @@ H5AC__log_cleaned_entry(const H5AC_info_t *entry_ptr) { H5AC_t * cache_ptr; H5AC_aux_t * aux_ptr; - herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_PACKAGE + FUNC_ENTER_PACKAGE_NOERR /* Sanity check */ HDassert(entry_ptr); @@ -853,8 +852,7 @@ H5AC__log_cleaned_entry(const H5AC_info_t *entry_ptr) /* Decrement the dirty byte count */ aux_ptr->dirty_bytes -= entry_ptr->size; -done: - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(SUCCEED) } /* H5AC__log_cleaned_entry() */ |