Reduce diffs with `develop`, where `H5C_move_entry` takes an `H5C_t *`

argument, first, not `H5F_t *`.

3 files changed, 6 insertions, 13 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 7977d0e..681ccf0 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -1125,7 +1125,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
             HGOTO_ERROR(H5E_CACHE, H5E_CANTUNPROTECT, FAIL, "can't log moved entry")
 #endif /* H5_HAVE_PARALLEL */
 
-    if(H5C_move_entry(f, type, old_addr, new_addr) < 0)
+    if(H5C_move_entry(f->shared->cache, type, old_addr, new_addr) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTMOVE, FAIL, "H5C_move_entry() failed")
 
 #ifdef H5_HAVE_PARALLEL
diff --git a/src/H5C.c b/src/H5C.c
index 7c28595..abea0d4 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -2297,24 +2297,17 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5C_move_entry(H5F_t *             f,
-               const H5C_class_t * type,
-               haddr_t             old_addr,
-	       haddr_t             new_addr)
+H5C_move_entry(H5C_t *	     cache_ptr,
+                 const H5C_class_t * type,
+                 haddr_t 	     old_addr,
+	         haddr_t 	     new_addr)
 {
-    H5C_t             * cache_ptr = NULL;
     H5C_cache_entry_t *	entry_ptr = NULL;
     H5C_cache_entry_t *	test_entry_ptr = NULL;
     herr_t              ret_value = SUCCEED;      /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    /* sanity checks */
-    HDassert(f);
-    HDassert(f->shared);
-
-    cache_ptr = f->shared->cache;
-
     HDassert(cache_ptr);
     HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
 
diff --git a/src/H5Cprivate.h b/src/H5Cprivate.h
index 205f45a..275f39e 100644
--- a/src/H5Cprivate.h
+++ b/src/H5Cprivate.h
@@ -2428,7 +2428,7 @@ H5_DLL herr_t H5C_mark_entry_dirty(void *thing);
 H5_DLL herr_t H5C_mark_entry_clean(void *thing);
 H5_DLL herr_t H5C_mark_entry_unserialized(void *thing);
 H5_DLL herr_t H5C_mark_entry_serialized(void *thing);
-H5_DLL herr_t H5C_move_entry(H5F_t *f, const H5C_class_t *type,
+H5_DLL herr_t H5C_move_entry(H5C_t *cache_ptr, const H5C_class_t *type,
     haddr_t old_addr, haddr_t new_addr);
 H5_DLL herr_t H5C_pin_protected_entry(void *thing);
 H5_DLL herr_t H5C_prep_for_file_close(H5F_t *f);