Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 98 insertions, 186 deletions

diff --git a/src/H5Oflush.c b/src/H5Oflush.c
index a03cfa1..5d5c5da 100644
--- a/src/H5Oflush.c
+++ b/src/H5Oflush.c
@@ -6,7 +6,7 @@
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -15,7 +15,7 @@
  *
  * Created:     H5Oflush.c
  *              Aug 19, 2010
- *              Mike McGreevy <mamcgree@hdfgroup.org>
+ *              Mike McGreevy
  *
  * Purpose:     Object flush/refresh routines.
  *
@@ -26,80 +26,34 @@
 /* Module Setup */
 /****************/
 
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
-#define H5T_FRIEND              /* Suppress error about including H5Tpkg */
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
+#define H5T_FRIEND     /* Suppress error about including H5Tpkg */
 
 /***********/
 /* Headers */
 /***********/
 
-#include "H5private.h"      /* Generic Functions */
-#include "H5CXprivate.h"    /* API Contexts */
-#include "H5Dprivate.h"     /* Datasets */
-#include "H5Eprivate.h"     /* Errors   */
-#include "H5Fprivate.h"     /* Files    */
-#include "H5Gprivate.h"     /* Groups   */
-#include "H5Iprivate.h"     /* IDs      */
-#include "H5Opkg.h"         /* Objects  */
-#include "H5Tpkg.h"         /* Datatypes */
+#include "H5private.h"   /* Generic Functions */
+#include "H5CXprivate.h" /* API Contexts */
+#include "H5Dprivate.h"  /* Datasets */
+#include "H5Eprivate.h"  /* Errors   */
+#include "H5ESprivate.h" /* Event Sets */
+#include "H5Fprivate.h"  /* Files    */
+#include "H5Gprivate.h"  /* Groups   */
+#include "H5Iprivate.h"  /* IDs      */
+#include "H5Opkg.h"      /* Objects  */
+#include "H5Tpkg.h"      /* Datatypes */
 
 /********************/
 /* Local Prototypes */
 /********************/
 static herr_t H5O__oh_tag(const H5O_loc_t *oloc, haddr_t *tag);
-static herr_t H5O__refresh_metadata_close(hid_t oid, H5O_loc_t oloc,
-	H5G_loc_t *obj_loc);
-
+static herr_t H5O__refresh_metadata_close(H5O_loc_t *oloc, H5G_loc_t *obj_loc, hid_t oid);
 
 /*************/
 /* Functions */
 /*************/
 
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5Oflush
- *
- * Purpose:     Flushes all buffers associated with an object to disk.
- *
- * Return:      SUCCEED/FAIL
- *
- * Programmer:  Mike McGreevy
- *              May 19, 2010
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Oflush(hid_t obj_id)
-{
-    H5VL_object_t      *vol_obj     = NULL;     /* Object token     */
-    H5VL_loc_params_t   loc_params;
-    herr_t              ret_value   = SUCCEED;  /* Return value     */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "i", obj_id);
-
-    /* Check args */
-    if(NULL == (vol_obj = H5VL_vol_object(obj_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
-
-    /* Set up collective metadata if appropriate */
-    if(H5CX_set_loc(obj_id) < 0)
-        HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "can't set access property list info")
-
-    /* Set location parameters */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(obj_id);
-
-    /* Flush the object */
-    if(H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_FLUSH, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, obj_id) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush object")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Oflush() */
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_flush
  *
@@ -116,33 +70,32 @@ done:
 herr_t
 H5O_flush(H5O_loc_t *oloc, hid_t obj_id)
 {
-    void                   *obj_ptr;                /* Pointer to object */
-    const H5O_obj_class_t  *obj_class;              /* Class of object */
-    herr_t                  ret_value = SUCCEED;    /* Return value */
+    void *                 obj_ptr;             /* Pointer to object */
+    const H5O_obj_class_t *obj_class;           /* Class of object */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Get the object pointer */
-    if(NULL == (obj_ptr = H5VL_object(obj_id)))
+    if (NULL == (obj_ptr = H5VL_object(obj_id)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
 
     /* Get the object class */
-    if(NULL == (obj_class = H5O__obj_class(oloc)))
+    if (NULL == (obj_class = H5O__obj_class(oloc)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object class")
 
     /* Flush the object of this class */
-    if(obj_class->flush && obj_class->flush(obj_ptr) < 0)
+    if (obj_class->flush && obj_class->flush(obj_ptr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush object")
 
     /* Flush the object metadata and invoke flush callback */
-    if(H5O_flush_common(oloc, obj_id) < 0)
+    if (H5O_flush_common(oloc, obj_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush object and object flush callback")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_flush() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_flush_common
  *
@@ -158,28 +111,27 @@ done:
 herr_t
 H5O_flush_common(H5O_loc_t *oloc, hid_t obj_id)
 {
-    haddr_t 	tag = 0;
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    haddr_t tag       = 0;
+    herr_t  ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* Retrieve tag for object */
-    if(H5O__oh_tag(oloc, &tag) < 0)
+    if (H5O__oh_tag(oloc, &tag) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush object metadata")
 
     /* Flush metadata based on tag value of the object */
-    if(H5F_flush_tagged_metadata(oloc->file, tag) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
+    if (H5F_flush_tagged_metadata(oloc->file, tag) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
 
     /* Check to invoke callback */
-    if(H5F_object_flush_cb(oloc->file, obj_id) < 0)
+    if (H5F_object_flush_cb(oloc->file, obj_id) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to do object flush callback")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_flush_common() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__oh_tag
  *
@@ -196,85 +148,41 @@ done:
 static herr_t
 H5O__oh_tag(const H5O_loc_t *oloc, haddr_t *tag)
 {
-    H5O_t       *oh = NULL;             /* Object header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *oh        = NULL;    /* Object header */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(oloc);
 
     /* Get object header for object */
-    if(NULL == (oh = H5O_protect(oloc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(oloc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object's object header")
 
     /* Get object header's address (i.e. the tag value for this object) */
-    if(HADDR_UNDEF == (*tag = H5O_OH_GET_ADDR(oh)))
+    if (HADDR_UNDEF == (*tag = H5O_OH_GET_ADDR(oh)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get address of object header")
 
 done:
     /* Unprotect object header on failure */
-    if(oh && H5O_unprotect(oloc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(oloc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__oh_tag() */
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5Orefresh
- *
- * Purpose:     Refreshes all buffers associated with an object.
- *
- * Return:      SUCCEED/FAIL
- *
- * Programmer:  Mike McGreevy
- *              July 28, 2010
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Orefresh(hid_t oid)
-{
-    H5VL_object_t      *vol_obj     = NULL;     /* Object token     */
-    H5VL_loc_params_t   loc_params;
-    herr_t              ret_value   = SUCCEED;  /* Return value     */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE1("e", "i", oid);
-
-    /* Check args */
-    if(NULL == (vol_obj = H5VL_vol_object(oid)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
-
-    /* Set up collective metadata if appropriate */
-    if(H5CX_set_loc(oid) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set access property list info")
-
-    /* Set location parameters */
-    loc_params.type         = H5VL_OBJECT_BY_SELF;
-    loc_params.obj_type     = H5I_get_type(oid);
-
-    /* Refresh the object */
-    if(H5VL_object_specific(vol_obj, &loc_params, H5VL_OBJECT_REFRESH, H5P_DATASET_XFER_DEFAULT, H5_REQUEST_NULL, oid) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to refresh object")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Orefresh() */
-
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refresh_metadata
  *
  * Purpose:     Refreshes all buffers associated with an object.
  *
  * Note:	This is based on the original H5O_refresh_metadata() but
- *	        is split into 2 routines.  
+ *	        is split into 2 routines.
  *	        This is done so that H5Fstart_swmr_write() can use these
- *	        2 routines to refresh opened objects.  This may be 
+ *	        2 routines to refresh opened objects.  This may be
  *	        restored back to the original code when H5Fstart_swmr_write()
- *	        uses a different approach to handle issues with opened objects.	
+ *	        uses a different approach to handle issues with opened objects.
  *	 	H5Fstart_swmr_write() no longer calls the 1st routine.	(12/24/15)
  *
  * Return:    	Non-negative on success, negative on failure
@@ -285,21 +193,21 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_refresh_metadata(hid_t oid, H5O_loc_t oloc)
+H5O_refresh_metadata(H5O_loc_t *oloc, hid_t oid)
 {
-    H5VL_object_t *vol_obj = NULL;      /* VOL object associated with the ID */
-    hbool_t objs_incr = FALSE;          /* Whether the object count in the file was incremented */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5VL_object_t *vol_obj   = NULL;    /* VOL object associated with the ID */
+    hbool_t        objs_incr = FALSE;   /* Whether the object count in the file was incremented */
+    herr_t         ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
     /* If the file is opened with write access, no need to perform refresh actions. */
-    if(!(H5F_INTENT(oloc.file) & H5F_ACC_RDWR)) {
-        H5G_loc_t obj_loc;
-        H5O_loc_t obj_oloc;
-        H5G_name_t obj_path;
+    if (!(H5F_INTENT(oloc->file) & H5F_ACC_RDWR)) {
+        H5G_loc_t    obj_loc;
+        H5O_loc_t    obj_oloc;
+        H5G_name_t   obj_path;
         H5O_shared_t cached_H5O_shared;
-        H5VL_t *connector = NULL;
+        H5VL_t *     connector = NULL;
 
         /* Create empty object location */
         obj_loc.oloc = &obj_oloc;
@@ -309,19 +217,19 @@ H5O_refresh_metadata(hid_t oid, H5O_loc_t oloc)
         /* "Fake" another open object in the file, so that it doesn't get closed
          *  if this object is the only thing holding the file open.
          */
-        H5F_incr_nopen_objs(oloc.file);
+        H5F_incr_nopen_objs(oloc->file);
         objs_incr = TRUE;
 
         /* Save important datatype state */
-        if(H5I_get_type(oid) == H5I_DATATYPE)
-            if(H5T_save_refresh_state(oid, &cached_H5O_shared) < 0)
+        if (H5I_get_type(oid) == H5I_DATATYPE)
+            if (H5T_save_refresh_state(oid, &cached_H5O_shared) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to save datatype state")
 
         /* Get the VOL object from the ID and cache a pointer to the connector.
          * The vol_obj will disappear when the underlying object is closed, so
          * we can't use that directly.
          */
-        if(NULL == (vol_obj = H5VL_vol_object(oid)))
+        if (NULL == (vol_obj = H5VL_vol_object(oid)))
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid object identifier")
         connector = vol_obj->connector;
 
@@ -331,31 +239,30 @@ H5O_refresh_metadata(hid_t oid, H5O_loc_t oloc)
         connector->nrefs++;
 
         /* Close object & evict its metadata */
-        if((H5O__refresh_metadata_close(oid, oloc, &obj_loc)) < 0)
+        if (H5O__refresh_metadata_close(oloc, &obj_loc, oid) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to refresh object")
 
         /* Re-open the object, re-fetching its metadata */
-        if((H5O_refresh_metadata_reopen(oid, &obj_loc, connector, FALSE)) < 0)
+        if (H5O_refresh_metadata_reopen(oid, &obj_loc, connector, FALSE) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to refresh object")
 
         /* Restore the number of references on the VOL connector */
         connector->nrefs--;
 
         /* Restore important datatype state */
-        if(H5I_get_type(oid) == H5I_DATATYPE)
-            if(H5T_restore_refresh_state(oid, &cached_H5O_shared) < 0)
+        if (H5I_get_type(oid) == H5I_DATATYPE)
+            if (H5T_restore_refresh_state(oid, &cached_H5O_shared) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTOPENOBJ, FAIL, "unable to restore datatype state")
 
     } /* end if */
 
 done:
-    if(objs_incr)
-        H5F_decr_nopen_objs(oloc.file);
+    if (objs_incr)
+        H5F_decr_nopen_objs(oloc->file);
 
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5O_refresh_metadata() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__refresh_metadata_close
  *
@@ -376,16 +283,17 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__refresh_metadata_close(hid_t oid, H5O_loc_t oloc, H5G_loc_t *obj_loc)
+H5O__refresh_metadata_close(H5O_loc_t *oloc, H5G_loc_t *obj_loc, hid_t oid)
 {
-    haddr_t tag = 0;            /* Tag for object */
-    hbool_t corked = FALSE;     /* Whether object's metadata is corked */
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5F_t * file;                /* Local copy of the object's file pointer */
+    haddr_t tag       = 0;       /* Tag for object */
+    hbool_t corked    = FALSE;   /* Whether object's metadata is corked */
+    herr_t  ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_PACKAGE
 
-    FUNC_ENTER_STATIC
-    
     /* Make deep local copy of object's location information */
-    if(obj_loc) {
+    if (obj_loc) {
         H5G_loc_t tmp_loc;
 
         H5G_loc(oid, &tmp_loc);
@@ -393,40 +301,43 @@ H5O__refresh_metadata_close(hid_t oid, H5O_loc_t oloc, H5G_loc_t *obj_loc)
     } /* end if */
 
     /* Handle close for multiple dataset opens */
-    if(H5I_get_type(oid) == H5I_DATASET)
-        if(H5D_mult_refresh_close(oid) < 0)
-            HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to prepare refresh for dataset")
+    if (H5I_get_type(oid) == H5I_DATASET)
+        if (H5D_mult_refresh_close(oid) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to prepare refresh for dataset")
 
     /* Retrieve tag for object */
-    if(H5O__oh_tag(&oloc, &tag) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTFLUSH, FAIL, "unable to get object header address")
+    if (H5O__oh_tag(oloc, &tag) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to get object header address")
 
     /* Get cork status of the object with tag */
-    if(H5AC_cork(oloc.file, tag, H5AC__GET_CORKED, &corked) < 0)
-        HGOTO_ERROR(H5E_ATOM, H5E_SYSTEM, FAIL, "unable to retrieve an object's cork status")
+    if (H5AC_cork(oloc->file, tag, H5AC__GET_CORKED, &corked) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_SYSTEM, FAIL, "unable to retrieve an object's cork status")
 
+    /* Hold a copy of the object's file pointer, since closing the object will
+     * invalidate the file pointer in the oloc.
+     */
+    file = oloc->file;
     /* Close the object */
-    if(H5I_dec_ref(oid) < 0)
-        HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to close object")
+    if (H5I_dec_ref(oid) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to close object")
 
     /* Flush metadata based on tag value of the object */
-    if(H5F_flush_tagged_metadata(oloc.file, tag) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
+    if (H5F_flush_tagged_metadata(file, tag) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to flush tagged metadata")
 
     /* Evict the object's tagged metadata */
-    if(H5F_evict_tagged_metadata(oloc.file, tag) < 0)
-        HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "unable to evict metadata")
+    if (H5F_evict_tagged_metadata(file, tag) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTFLUSH, FAIL, "unable to evict metadata")
 
     /* Re-cork object with tag */
-    if(corked)
-        if(H5AC_cork(oloc.file, tag, H5AC__SET_CORK, &corked) < 0)
-            HGOTO_ERROR(H5E_ATOM, H5E_SYSTEM, FAIL, "unable to cork the object")
+    if (corked)
+        if (H5AC_cork(file, tag, H5AC__SET_CORK, &corked) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_SYSTEM, FAIL, "unable to cork the object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5O__refresh_metadata_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_refresh_metadata_reopen
  *
@@ -444,9 +355,9 @@ done:
 herr_t
 H5O_refresh_metadata_reopen(hid_t oid, H5G_loc_t *obj_loc, H5VL_t *vol_connector, hbool_t start_swmr)
 {
-    void *object = NULL;        /* Object for this operation */
-    H5I_type_t type;            /* Type of object for the ID */
-    herr_t ret_value = SUCCEED; /* Return value */
+    void *     object = NULL;       /* Object for this operation */
+    H5I_type_t type;                /* Type of object for the ID */
+    herr_t     ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -457,25 +368,25 @@ H5O_refresh_metadata_reopen(hid_t oid, H5G_loc_t *obj_loc, H5VL_t *vol_connector
     /* Get object's type */
     type = H5I_get_type(oid);
 
-    switch(type) {
+    switch (type) {
         case H5I_GROUP:
             /* Re-open the group */
-            if(NULL == (object = H5G_open(obj_loc)))
+            if (NULL == (object = H5G_open(obj_loc)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open group")
             break;
 
         case H5I_DATATYPE:
             /* Re-open the named datatype */
-            if(NULL == (object = H5T_open(obj_loc)))
+            if (NULL == (object = H5T_open(obj_loc)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open named datatype")
             break;
 
         case H5I_DATASET:
             /* Re-open the dataset */
-            if(NULL == (object = H5D_open(obj_loc, H5P_DATASET_ACCESS_DEFAULT)))
+            if (NULL == (object = H5D_open(obj_loc, H5P_DATASET_ACCESS_DEFAULT)))
                 HGOTO_ERROR(H5E_DATASET, H5E_CANTOPENOBJ, FAIL, "unable to open dataset")
-            if(!start_swmr) /* No need to handle multiple opens when H5Fstart_swmr_write() */
-                if(H5D_mult_refresh_reopen((H5D_t *)object) < 0)
+            if (!start_swmr) /* No need to handle multiple opens when H5Fstart_swmr_write() */
+                if (H5D_mult_refresh_reopen((H5D_t *)object) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to finish refresh for dataset")
             break;
 
@@ -495,17 +406,18 @@ H5O_refresh_metadata_reopen(hid_t oid, H5G_loc_t *obj_loc, H5VL_t *vol_connector
         case H5I_ERROR_MSG:
         case H5I_ERROR_STACK:
         case H5I_SPACE_SEL_ITER:
+        case H5I_EVENTSET:
         case H5I_NTYPES:
         default:
-            HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL, "not a valid file object ID (dataset, group, or datatype)")
-        break;
+            HGOTO_ERROR(H5E_OHDR, H5E_BADTYPE, FAIL,
+                        "not a valid file object ID (dataset, group, or datatype)")
+            break;
     } /* end switch */
 
     /* Re-register ID for the object */
-    if((H5VL_register_using_existing_id(type, object, vol_connector, TRUE, oid)) < 0)
+    if ((H5VL_register_using_existing_id(type, object, vol_connector, TRUE, oid)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTREGISTER, FAIL, "unable to re-register object ID after refresh")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5O_refresh_metadata_reopen() */
-