Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 937 insertions, 920 deletions

diff --git a/src/H5Oint.c b/src/H5Oint.c
index e37eea5..93501a2 100644
--- a/src/H5Oint.c
+++ b/src/H5Oint.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.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -24,50 +24,48 @@
 /* Module Setup */
 /****************/
 
-#include "H5Omodule.h"          /* This source code file is part of the H5O module */
-
+#include "H5Omodule.h" /* This source code file is part of the H5O module */
 
 /***********/
 /* Headers */
 /***********/
-#include "H5private.h"          /* Generic Functions                        */
-#include "H5Eprivate.h"         /* Error handling                           */
-#include "H5Fprivate.h"         /* File access                              */
-#include "H5FLprivate.h"        /* Free lists                               */
-#include "H5FOprivate.h"        /* File objects                             */
-#include "H5Iprivate.h"         /* IDs                                      */
-#include "H5Lprivate.h"         /* Links                                    */
-#include "H5MFprivate.h"        /* File memory management                   */
-#include "H5MMprivate.h"        /* Memory management                        */
-#include "H5Opkg.h"             /* Object headers                           */
-#include "H5VLprivate.h"        /* Virtual Object Layer                     */
-
+#include "H5private.h"   /* Generic Functions                        */
+#include "H5CXprivate.h" /* API Contexts                             */
+#include "H5Eprivate.h"  /* Error handling                           */
+#include "H5Fprivate.h"  /* File access                              */
+#include "H5FLprivate.h" /* Free lists                               */
+#include "H5FOprivate.h" /* File objects                             */
+#include "H5Iprivate.h"  /* IDs                                      */
+#include "H5Lprivate.h"  /* Links                                    */
+#include "H5MFprivate.h" /* File memory management                   */
+#include "H5MMprivate.h" /* Memory management                        */
+#include "H5Opkg.h"      /* Object headers                           */
+#include "H5VLprivate.h" /* Virtual Object Layer                     */
+
+#include "H5VLnative_private.h" /* Native VOL connector                     */
 
 /****************/
 /* Local Macros */
 /****************/
 
-
 /******************/
 /* Local Typedefs */
 /******************/
 
 /* User data for recursive traversal over objects from a group */
 typedef struct {
-    hid_t       obj_id;         /* The ID for the starting group */
-    H5G_loc_t	*start_loc;     /* Location of starting group */
-    H5SL_t     *visited;        /* Skip list for tracking visited nodes */
-    H5O_iterate_t op;           /* Application callback */
-    void       *op_data;        /* Application's op data */
-    unsigned    fields;         /* Selection of object info */
+    hid_t          obj_id;    /* The ID for the starting group */
+    H5G_loc_t *    start_loc; /* Location of starting group */
+    H5SL_t *       visited;   /* Skip list for tracking visited nodes */
+    H5O_iterate2_t op;        /* Application callback */
+    void *         op_data;   /* Application's op data */
+    unsigned       fields;    /* Selection of object info */
 } H5O_iter_visit_ud_t;
 
-
 /********************/
 /* Package Typedefs */
 /********************/
 
-
 /********************/
 /* Local Prototypes */
 /********************/
@@ -75,63 +73,60 @@ typedef struct {
 static herr_t H5O__delete_oh(H5F_t *f, H5O_t *oh);
 static herr_t H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type);
 static herr_t H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr);
-static herr_t H5O__free_visit_visited(void *item, void *key,
-    void *operator_data/*in,out*/);
-static herr_t H5O__visit_cb(hid_t group, const char *name, const H5L_info_t *linfo,
-    void *_udata);
+static herr_t H5O__free_visit_visited(void *item, void *key, void *operator_data /*in,out*/);
+static herr_t H5O__visit_cb(hid_t group, const char *name, const H5L_info2_t *linfo, void *_udata);
 static const H5O_obj_class_t *H5O__obj_class_real(const H5O_t *oh);
+static herr_t                 H5O__reset_info2(H5O_info2_t *oinfo);
 
 /*********************/
 /* Package Variables */
 /*********************/
 
-/* Package initialization variable */
-hbool_t H5_PKG_INIT_VAR = FALSE;
-
 /* Header message ID to class mapping
  *
  * Remember to increment H5O_MSG_TYPES in H5Opkg.h when adding a new
  * message.
  */
 const H5O_msg_class_t *const H5O_msg_class_g[] = {
-    H5O_MSG_NULL,		/*0x0000 Null				*/
-    H5O_MSG_SDSPACE,		/*0x0001 Dataspace			*/
-    H5O_MSG_LINFO,		/*0x0002 Link information		*/
-    H5O_MSG_DTYPE,		/*0x0003 Datatype			*/
-    H5O_MSG_FILL,       	/*0x0004 Old data storage -- fill value */
-    H5O_MSG_FILL_NEW,		/*0x0005 New data storage -- fill value */
-    H5O_MSG_LINK,		/*0x0006 Link 				*/
-    H5O_MSG_EFL,		/*0x0007 Data storage -- external data files */
-    H5O_MSG_LAYOUT,		/*0x0008 Data Layout			*/
+    H5O_MSG_NULL,     /*0x0000 Null                            */
+    H5O_MSG_SDSPACE,  /*0x0001 Dataspace                       */
+    H5O_MSG_LINFO,    /*0x0002 Link information                */
+    H5O_MSG_DTYPE,    /*0x0003 Datatype                        */
+    H5O_MSG_FILL,     /*0x0004 Old data storage -- fill value  */
+    H5O_MSG_FILL_NEW, /*0x0005 New data storage -- fill value  */
+    H5O_MSG_LINK,     /*0x0006 Link                            */
+    H5O_MSG_EFL,      /*0x0007 Data storage -- external data files */
+    H5O_MSG_LAYOUT,   /*0x0008 Data Layout                     */
 #ifdef H5O_ENABLE_BOGUS
-    H5O_MSG_BOGUS_VALID,	/*0x0009 "Bogus valid" (for testing)	*/
-#else /* H5O_ENABLE_BOGUS */
-    NULL,			/*0x0009 "Bogus valid" (for testing)	*/
-#endif /* H5O_ENABLE_BOGUS */
-    H5O_MSG_GINFO,		/*0x000A Group information		*/
-    H5O_MSG_PLINE,		/*0x000B Data storage -- filter pipeline */
-    H5O_MSG_ATTR,		/*0x000C Attribute			*/
-    H5O_MSG_NAME,		/*0x000D Object name			*/
-    H5O_MSG_MTIME,		/*0x000E Object modification date and time */
-    H5O_MSG_SHMESG,		/*0x000F File-wide shared message table */
-    H5O_MSG_CONT,		/*0x0010 Object header continuation	*/
-    H5O_MSG_STAB,		/*0x0011 Symbol table			*/
-    H5O_MSG_MTIME_NEW,		/*0x0012 New Object modification date and time */
-    H5O_MSG_BTREEK,		/*0x0013 Non-default v1 B-tree 'K' values */
-    H5O_MSG_DRVINFO,		/*0x0014 Driver info settings		*/
-    H5O_MSG_AINFO,		/*0x0015 Attribute information		*/
-    H5O_MSG_REFCOUNT,		/*0x0016 Object's ref. count		*/
-    H5O_MSG_FSINFO,		/*0x0017 Free-space manager info        */
-    H5O_MSG_MDCI,               /*0x0018 Metadata cache image           */
-    H5O_MSG_UNKNOWN		/*0x0019 Placeholder for unknown message */
+    H5O_MSG_BOGUS_VALID, /*0x0009 "Bogus valid" (for testing)     */
+#else                    /* H5O_ENABLE_BOGUS */
+    NULL, /*0x0009 "Bogus valid" (for testing)     */
+#endif                   /* H5O_ENABLE_BOGUS */
+    H5O_MSG_GINFO,       /*0x000A Group information               */
+    H5O_MSG_PLINE,       /*0x000B Data storage -- filter pipeline */
+    H5O_MSG_ATTR,        /*0x000C Attribute                       */
+    H5O_MSG_NAME,        /*0x000D Object name                     */
+    H5O_MSG_MTIME,       /*0x000E Object modification date and time */
+    H5O_MSG_SHMESG,      /*0x000F File-wide shared message table  */
+    H5O_MSG_CONT,        /*0x0010 Object header continuation      */
+    H5O_MSG_STAB,        /*0x0011 Symbol table                    */
+    H5O_MSG_MTIME_NEW,   /*0x0012 New Object modification date and time */
+    H5O_MSG_BTREEK,      /*0x0013 Non-default v1 B-tree 'K' values */
+    H5O_MSG_DRVINFO,     /*0x0014 Driver info settings            */
+    H5O_MSG_AINFO,       /*0x0015 Attribute information           */
+    H5O_MSG_REFCOUNT,    /*0x0016 Object's ref. count             */
+    H5O_MSG_FSINFO,      /*0x0017 Free-space manager info         */
+    H5O_MSG_MDCI,        /*0x0018 Metadata cache image            */
+    H5O_MSG_UNKNOWN      /*0x0019 Placeholder for unknown message */
 };
 
 /* Format version bounds for object header */
 const unsigned H5O_obj_ver_bounds[] = {
-    H5O_VERSION_1,      /* H5F_LIBVER_EARLIEST */
-    H5O_VERSION_2,      /* H5F_LIBVER_V18 */
-    H5O_VERSION_2,      /* H5F_LIBVER_V110 */
-    H5O_VERSION_LATEST  /* H5F_LIBVER_LATEST */
+    H5O_VERSION_1,     /* H5F_LIBVER_EARLIEST */
+    H5O_VERSION_2,     /* H5F_LIBVER_V18 */
+    H5O_VERSION_2,     /* H5F_LIBVER_V110 */
+    H5O_VERSION_2,     /* H5F_LIBVER_V112 */
+    H5O_VERSION_LATEST /* H5F_LIBVER_LATEST */
 };
 
 /* Declare a free list to manage the H5O_t struct */
@@ -149,6 +144,9 @@ H5FL_BLK_DEFINE(chunk_image);
 /* Declare external the free list for H5O_cont_t sequences */
 H5FL_SEQ_EXTERN(H5O_cont_t);
 
+/* The canonical 'undefined' token */
+const H5O_token_t H5O_TOKEN_UNDEF_g = {
+    {255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255}};
 
 /*****************************/
 /* Library Private Variables */
@@ -160,7 +158,6 @@ H5FL_EXTERN(time_t);
 /* Declare external the free list for H5_obj_t's */
 H5FL_EXTERN(H5_obj_t);
 
-
 /*******************/
 /* Local Variables */
 /*******************/
@@ -172,28 +169,26 @@ H5FL_EXTERN(H5_obj_t);
  * datatype message is a datatype but only some of them are datasets.
  */
 static const H5O_obj_class_t *const H5O_obj_class_g[] = {
-    H5O_OBJ_DATATYPE,		/* Datatype object (H5O_TYPE_NAMED_DATATYPE - 2) */
-    H5O_OBJ_DATASET,		/* Dataset object (H5O_TYPE_DATASET - 1) */
-    H5O_OBJ_GROUP,		/* Group object (H5O_TYPE_GROUP - 0) */
+    H5O_OBJ_DATATYPE, /* Datatype object (H5O_TYPE_NAMED_DATATYPE - 2) */
+    H5O_OBJ_DATASET,  /* Dataset object (H5O_TYPE_DATASET - 1) */
+    H5O_OBJ_GROUP,    /* Group object (H5O_TYPE_GROUP - 0) */
 };
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__init_package
+ * Function:    H5O_init
  *
- * Purpose:	Initialize information specific to H5O interface.
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Quincey Koziol
- *              Thursday, January 18, 2007
+ * Purpose:     Initialize the interface from some other layer.
  *
+ * Return:      Success:        non-negative
+ *              Failure:        negative
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__init_package(void)
+H5O_init(void)
 {
-    FUNC_ENTER_PACKAGE_NOERR
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI_NOERR
 
     /* H5O interface sanity checks */
     HDcompile_assert(H5O_MSG_TYPES == NELMTS(H5O_msg_class_g));
@@ -201,12 +196,11 @@ H5O__init_package(void)
 
     HDcompile_assert(H5O_UNKNOWN_ID < H5O_MSG_TYPES);
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O__init_package() */
+    FUNC_LEAVE_NOAPI(ret_value)
+}
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O_set_version
+ * Function:    H5O__set_version
  *
  * Purpose:     Sets the correct version to encode the object header.
  *              Chooses the oldest version possible, unless the file's
@@ -220,28 +214,28 @@ H5O__init_package(void)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx)
+H5O__set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx)
 {
-    uint8_t version;            /* Message version */
-    herr_t ret_value = SUCCEED; /* Return value */
+    uint8_t version;             /* Message version */
+    herr_t  ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_PACKAGE
 
     /* check arguments */
     HDassert(f);
     HDassert(oh);
 
     /* Set the correct version to encode object header with */
-    if(store_msg_crt_idx || (oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
+    if (store_msg_crt_idx || (oh_flags & H5O_HDR_ATTR_CRT_ORDER_TRACKED))
         version = H5O_VERSION_LATEST;
     else
         version = H5O_VERSION_1;
 
     /* Upgrade to the version indicated by the file's low bound if higher */
-    version = MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]);
+    version = (uint8_t)MAX(version, (uint8_t)H5O_obj_ver_bounds[H5F_LOW_BOUND(f)]);
 
     /* Version bounds check */
-    if(version > H5O_obj_ver_bounds[H5F_HIGH_BOUND(f)])
+    if (version > H5O_obj_ver_bounds[H5F_HIGH_BOUND(f)])
         HGOTO_ERROR(H5E_OHDR, H5E_BADRANGE, FAIL, "object header version out of bounds")
 
     /* Set the message version */
@@ -249,42 +243,32 @@ H5O_set_version(H5F_t *f, H5O_t *oh, uint8_t oh_flags, hbool_t store_msg_crt_idx
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_set_version() */
+} /* end H5O__set_version() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_create
+ * Function:    H5O_create
  *
- * Purpose:	Creates a new object header. Allocates space for it and
+ * Purpose:    Creates a new object header. Allocates space for it and
  *              then calls an initialization function. The object header
  *              is opened for write access and should eventually be
  *              closed by calling H5O_close().
  *
- * Return:	Success:	Non-negative, the ENT argument contains
- *				information about the object header,
- *				including its address.
+ * Return:    Success:    Non-negative, the ENT argument contains
+ *                information about the object header,
+ *                including its address.
  *
- *		Failure:	Negative
+ *        Failure:    Negative
  *
- * Programmer:	Robb Matzke
- *		matzke@llnl.gov
- *		Aug  5 1997
- *
- * Changes:     2018 August 17
- *              Jacob Smith 
- *              Refactor out the operations into two separate steps --
- *              preparation and application -- to facilitate overriding the
- *              library-default size allocated for the object header. This
- *              function is retained as a wrapper, to minimize changes to
- *              unaffected calling functions.
+ * Programmer:    Robb Matzke
+ *        Aug  5 1997
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_create(H5F_t *f, size_t size_hint, size_t initial_rc, hid_t ocpl_id, H5O_loc_t *loc /*out*/)
 {
-    H5O_t  *oh        = NULL;
-    herr_t  ret_value = SUCCEED;
+    H5O_t *oh        = NULL;
+    herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -295,25 +279,24 @@ H5O_create(H5F_t *f, size_t size_hint, size_t initial_rc, hid_t ocpl_id, H5O_loc
     /* create object header in freelist
      * header version is set internally
      */
-    oh = H5O__create_ohdr(f, ocpl_id);
-    if(NULL == oh)
+    oh = H5O_create_ohdr(f, ocpl_id);
+    if (NULL == oh)
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't instantiate object header")
 
     /* apply object header information to file
      */
-    if(H5O__apply_ohdr(f, oh, ocpl_id, size_hint, initial_rc, loc) < 0)
+    if (H5O_apply_ohdr(f, oh, ocpl_id, size_hint, initial_rc, loc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, FAIL, "Can't apply object header to file")
 
 done:
-    if((FAIL == ret_value) && (NULL != oh) && (H5O__free(oh) < 0))
+    if ((FAIL == ret_value) && (NULL != oh) && (H5O__free(oh, TRUE) < 0))
         HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "can't delete object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_create() */
 
-
 /*-----------------------------------------------------------------------------
- * Function:   H5O__create_ohdr
+ * Function:   H5O_create_ohdr
  *
  * Purpose:    Create the object header, set version and flags.
  *
@@ -321,17 +304,17 @@ done:
  *             Failure: NULL
  *
  * Programmer: Jacob Smith
- *             2018 August 17 
+ *             2018 August 17
  *
  *-----------------------------------------------------------------------------
  */
 H5O_t *
-H5O__create_ohdr(H5F_t *f, hid_t ocpl_id)
+H5O_create_ohdr(H5F_t *f, hid_t ocpl_id)
 {
     H5P_genplist_t *oc_plist;
-    H5O_t          *oh = NULL;        /* Object header in Freelist */
-    uint8_t         oh_flags;         /* Initial status flags */
-    H5O_t          *ret_value = NULL;
+    H5O_t *         oh = NULL; /* Object header in Freelist */
+    uint8_t         oh_flags;  /* Initial status flags */
+    H5O_t *         ret_value = NULL;
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -339,22 +322,30 @@ H5O__create_ohdr(H5F_t *f, hid_t ocpl_id)
     HDassert(TRUE == H5P_isa_class(ocpl_id, H5P_OBJECT_CREATE));
 
     /* Check for invalid access request */
-    if(0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
+    if (0 == (H5F_INTENT(f) & H5F_ACC_RDWR))
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file")
 
     oh = H5FL_CALLOC(H5O_t);
-    if(NULL == oh)
+    if (NULL == oh)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
 
     oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id);
-    if(NULL == oc_plist)
+    if (NULL == oc_plist)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, NULL, "not a property list")
 
     /* Get any object header status flags set by properties */
-    if(H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
-        HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags")
+    if (H5P_DATASET_CREATE_DEFAULT == ocpl_id) {
+        /* If the OCPL is the default DCPL, we can get the header flags from the
+         * API context. Otherwise we have to call H5P_get */
+        if (H5CX_get_ohdr_flags(&oh_flags) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags")
+    }
+    else {
+        if (H5P_get(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &oh_flags) < 0)
+            HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, NULL, "can't get object header flags")
+    }
 
-    if(H5O_set_version(f, oh, oh_flags, H5F_STORE_MSG_CRT_IDX(f)) < 0)
+    if (H5O__set_version(f, oh, oh_flags, H5F_STORE_MSG_CRT_IDX(f)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, NULL, "can't set version of object header")
 
     oh->flags = oh_flags;
@@ -362,15 +353,14 @@ H5O__create_ohdr(H5F_t *f, hid_t ocpl_id)
     ret_value = oh;
 
 done:
-    if((NULL == ret_value) && (NULL != oh) && (H5O__free(oh) < 0))
+    if ((NULL == ret_value) && (NULL != oh) && (H5O__free(oh, TRUE) < 0))
         HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, NULL, "can't delete object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5O__create_ohdr() */
+} /* H5O_create_ohdr() */
 
-
 /*-----------------------------------------------------------------------------
- * Function:   H5O__apply_ohdr
+ * Function:   H5O_apply_ohdr
  *
  * Purpose:    Initialize and set the object header in the file.
  *             Record some information at `loc_out`.
@@ -384,7 +374,7 @@ done:
  *-----------------------------------------------------------------------------
  */
 herr_t
-H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out)
+H5O_apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t initial_rc, H5O_loc_t *loc_out)
 {
     haddr_t         oh_addr;
     size_t          oh_size;
@@ -404,63 +394,69 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini
 
     oh->sizeof_size = H5F_SIZEOF_SIZE(f);
     oh->sizeof_addr = H5F_SIZEOF_ADDR(f);
-    oh->swmr_write = !!(H5F_INTENT(f) & H5F_ACC_SWMR_WRITE); /* funky cast */
+    oh->swmr_write  = !!(H5F_INTENT(f) & H5F_ACC_SWMR_WRITE); /* funky cast */
 
 #ifdef H5O_ENABLE_BAD_MESG_COUNT
     /* Check whether the "bad message count" property is set */
-    if(0 < H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME))
+    if (0 < H5P_exist_plist(oc_plist, H5O_BAD_MESG_COUNT_NAME))
         /* Get bad message count flag -- from property list */
-        if(H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count) < 0)
+        if (H5P_get(oc_plist, H5O_BAD_MESG_COUNT_NAME, &oh->store_bad_mesg_count) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't get bad message count flag")
 #endif /* H5O_ENABLE_BAD_MESG_COUNT */
 
     /* Create object header proxy if doing SWMR writes */
-    if(oh->swmr_write) {
+    if (oh->swmr_write) {
         oh->proxy = H5AC_proxy_entry_create();
-        if(NULL == oh->proxy)
+        if (NULL == oh->proxy)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create object header proxy")
-    } else {
+    }
+    else {
         oh->proxy = NULL;
     }
 
     oc_plist = (H5P_genplist_t *)H5I_object(ocpl_id);
-    if(NULL == oc_plist)
+    if (NULL == oc_plist)
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a property list")
 
     /* Initialize version-specific fields */
-    if(oh->version > H5O_VERSION_1) {
+    if (oh->version > H5O_VERSION_1) {
         /* Initialize all time fields */
-        if(oh->flags & H5O_HDR_STORE_TIMES)
+        if (oh->flags & H5O_HDR_STORE_TIMES)
             oh->atime = oh->mtime = oh->ctime = oh->btime = H5_now();
         else
             oh->atime = oh->mtime = oh->ctime = oh->btime = 0;
 
-        if(H5F_STORE_MSG_CRT_IDX(f))
+        if (H5F_STORE_MSG_CRT_IDX(f))
             /* flag to record message creation indices */
             oh->flags |= H5O_HDR_ATTR_CRT_ORDER_TRACKED;
 
         /* Get attribute storage phase change values -- from property list */
-        if(H5P_get(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
+        if (H5P_get(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get max. # of compact attributes")
-        if(H5P_get(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
+        if (H5P_get(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get min. # of dense attributes")
 
         /* Check for non-default attribute storage phase change values */
-        if(H5O_CRT_ATTR_MAX_COMPACT_DEF != oh->max_compact  || H5O_CRT_ATTR_MIN_DENSE_DEF != oh->min_dense )
+        if (H5O_CRT_ATTR_MAX_COMPACT_DEF != oh->max_compact || H5O_CRT_ATTR_MIN_DENSE_DEF != oh->min_dense)
             oh->flags |= H5O_HDR_ATTR_STORE_PHASE_CHANGE;
 
-        /* Determine correct value for chunk #0 size bits */
+            /* Determine correct value for chunk #0 size bits */
 /* Avoid compiler warning on 32-bit machines */
 #if H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T
-        if(size_hint > 4294967295UL)
+        if (size_hint > 4294967295UL)
             oh->flags |= H5O_HDR_CHUNK0_8;
-        else
-#endif /* H5_SIZEOF_SIZE_T > H5_SIZEOF_INT32_T */
-        if(size_hint > 65535)
+        else if (size_hint > 65535)
             oh->flags |= H5O_HDR_CHUNK0_4;
-        else if(size_hint > 255)
+        else if (size_hint > 255)
             oh->flags |= H5O_HDR_CHUNK0_2;
-    } else {
+#else
+        if (size_hint > 65535)
+            oh->flags |= H5O_HDR_CHUNK0_4;
+        else if (size_hint > 255)
+            oh->flags |= H5O_HDR_CHUNK0_2;
+#endif
+    }
+    else {
         /* Reset unused time fields */
         oh->atime = oh->mtime = oh->ctime = oh->btime = 0;
     } /* end if/else header version >1 */
@@ -471,49 +467,50 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini
 
     /* Allocate disk space for header and first chunk */
     oh_addr = H5MF_alloc(f, H5FD_MEM_OHDR, (hsize_t)oh_size);
-    if(HADDR_UNDEF == oh_addr)
+    if (HADDR_UNDEF == oh_addr)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "file allocation failed for object header")
 
     /* Create the chunk list */
-    oh->nchunks = 1;
+    oh->nchunks       = 1;
     oh->alloc_nchunks = 1;
-    oh->chunk = H5FL_SEQ_MALLOC(H5O_chunk_t, (size_t)oh->alloc_nchunks);
-    if(NULL == oh->chunk)
+    oh->chunk         = H5FL_SEQ_MALLOC(H5O_chunk_t, (size_t)oh->alloc_nchunks);
+    if (NULL == oh->chunk)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the first chunk */
     oh->chunk[0].addr = oh_addr;
     oh->chunk[0].size = oh_size;
-    oh->chunk[0].gap = 0;
+    oh->chunk[0].gap  = 0;
 
     /* Allocate enough space for the first chunk */
     /* (including space for serializing the object header prefix */
     oh->chunk[0].image = H5FL_BLK_CALLOC(chunk_image, oh_size);
-    if(NULL == oh->chunk[0].image)
+    if (NULL == oh->chunk[0].image)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
     oh->chunk[0].chunk_proxy = NULL;
 
     /* Put magic # for object header in first chunk */
-    if(H5O_VERSION_1 < oh->version)
+    if (H5O_VERSION_1 < oh->version)
         H5MM_memcpy(oh->chunk[0].image, H5O_HDR_MAGIC, (size_t)H5_SIZEOF_MAGIC);
 
     /* Create the message list */
-    oh->nmesgs = 1;
+    oh->nmesgs       = 1;
     oh->alloc_nmesgs = H5O_NMESGS;
-    oh->mesg = H5FL_SEQ_CALLOC(H5O_mesg_t, oh->alloc_nmesgs);
-    if(NULL == oh->mesg)
+    oh->mesg         = H5FL_SEQ_CALLOC(H5O_mesg_t, oh->alloc_nmesgs);
+    if (NULL == oh->mesg)
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
 
     /* Initialize the initial "null" message; covers the entire first chunk */
-    oh->mesg[0].type = H5O_MSG_NULL;
-    oh->mesg[0].dirty = TRUE;
+    oh->mesg[0].type   = H5O_MSG_NULL;
+    oh->mesg[0].dirty  = TRUE;
     oh->mesg[0].native = NULL;
-    oh->mesg[0].raw = oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh);
+    oh->mesg[0].raw =
+        oh->chunk[0].image + H5O_SIZEOF_HDR(oh) - H5O_SIZEOF_CHKSUM_OH(oh) + H5O_SIZEOF_MSGHDR_OH(oh);
     oh->mesg[0].raw_size = size_hint - (size_t)H5O_SIZEOF_MSGHDR_OH(oh);
-    oh->mesg[0].chunkno = 0;
+    oh->mesg[0].chunkno  = 0;
 
     /* Check for non-zero initial refcount on the object header */
-    if(initial_rc > 0) {
+    if (initial_rc > 0) {
         /* Set the initial refcount & pin the header when its inserted */
         oh->rc = initial_rc;
         insert_flags |= H5AC__PIN_ENTRY_FLAG;
@@ -523,7 +520,7 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini
     H5_BEGIN_TAG(oh_addr);
 
     /* Cache object header */
-    if(H5AC_insert_entry(f, H5AC_OHDR, oh_addr, oh, insert_flags) < 0)
+    if (H5AC_insert_entry(f, H5AC_OHDR, oh_addr, oh, insert_flags) < 0)
         HGOTO_ERROR_TAG(H5E_OHDR, H5E_CANTINSERT, FAIL, "unable to cache object header")
 
     /* Reset object header pointer, now that it's been inserted into the cache */
@@ -536,24 +533,23 @@ H5O__apply_ohdr(H5F_t *f, H5O_t *oh, hid_t ocpl_id, size_t size_hint, size_t ini
     loc_out->file = f;
     loc_out->addr = oh_addr;
 
-    if(H5O_open(loc_out) < 0)
+    if (H5O_open(loc_out) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value);
-} /* H5O__apply_ohdr() */
+} /* H5O_apply_ohdr() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_open
+ * Function:    H5O_open
  *
- * Purpose:	Opens an object header which is described by the symbol table
- *		entry OBJ_ENT.
+ * Purpose:    Opens an object header which is described by the symbol table
+ *        entry OBJ_ENT.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Monday, January	 5, 1998
+ * Programmer:    Robb Matzke
+ *        Monday, January     5, 1998
  *
  * Modification:
  *              Raymond Lu
@@ -565,30 +561,28 @@ done:
 herr_t
 H5O_open(H5O_loc_t *loc)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI_NOERR
 
     /* Check args */
     HDassert(loc);
     HDassert(loc->file);
 
 #ifdef H5O_DEBUG
-    if(H5DEBUG(O))
-        HDfprintf(H5DEBUG(O), "> %a\n", loc->addr);
+    if (H5DEBUG(O))
+        HDfprintf(H5DEBUG(O), "> %" PRIuHADDR "\n", loc->addr);
 #endif
 
     /* Turn off the variable for holding file or increment open-lock counters */
-    if(loc->holding_file)
-     	loc->holding_file = FALSE;
+    if (loc->holding_file)
+        loc->holding_file = FALSE;
     else
         H5F_INCR_NOPEN_OBJS(loc->file);
 
-done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_open_name
  *
@@ -597,19 +591,19 @@ done:
  * Return:      Success:    Pointer to object data
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		March  5 2007
+ * Programmer:    Quincey Koziol
+ *        March  5 2007
  *
  *-------------------------------------------------------------------------
  */
 void *
 H5O_open_name(const H5G_loc_t *loc, const char *name, H5I_type_t *opened_type)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    void *ret_value = NULL;             /* Return value */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'name' found */
+    void *     ret_value = NULL;  /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -623,47 +617,46 @@ H5O_open_name(const H5G_loc_t *loc, const char *name, H5I_type_t *opened_type)
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, name, &obj_loc/*out*/) < 0)
+    if (H5G_loc_find(loc, name, &obj_loc /*out*/) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, NULL, "object not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if(NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
+    if (NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
 done:
-    if(NULL == ret_value)
-        if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (NULL == ret_value)
+        if (loc_found && H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open_name() */
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O_open_by_idx
+ * Function:    H5O__open_by_idx
  *
  * Purpose:     Internal routine to open an object by index within group
  *
  * Return:      Success:    Pointer to object data
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		December 28, 2017
+ * Programmer:    Quincey Koziol
+ *        December 28, 2017
  *
  *-------------------------------------------------------------------------
  */
 void *
-H5O_open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5I_type_t *opened_type)
+H5O__open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type, H5_iter_order_t order,
+                 hsize_t n, H5I_type_t *opened_type)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    void *ret_value = NULL;             /* Return value */
+    H5G_loc_t  obj_loc;           /* Location used to open group */
+    H5G_name_t obj_path;          /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;          /* Opened object object location */
+    hbool_t    loc_found = FALSE; /* Entry at 'name' found */
+    void *     ret_value = NULL;  /* Return value */
 
-    FUNC_ENTER_NOAPI(NULL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -674,46 +667,45 @@ H5O_open_by_idx(const H5G_loc_t *loc, const char *name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(loc, name, idx_type, order, n, &obj_loc/*out*/) < 0)
+    if (H5G_loc_find_by_idx(loc, name, idx_type, order, n, &obj_loc /*out*/) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, NULL, "group not found")
     loc_found = TRUE;
 
     /* Open the object */
-    if(NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
+    if (NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
 done:
     /* Release the object location if we failed after copying it */
-    if(NULL == ret_value)
-        if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    if (NULL == ret_value)
+        if (loc_found && H5G_loc_free(&obj_loc) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, NULL, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_open_by_idx() */
+} /* end H5O__open_by_idx() */
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O_open_by_addr
+ * Function:    H5O__open_by_addr
  *
  * Purpose:     Internal routine to open an object by its address
  *
  * Return:      Success:    Pointer to object data
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		December 28, 2017
+ * Programmer:    Quincey Koziol
+ *        December 28, 2017
  *
  *-------------------------------------------------------------------------
  */
 void *
-H5O_open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
+H5O__open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    void *ret_value = NULL;             /* Return value */
+    H5G_loc_t  obj_loc;          /* Location used to open group */
+    H5G_name_t obj_path;         /* Opened object group hier. path */
+    H5O_loc_t  obj_oloc;         /* Opened object object location */
+    void *     ret_value = NULL; /* Return value */
 
-    FUNC_ENTER_NOAPI(NULL)
+    FUNC_ENTER_PACKAGE
 
     /* Check arguments */
     HDassert(loc);
@@ -724,17 +716,16 @@ H5O_open_by_addr(const H5G_loc_t *loc, haddr_t addr, H5I_type_t *opened_type)
     H5G_loc_reset(&obj_loc);
     obj_loc.oloc->addr = addr;
     obj_loc.oloc->file = loc->oloc->file;
-    H5G_name_reset(obj_loc.path);       /* objects opened through this routine don't have a path name */
+    H5G_name_reset(obj_loc.path); /* objects opened through this routine don't have a path name */
 
     /* Open the object */
-    if(NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
+    if (NULL == (ret_value = H5O_open_by_loc(&obj_loc, opened_type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5O_open_by_addr() */
+} /* end H5O__open_by_addr() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_open_by_loc
  *
@@ -743,51 +734,50 @@ done:
  * Return:      Success:    Pointer to object data
  *              Failure:    NULL
  *
- * Programmer:	James Laird
- *		July 25 2006
+ * Programmer:    James Laird
+ *        July 25 2006
  *
  *-------------------------------------------------------------------------
  */
 void *
 H5O_open_by_loc(const H5G_loc_t *obj_loc, H5I_type_t *opened_type)
 {
-    const H5O_obj_class_t *obj_class;   /* Class of object for location */
-    void *ret_value = NULL;             /* Return value */
+    const H5O_obj_class_t *obj_class;        /* Class of object for location */
+    void *                 ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
     HDassert(obj_loc);
 
     /* Get the object class for this location */
-    if(NULL == (obj_class = H5O__obj_class(obj_loc->oloc)))
+    if (NULL == (obj_class = H5O__obj_class(obj_loc->oloc)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to determine object class")
 
     /* Call the object class's 'open' routine */
     HDassert(obj_class->open);
-    if(NULL == (ret_value = obj_class->open(obj_loc, opened_type)))
+    if (NULL == (ret_value = obj_class->open(obj_loc, opened_type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_open_by_loc() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_close
+ * Function:    H5O_close
  *
- * Purpose:	Closes an object header that was previously open.
+ * Purpose:    Closes an object header that was previously open.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
- *		Monday, January	 5, 1998
+ * Programmer:    Robb Matzke
+ *        Monday, January     5, 1998
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_close(H5O_loc_t *loc, hbool_t *file_closed /*out*/)
 {
-    herr_t ret_value = SUCCEED;   /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -802,18 +792,19 @@ H5O_close(H5O_loc_t *loc, hbool_t *file_closed /*out*/)
      * It's needed by the evict-on-close code. Clients can ignore
      * this value by passing in NULL.
      */
-    if(file_closed)
+    if (file_closed)
         *file_closed = FALSE;
 
     /* Decrement open-lock counters */
     H5F_DECR_NOPEN_OBJS(loc->file);
 
 #ifdef H5O_DEBUG
-    if(H5DEBUG(O)) {
-        if(FALSE == H5F_ID_EXISTS(loc->file) && 1 == H5F_NREFS(loc->file))
-            HDfprintf(H5DEBUG(O), "< %a auto %lu remaining\n", loc->addr, (unsigned long)H5F_NOPEN_OBJS(loc->file));
+    if (H5DEBUG(O)) {
+        if (FALSE == H5F_ID_EXISTS(loc->file) && 1 == H5F_NREFS(loc->file))
+            HDfprintf(H5DEBUG(O), "< %" PRIuHADDR " auto %lu remaining\n", loc->addr,
+                      (unsigned long)H5F_NOPEN_OBJS(loc->file));
         else
-            HDfprintf(H5DEBUG(O), "< %a\n", loc->addr);
+            HDfprintf(H5DEBUG(O), "< %" PRIuHADDR "\n", loc->addr);
     }
 #endif
 
@@ -821,20 +812,19 @@ H5O_close(H5O_loc_t *loc, hbool_t *file_closed /*out*/)
      * If the file open object count has reached the number of open mount points
      * (each of which has a group open in the file) attempt to close the file.
      */
-    if(H5F_NOPEN_OBJS(loc->file) == H5F_NMOUNTS(loc->file))
+    if (H5F_NOPEN_OBJS(loc->file) == H5F_NMOUNTS(loc->file))
         /* Attempt to close down the file hierarchy */
-        if(H5F_try_close(loc->file, file_closed) < 0)
+        if (H5F_try_close(loc->file, file_closed) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
 
     /* Release location information */
-    if(H5O_loc_free(loc) < 0)
+    if (H5O_loc_free(loc) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_close() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__link_oh
  *
@@ -845,17 +835,16 @@ done:
  *
  *              Failure:    -1
  *
- * Programmer:	Robb Matzke
- *		matzke@llnl.gov
- *		Aug  5 1997
+ * Programmer:    Robb Matzke
+ *        Aug  5 1997
  *
  *-------------------------------------------------------------------------
  */
 int
 H5O__link_oh(H5F_t *f, int adjust, H5O_t *oh, hbool_t *deleted)
 {
-    haddr_t addr = H5O_OH_GET_ADDR(oh);     /* Object header address */
-    int	ret_value = -1;                     /* Return value */
+    haddr_t addr      = H5O_OH_GET_ADDR(oh); /* Object header address */
+    int     ret_value = -1;                  /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -865,59 +854,59 @@ H5O__link_oh(H5F_t *f, int adjust, H5O_t *oh, hbool_t *deleted)
     HDassert(deleted);
 
     /* Check for adjusting link count */
-    if(adjust) {
-        if(adjust < 0) {
+    if (adjust) {
+        if (adjust < 0) {
             /* Check for too large of an adjustment */
-            if((unsigned)(-adjust) > oh->nlink)
+            if ((unsigned)(-adjust) > oh->nlink)
                 HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, (-1), "link count would be negative")
 
             /* Adjust the link count for the object header */
             oh->nlink = (unsigned)((int)oh->nlink + adjust);
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, (-1), "unable to mark object header as dirty")
 
             /* Check if the object should be deleted */
-            if(oh->nlink == 0) {
+            if (oh->nlink == 0) {
                 /* Check if the object is still open by the user */
-                if(H5FO_opened(f, addr) != NULL) {
+                if (H5FO_opened(f, addr) != NULL) {
                     /* Flag the object to be deleted when it's closed */
-                    if(H5FO_mark(f, addr, TRUE) < 0)
+                    if (H5FO_mark(f, addr, TRUE) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, (-1), "can't mark object for deletion")
                 } /* end if */
                 else {
                     /* Mark the object header for deletion */
                     *deleted = TRUE;
                 } /* end else */
-            } /* end if */
-        } /* end if */
+            }     /* end if */
+        }         /* end if */
         else {
             /* A new object, or one that will be deleted */
-            if(0 == oh->nlink) {
+            if (0 == oh->nlink) {
                 /* Check if the object is currently open, but marked for deletion */
-                if(H5FO_marked(f, addr)) {
+                if (H5FO_marked(f, addr)) {
                     /* Remove "delete me" flag on the object */
-                    if(H5FO_mark(f, addr, FALSE) < 0)
+                    if (H5FO_mark(f, addr, FALSE) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, (-1), "can't mark object for deletion")
                 } /* end if */
-            } /* end if */
+            }     /* end if */
 
             /* Adjust the link count for the object header */
             oh->nlink = (unsigned)((int)oh->nlink + adjust);
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, (-1), "unable to mark object header as dirty")
         } /* end if */
 
         /* Check for operations on refcount message */
-        if(oh->version > H5O_VERSION_1) {
+        if (oh->version > H5O_VERSION_1) {
             /* Check if the object has a refcount message already */
-            if(oh->has_refcount_msg) {
+            if (oh->has_refcount_msg) {
                 /* Check for removing refcount message */
-                if(oh->nlink <= 1) {
-                    if(H5O__msg_remove_real(f, oh, H5O_MSG_REFCOUNT, H5O_ALL, NULL, NULL, TRUE) < 0)
+                if (oh->nlink <= 1) {
+                    if (H5O__msg_remove_real(f, oh, H5O_MSG_REFCOUNT, H5O_ALL, NULL, NULL, TRUE) < 0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, (-1), "unable to delete refcount message")
                     oh->has_refcount_msg = FALSE;
                 } /* end if */
@@ -925,22 +914,24 @@ H5O__link_oh(H5F_t *f, int adjust, H5O_t *oh, hbool_t *deleted)
                 else {
                     H5O_refcount_t refcount = oh->nlink;
 
-                    if(H5O__msg_write_real(f, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) < 0)
+                    if (H5O__msg_write_real(f, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) <
+                        0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTUPDATE, (-1), "unable to update refcount message")
                 } /* end else */
-            } /* end if */
+            }     /* end if */
             else {
                 /* Check for adding refcount message to object */
-                if(oh->nlink > 1) {
+                if (oh->nlink > 1) {
                     H5O_refcount_t refcount = oh->nlink;
 
-                    if(H5O__msg_append_real(f, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) < 0)
+                    if (H5O__msg_append_real(f, oh, H5O_MSG_REFCOUNT, H5O_MSG_FLAG_DONTSHARE, 0, &refcount) <
+                        0)
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, (-1), "unable to create new refcount message")
                     oh->has_refcount_msg = TRUE;
                 } /* end if */
-            } /* end else */
-        } /* end if */
-    } /* end if */
+            }     /* end else */
+        }         /* end if */
+    }             /* end if */
 
     /* Set return value */
     ret_value = (int)oh->nlink;
@@ -949,29 +940,27 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__link_oh() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_link
+ * Function:    H5O_link
  *
- * Purpose:	Adjust the link count for an object header by adding
- *		ADJUST to the link count.
+ * Purpose:    Adjust the link count for an object header by adding
+ *        ADJUST to the link count.
  *
- * Return:	Success:	New link count
+ * Return:    Success:    New link count
  *
- *		Failure:	Negative
+ *        Failure:    Negative
  *
- * Programmer:	Robb Matzke
- *		matzke@llnl.gov
- *		Aug  5 1997
+ * Programmer:    Robb Matzke
+ *        Aug  5 1997
  *
  *-------------------------------------------------------------------------
  */
 int
 H5O_link(const H5O_loc_t *loc, int adjust)
 {
-    H5O_t	*oh = NULL;
-    hbool_t deleted = FALSE;            /* Whether the object was deleted */
-    int	ret_value = -1;                 /* Return value */
+    H5O_t * oh        = NULL;
+    hbool_t deleted   = FALSE; /* Whether the object was deleted */
+    int     ret_value = -1;    /* Return value */
 
     FUNC_ENTER_NOAPI_TAG(loc->addr, FAIL)
 
@@ -981,48 +970,46 @@ H5O_link(const H5O_loc_t *loc, int adjust)
     HDassert(H5F_addr_defined(loc->addr));
 
     /* Pin the object header */
-    if(NULL == (oh = H5O_pin(loc)))
+    if (NULL == (oh = H5O_pin(loc)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Call the "real" link routine */
-    if((ret_value = H5O__link_oh(loc->file, adjust, oh, &deleted)) < 0)
+    if ((ret_value = H5O__link_oh(loc->file, adjust, oh, &deleted)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "unable to adjust object link count")
 
 done:
-    if(oh && H5O_unpin(oh) < 0)
+    if (oh && H5O_unpin(oh) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
-    if(ret_value >= 0 && deleted && H5O_delete(loc->file, loc->addr) < 0)
+    if (ret_value >= 0 && deleted && H5O_delete(loc->file, loc->addr) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_link() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_protect
+ * Function:    H5O_protect
  *
- * Purpose:	Wrapper around H5AC_protect for use during a H5O_protect->
+ * Purpose:    Wrapper around H5AC_protect for use during a H5O_protect->
  *              H5O_msg_append->...->H5O_msg_append->H5O_unprotect sequence of calls
  *              during an object's creation.
  *
- * Return:	Success:	Pointer to the object header structure for the
+ * Return:    Success:    Pointer to the object header structure for the
  *                              object.
- *		Failure:	NULL
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
- *		Dec 31 2002
+ * Programmer:    Quincey Koziol
+ *        Dec 31 2002
  *
  *-------------------------------------------------------------------------
  */
 H5O_t *
 H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
 {
-    H5O_t *oh = NULL;           /* Object header protected */
-    H5O_cache_ud_t udata;       /* User data for protecting object header */
-    H5O_cont_msgs_t cont_msg_info;      /* Continuation message info */
-    unsigned file_intent;       /* R/W intent on file */
-    H5O_t *ret_value = NULL;    /* Return value */
+    H5O_t *         oh = NULL;        /* Object header protected */
+    H5O_cache_ud_t  udata;            /* User data for protecting object header */
+    H5O_cont_msgs_t cont_msg_info;    /* Continuation message info */
+    unsigned        file_intent;      /* R/W intent on file */
+    H5O_t *         ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_TAG(loc->addr, NULL)
 
@@ -1034,35 +1021,35 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
     HDassert((prot_flags & (unsigned)(~H5AC__READ_ONLY_FLAG)) == 0);
 
     /* Check for valid address */
-    if(!H5F_addr_defined(loc->addr))
+    if (!H5F_addr_defined(loc->addr))
         HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "address undefined")
 
     /* Check for write access on the file */
     file_intent = H5F_INTENT(loc->file);
-    if((0 == (prot_flags & H5AC__READ_ONLY_FLAG)) && (0 == (file_intent & H5F_ACC_RDWR)))
+    if ((0 == (prot_flags & H5AC__READ_ONLY_FLAG)) && (0 == (file_intent & H5F_ACC_RDWR)))
         HGOTO_ERROR(H5E_OHDR, H5E_BADVALUE, NULL, "no write intent on file")
 
     /* Construct the user data for protect callback */
-    udata.made_attempt = FALSE;
-    udata.v1_pfx_nmesgs = 0;
-    udata.chunk0_size = 0;
-    udata.oh = NULL;
-    udata.free_oh = FALSE;
-    udata.common.f = loc->file;
-    udata.common.file_intent = file_intent;
+    udata.made_attempt            = FALSE;
+    udata.v1_pfx_nmesgs           = 0;
+    udata.chunk0_size             = 0;
+    udata.oh                      = NULL;
+    udata.free_oh                 = FALSE;
+    udata.common.f                = loc->file;
+    udata.common.file_intent      = file_intent;
     udata.common.merged_null_msgs = 0;
     HDmemset(&cont_msg_info, 0, sizeof(cont_msg_info));
     udata.common.cont_msg_info = &cont_msg_info;
-    udata.common.addr = loc->addr;
+    udata.common.addr          = loc->addr;
 
     /* Lock the object header into the cache */
-    if(NULL == (oh = (H5O_t *)H5AC_protect(loc->file, H5AC_OHDR, loc->addr, &udata, prot_flags)))
+    if (NULL == (oh = (H5O_t *)H5AC_protect(loc->file, H5AC_OHDR, loc->addr, &udata, prot_flags)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Check if there are any continuation messages to process */
-    if(cont_msg_info.nmsgs > 0) {
-        size_t curr_msg;        /* Current continuation message to process */
-        H5O_chk_cache_ud_t chk_udata;   /* User data for loading chunk */
+    if (cont_msg_info.nmsgs > 0) {
+        size_t             curr_msg;  /* Current continuation message to process */
+        H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
 
         /* Sanity check - we should only have continuation messages to process
          *      when the object header is actually loaded from the file.
@@ -1071,30 +1058,32 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
         HDassert(cont_msg_info.msgs);
 
         /* Construct the user data for protecting chunks */
-        chk_udata.decoding = TRUE;
-        chk_udata.oh = oh;
-        chk_udata.chunkno = UINT_MAX;   /* Set to invalid value, for better error detection */
-        chk_udata.common.f = loc->file;
-        chk_udata.common.file_intent = file_intent;
+        chk_udata.decoding                = TRUE;
+        chk_udata.oh                      = oh;
+        chk_udata.chunkno                 = UINT_MAX; /* Set to invalid value, for better error detection */
+        chk_udata.common.f                = loc->file;
+        chk_udata.common.file_intent      = file_intent;
         chk_udata.common.merged_null_msgs = udata.common.merged_null_msgs;
-        chk_udata.common.cont_msg_info = &cont_msg_info;
+        chk_udata.common.cont_msg_info    = &cont_msg_info;
 
         /* Read in continuation messages, until there are no more */
         /* (Note that loading chunks could increase the # of continuation
          *      messages if new ones are found - QAK, 19/11/2016)
          */
         curr_msg = 0;
-        while(curr_msg < cont_msg_info.nmsgs) {
-            H5O_chunk_proxy_t *chk_proxy;       /* Proxy for chunk, to bring it into memory */
+        while (curr_msg < cont_msg_info.nmsgs) {
+            H5O_chunk_proxy_t *chk_proxy; /* Proxy for chunk, to bring it into memory */
 #ifndef NDEBUG
-            size_t chkcnt = oh->nchunks;      /* Count of chunks (for sanity checking) */
-#endif /* NDEBUG */
+            size_t chkcnt = oh->nchunks; /* Count of chunks (for sanity checking) */
+#endif                                   /* NDEBUG */
 
             /* Bring the chunk into the cache */
             /* (which adds to the object header) */
             chk_udata.common.addr = cont_msg_info.msgs[curr_msg].addr;
-            chk_udata.size = cont_msg_info.msgs[curr_msg].size;
-            if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, &chk_udata, prot_flags)))
+            chk_udata.size        = cont_msg_info.msgs[curr_msg].size;
+            if (NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, H5AC_OHDR_CHK,
+                                                                       cont_msg_info.msgs[curr_msg].addr,
+                                                                       &chk_udata, prot_flags)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk")
 
             /* Sanity check */
@@ -1103,7 +1092,8 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
             HDassert(oh->nchunks == (chkcnt + 1));
 
             /* Release the chunk from the cache */
-            if(H5AC_unprotect(loc->file, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, chk_proxy, H5AC__NO_FLAGS_SET) < 0)
+            if (H5AC_unprotect(loc->file, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, chk_proxy,
+                               H5AC__NO_FLAGS_SET) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header chunk")
 
             /* Advance to next continuation message */
@@ -1120,7 +1110,7 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
     /* Check for incorrect # of object header messages, if we've just loaded
      *  this object header from the file
      */
-    if(udata.made_attempt) {
+    if (udata.made_attempt) {
 /* Don't enforce the error on an incorrect # of object header messages bug
  *      unless strict format checking is enabled.  This allows for older
  *      files, created with a version of the library that had a bug in tracking
@@ -1129,39 +1119,39 @@ H5O_protect(const H5O_loc_t *loc, unsigned prot_flags, hbool_t pin_all_chunks)
  */
 #ifdef H5_STRICT_FORMAT_CHECKS
         /* Check for incorrect # of messages in v1 object header */
-        if(oh->version == H5O_VERSION_1 &&
-                (oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs)
+        if (oh->version == H5O_VERSION_1 &&
+            (oh->nmesgs + udata.common.merged_null_msgs) != udata.v1_pfx_nmesgs)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "corrupt object header - incorrect # of messages")
 #endif /* H5_STRICT_FORMAT_CHECKS */
-    } /* end if */
+    }  /* end if */
 
 #ifdef H5O_DEBUG
-H5O__assert(oh);
+    H5O__assert(oh);
 #endif /* H5O_DEBUG */
 
     /* Pin the other chunks also when requested, so that the object header
      *  proxy can be set up.
      */
-    if(pin_all_chunks && oh->nchunks > 1) {
-        unsigned u;         /* Local index variable */
+    if (pin_all_chunks && oh->nchunks > 1) {
+        unsigned u; /* Local index variable */
 
         /* Sanity check */
         HDassert(oh->swmr_write);
 
         /* Iterate over chunks > 0 */
-        for(u = 1; u < oh->nchunks; u++) {
-            H5O_chunk_proxy_t *chk_proxy;       /* Chunk proxy */
+        for (u = 1; u < oh->nchunks; u++) {
+            H5O_chunk_proxy_t *chk_proxy; /* Chunk proxy */
 
             /* Protect chunk */
-            if(NULL == (chk_proxy = H5O__chunk_protect(loc->file, oh, u)))
+            if (NULL == (chk_proxy = H5O__chunk_protect(loc->file, oh, u)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header chunk")
 
             /* Pin chunk proxy*/
-            if(H5AC_pin_protected_entry(chk_proxy) < 0 )
+            if (H5AC_pin_protected_entry(chk_proxy) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, NULL, "unable to pin object header chunk")
 
             /* Unprotect chunk */
-            if(H5O__chunk_unprotect(loc->file, chk_proxy, FALSE) < 0)
+            if (H5O__chunk_unprotect(loc->file, chk_proxy, FALSE) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to unprotect object header chunk")
 
             /* Preserve chunk proxy pointer for later */
@@ -1176,36 +1166,34 @@ H5O__assert(oh);
     ret_value = oh;
 
 done:
-    if(ret_value == NULL && oh)
-        if(H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (ret_value == NULL && oh)
+        if (H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_protect() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_pin
+ * Function:    H5O_pin
  *
- * Purpose:	Pin an object header down for use during a sequence of message
+ * Purpose:    Pin an object header down for use during a sequence of message
  *              operations, which prevents the object header from being
  *              evicted from the cache.
  *
- * Return:	Success:	Pointer to the object header structure for the
+ * Return:    Success:    Pointer to the object header structure for the
  *                              object.
- *		Failure:	NULL
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Jul 13 2008
+ * Programmer:    Quincey Koziol
+ *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
  */
 H5O_t *
 H5O_pin(const H5O_loc_t *loc)
 {
-    H5O_t       *oh = NULL;             /* Object header */
-    H5O_t       *ret_value = NULL;      /* Return value */
+    H5O_t *oh        = NULL; /* Object header */
+    H5O_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -1213,12 +1201,12 @@ H5O_pin(const H5O_loc_t *loc)
     HDassert(loc);
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to protect object header")
 
     /* Increment the reference count on the object header */
     /* (which will pin it, if appropriate) */
-    if(H5O__inc_rc(oh) < 0)
+    if (H5O__inc_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINC, NULL, "unable to increment reference count on object header")
 
     /* Set the return value */
@@ -1226,32 +1214,30 @@ H5O_pin(const H5O_loc_t *loc)
 
 done:
     /* Release the object header from the cache */
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_pin() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_unpin
+ * Function:    H5O_unpin
  *
- * Purpose:	Unpin an object header, allowing it to be evicted from the
+ * Purpose:    Unpin an object header, allowing it to be evicted from the
  *              metadata cache.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Jul 13 2008
+ * Programmer:    Quincey Koziol
+ *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_unpin(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1260,34 +1246,32 @@ H5O_unpin(H5O_t *oh)
 
     /* Decrement the reference count on the object header */
     /* (which will unpin it, if appropriate) */
-    if(H5O__dec_rc(oh) < 0)
+    if (H5O__dec_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement reference count on object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_unpin() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_unprotect
+ * Function:    H5O_unprotect
  *
- * Purpose:	Wrapper around H5AC_unprotect for use during a H5O_protect->
+ * Purpose:    Wrapper around H5AC_unprotect for use during a H5O_protect->
  *              H5O_msg_append->...->H5O_msg_append->H5O_unprotect sequence of calls
  *              during an object's creation.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
- *		Dec 31 2002
+ * Programmer:    Quincey Koziol
+ *        Dec 31 2002
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_unprotect(const H5O_loc_t *loc, H5O_t *oh, unsigned oh_flags)
 {
-    herr_t ret_value = SUCCEED;      /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1296,45 +1280,44 @@ H5O_unprotect(const H5O_loc_t *loc, H5O_t *oh, unsigned oh_flags)
     HDassert(oh);
 
     /* Unpin the other chunks */
-    if(oh->chunks_pinned && oh->nchunks > 1) {
-        unsigned u;         /* Local index variable */
+    if (oh->chunks_pinned && oh->nchunks > 1) {
+        unsigned u; /* Local index variable */
 
         /* Sanity check */
         HDassert(oh->swmr_write);
 
         /* Iterate over chunks > 0 */
-        for(u = 1; u < oh->nchunks; u++) {
-            if(NULL != oh->chunk[u].chunk_proxy) {
+        for (u = 1; u < oh->nchunks; u++) {
+            if (NULL != oh->chunk[u].chunk_proxy) {
                 /* Release chunk proxy */
-                if(H5AC_unpin_entry(oh->chunk[u].chunk_proxy) < 0)
+                if (H5AC_unpin_entry(oh->chunk[u].chunk_proxy) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header chunk")
                 oh->chunk[u].chunk_proxy = NULL;
             } /* end if */
-        } /* end for */
+        }     /* end for */
 
         /* Reet the flag from the unprotect */
         oh->chunks_pinned = FALSE;
     } /* end if */
 
     /* Unprotect the object header */
-    if(H5AC_unprotect(loc->file, H5AC_OHDR, oh->chunk[0].addr, oh, oh_flags) < 0)
+    if (H5AC_unprotect(loc->file, H5AC_OHDR, oh->chunk[0].addr, oh, oh_flags) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_unprotect() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_touch_oh
+ * Function:    H5O_touch_oh
  *
- * Purpose:	If FORCE is non-zero then create a modification time message
- *		unless one already exists.  Then update any existing
- *		modification time message with the current time.
+ * Purpose:    If FORCE is non-zero then create a modification time message
+ *        unless one already exists.  Then update any existing
+ *        modification time message with the current time.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, July 27, 1998
  *
  *-------------------------------------------------------------------------
@@ -1342,10 +1325,10 @@ done:
 herr_t
 H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
 {
-    H5O_chunk_proxy_t *chk_proxy = NULL;        /* Chunk that message is in */
-    hbool_t chk_dirtied = FALSE;        /* Flag for unprotecting chunk */
-    time_t	now;                    /* Current time */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_chunk_proxy_t *chk_proxy   = NULL;  /* Chunk that message is in */
+    hbool_t            chk_dirtied = FALSE; /* Flag for unprotecting chunk */
+    time_t             now;                 /* Current time */
+    herr_t             ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
@@ -1353,43 +1336,45 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
     HDassert(oh);
 
     /* Check if this object header is tracking times */
-    if(oh->flags & H5O_HDR_STORE_TIMES) {
+    if (oh->flags & H5O_HDR_STORE_TIMES) {
         /* Get current time */
         now = H5_now();
 
         /* Check version, to determine how to store time information */
-        if(oh->version == H5O_VERSION_1) {
-            size_t	idx;                    /* Index of modification time message to update */
+        if (oh->version == H5O_VERSION_1) {
+            size_t idx; /* Index of modification time message to update */
 
             /* Look for existing message */
-            for(idx = 0; idx < oh->nmesgs; idx++)
-                if(H5O_MSG_MTIME == oh->mesg[idx].type || H5O_MSG_MTIME_NEW == oh->mesg[idx].type)
+            for (idx = 0; idx < oh->nmesgs; idx++)
+                if (H5O_MSG_MTIME == oh->mesg[idx].type || H5O_MSG_MTIME_NEW == oh->mesg[idx].type)
                     break;
 
             /* Create a new message, if necessary */
-            if(idx == oh->nmesgs) {
-                unsigned mesg_flags = 0;        /* Flags for message in object header */
+            if (idx == oh->nmesgs) {
+                unsigned mesg_flags = 0; /* Flags for message in object header */
 
                 /* If we would have to create a new message, but we aren't 'forcing' it, get out now */
-                if(!force)
-                    HGOTO_DONE(SUCCEED);        /*nothing to do*/
+                if (!force)
+                    HGOTO_DONE(SUCCEED); /*nothing to do*/
 
                 /* Allocate space for the modification time message */
-                if(H5O__msg_alloc(f, oh, H5O_MSG_MTIME_NEW, &mesg_flags, &now, &idx) < 0)
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for modification time message")
+                if (H5O__msg_alloc(f, oh, H5O_MSG_MTIME_NEW, &mesg_flags, &now, &idx) < 0)
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL,
+                                "unable to allocate space for modification time message")
 
                 /* Set the message's flags if appropriate */
                 oh->mesg[idx].flags = (uint8_t)mesg_flags;
             } /* end if */
 
             /* Protect chunk */
-            if(NULL == (chk_proxy = H5O__chunk_protect(f, oh, oh->mesg[idx].chunkno)))
+            if (NULL == (chk_proxy = H5O__chunk_protect(f, oh, oh->mesg[idx].chunkno)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header chunk")
 
             /* Allocate 'native' space, if necessary */
-            if(NULL == oh->mesg[idx].native) {
-                if(NULL == (oh->mesg[idx].native = H5FL_MALLOC(time_t)))
-                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "memory allocation failed for modification time message")
+            if (NULL == oh->mesg[idx].native) {
+                if (NULL == (oh->mesg[idx].native = H5FL_MALLOC(time_t)))
+                    HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL,
+                                "memory allocation failed for modification time message")
             } /* end if */
 
             /* Update the message */
@@ -1397,7 +1382,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
 
             /* Mark the message as dirty */
             oh->mesg[idx].dirty = TRUE;
-            chk_dirtied = TRUE;
+            chk_dirtied         = TRUE;
         } /* end if */
         else {
             /* XXX: For now, update access time & change fields in the object header
@@ -1406,31 +1391,30 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
             oh->atime = oh->ctime = now;
 
             /* Mark object header as dirty in cache */
-            if(H5AC_mark_entry_dirty(oh) < 0)
+            if (H5AC_mark_entry_dirty(oh) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty")
         } /* end else */
-    } /* end if */
+    }     /* end if */
 
 done:
     /* Release chunk */
-    if(chk_proxy && H5O__chunk_unprotect(f, chk_proxy, chk_dirtied) < 0)
+    if (chk_proxy && H5O__chunk_unprotect(f, chk_proxy, chk_dirtied) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to unprotect object header chunk")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_touch_oh() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_touch
+ * Function:    H5O_touch
  *
- * Purpose:	Touch an object by setting the modification time to the
- *		current time and marking the object as dirty.  Unless FORCE
- *		is non-zero, nothing happens if there is no MTIME message in
- *		the object header.
+ * Purpose:    Touch an object by setting the modification time to the
+ *        current time and marking the object as dirty.  Unless FORCE
+ *        is non-zero, nothing happens if there is no MTIME message in
+ *        the object header.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Monday, July 27, 1998
  *
  *-------------------------------------------------------------------------
@@ -1438,9 +1422,9 @@ done:
 herr_t
 H5O_touch(const H5O_loc_t *loc, hbool_t force)
 {
-    H5O_t	*oh = NULL;             /* Object header to modify */
-    unsigned 	oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *  oh        = NULL;               /* Object header to modify */
+    unsigned oh_flags  = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    herr_t   ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1448,34 +1432,33 @@ H5O_touch(const H5O_loc_t *loc, hbool_t force)
     HDassert(loc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__NO_FLAGS_SET, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Create/Update the modification time message */
-    if(H5O_touch_oh(loc->file, oh, force) < 0)
+    if (H5O_touch_oh(loc->file, oh, force) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "unable to update object modificaton time")
 
     /* Mark object header as changed */
     oh_flags |= H5AC__DIRTIED_FLAG;
 
 done:
-    if(oh && H5O_unprotect(loc, oh, oh_flags) < 0)
+    if (oh && H5O_unprotect(loc, oh, oh_flags) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_touch() */
 
 #ifdef H5O_ENABLE_BOGUS
-
+
 /*-------------------------------------------------------------------------
- * Function:	H5O_bogus_oh
+ * Function:    H5O_bogus_oh
  *
- * Purpose:	Create a "bogus" message unless one already exists.
+ * Purpose:    Create a "bogus" message unless one already exists.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *              <koziol@ncsa.uiuc.edu>
+ * Programmer:    Quincey Koziol
  *              Tuesday, January 21, 2003
  *
  *-------------------------------------------------------------------------
@@ -1483,9 +1466,9 @@ done:
 herr_t
 H5O_bogus_oh(H5F_t *f, H5O_t *oh, unsigned bogus_id, unsigned mesg_flags)
 {
-    size_t	idx;                /* Local index variable */
-    H5O_msg_class_t *type;	    /* Message class type */
-    herr_t ret_value = SUCCEED;     /* Return value */
+    size_t           idx;                 /* Local index variable */
+    H5O_msg_class_t *type;                /* Message class type */
+    herr_t           ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -1493,30 +1476,30 @@ H5O_bogus_oh(H5F_t *f, H5O_t *oh, unsigned bogus_id, unsigned mesg_flags)
     HDassert(oh);
 
     /* Look for existing message */
-    for(idx = 0; idx < oh->nmesgs; idx++)
-        if(H5O_MSG_BOGUS_VALID == oh->mesg[idx].type || H5O_MSG_BOGUS_INVALID == oh->mesg[idx].type)
+    for (idx = 0; idx < oh->nmesgs; idx++)
+        if (H5O_MSG_BOGUS_VALID == oh->mesg[idx].type || H5O_MSG_BOGUS_INVALID == oh->mesg[idx].type)
             break;
 
     /* Create a new message */
-    if(idx == oh->nmesgs) {
-        H5O_bogus_t *bogus;             /* Pointer to the bogus information */
+    if (idx == oh->nmesgs) {
+        H5O_bogus_t *bogus; /* Pointer to the bogus information */
 
         /* Allocate the native message in memory */
-        if(NULL == (bogus = H5MM_malloc(sizeof(H5O_bogus_t))))
+        if (NULL == (bogus = H5MM_malloc(sizeof(H5O_bogus_t))))
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "memory allocation failed for 'bogus' message")
 
         /* Update the native value */
         bogus->u = H5O_BOGUS_VALUE;
 
-        if(bogus_id == H5O_BOGUS_VALID_ID)
+        if (bogus_id == H5O_BOGUS_VALID_ID)
             type = H5O_MSG_BOGUS_VALID;
-        else if(bogus_id == H5O_BOGUS_INVALID_ID)
+        else if (bogus_id == H5O_BOGUS_INVALID_ID)
             type = H5O_MSG_BOGUS_INVALID;
         else
-            HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "invalid ID for 'bogus' message")
+            HGOTO_ERROR(H5E_ID, H5E_BADID, FAIL, "invalid ID for 'bogus' message")
 
         /* Allocate space in the object header for bogus message */
-        if(H5O__msg_alloc(f, oh, type, &mesg_flags, bogus, &idx) < 0)
+        if (H5O__msg_alloc(f, oh, type, &mesg_flags, bogus, &idx) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to allocate space for 'bogus' message")
 
         /* Point to "bogus" information (take it over) */
@@ -1526,7 +1509,7 @@ H5O_bogus_oh(H5F_t *f, H5O_t *oh, unsigned bogus_id, unsigned mesg_flags)
         oh->mesg[idx].flags = mesg_flags;
 
         /* Mark the message and object header as dirty */
-        oh->mesg[idx].dirty = TRUE;
+        oh->mesg[idx].dirty     = TRUE;
         oh->cache_info.is_dirty = TRUE;
     } /* end if */
 
@@ -1535,31 +1518,29 @@ done:
 } /* end H5O_bogus_oh() */
 #endif /* H5O_ENABLE_BOGUS */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_delete
+ * Function:    H5O_delete
  *
- * Purpose:	Delete an object header from a file.  This frees the file
+ * Purpose:    Delete an object header from a file.  This frees the file
  *              space used for the object header (and it's continuation blocks)
  *              and also walks through each header message and asks it to
  *              remove all the pieces of the file referenced by the header.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
- *		Mar 19 2003
+ * Programmer:    Quincey Koziol
+ *        Mar 19 2003
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_delete(H5F_t *f, haddr_t addr)
 {
-    H5O_t *oh = NULL;           /* Object header information */
-    H5O_loc_t loc;              /* Object location for object to delete */
-    unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
-    hbool_t corked;
-    herr_t ret_value = SUCCEED; /* Return value */
+    H5O_t *   oh = NULL;                     /* Object header information */
+    H5O_loc_t loc;                           /* Object location for object to delete */
+    unsigned  oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
+    hbool_t   corked;
+    herr_t    ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_TAG(addr, FAIL)
 
@@ -1568,61 +1549,59 @@ H5O_delete(H5F_t *f, haddr_t addr)
     HDassert(H5F_addr_defined(addr));
 
     /* Set up the object location */
-    loc.file = f;
-    loc.addr = addr;
+    loc.file         = f;
+    loc.addr         = addr;
     loc.holding_file = FALSE;
 
     /* Get the object header information */
-    if(NULL == (oh = H5O_protect(&loc, H5AC__NO_FLAGS_SET, FALSE)))
+    if (NULL == (oh = H5O_protect(&loc, H5AC__NO_FLAGS_SET, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Delete object */
-    if(H5O__delete_oh(f, oh) < 0)
+    if (H5O__delete_oh(f, oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "can't delete object from file")
 
     /* Uncork cache entries with tag: addr */
-    if(H5AC_cork(f, addr, H5AC__GET_CORKED, &corked) < 0)
+    if (H5AC_cork(f, addr, H5AC__GET_CORKED, &corked) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to retrieve an object's cork status")
-    if(corked)
-        if(H5AC_cork(f, addr, H5AC__UNCORK, NULL) < 0)
+    if (corked)
+        if (H5AC_cork(f, addr, H5AC__UNCORK, NULL) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNCORK, FAIL, "unable to uncork an object")
 
     /* Mark object header as deleted */
     oh_flags = H5AC__DIRTIED_FLAG | H5AC__DELETED_FLAG | H5AC__FREE_FILE_SPACE_FLAG;
 
 done:
-    if(oh && H5O_unprotect(&loc, oh, oh_flags) < 0)
+    if (oh && H5O_unprotect(&loc, oh, oh_flags) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_delete() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__delete_oh
+ * Function:    H5O__delete_oh
  *
- * Purpose:	Internal function to:
+ * Purpose:    Internal function to:
  *              Delete an object header from a file.  This frees the file
  *              space used for the object header (and it's continuation blocks)
  *              and also walks through each header message and asks it to
  *              remove all the pieces of the file referenced by the header.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
- *		Mar 19 2003
+ * Programmer:    Quincey Koziol
+ *        Mar 19 2003
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5O__delete_oh(H5F_t *f, H5O_t *oh)
 {
-    H5O_mesg_t *curr_msg;       /* Pointer to current message being operated on */
-    unsigned	u;
-    herr_t ret_value = SUCCEED;   /* Return value */
+    H5O_mesg_t *curr_msg; /* Pointer to current message being operated on */
+    unsigned    u;
+    herr_t      ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Check args */
     HDassert(f);
@@ -1631,26 +1610,26 @@ H5O__delete_oh(H5F_t *f, H5O_t *oh)
     /* Walk through the list of object header messages, asking each one to
      * delete any file space used
      */
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
         /* Free any space referred to in the file from this message */
-        if(H5O__delete_mesg(f, oh, curr_msg) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL, "unable to delete file space for object header message")
+        if (H5O__delete_mesg(f, oh, curr_msg) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTDELETE, FAIL,
+                        "unable to delete file space for object header message")
     } /* end for */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__delete_oh() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_obj_type
+ * Function:    H5O_obj_type
  *
- * Purpose:	Retrieves the type of object pointed to by `loc'.
+ * Purpose:    Retrieves the type of object pointed to by `loc'.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Robb Matzke
+ * Programmer:    Robb Matzke
  *              Wednesday, November  4, 1998
  *
  *-------------------------------------------------------------------------
@@ -1658,36 +1637,35 @@ done:
 herr_t
 H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type)
 {
-    H5O_t	*oh = NULL;             /* Object header for location */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    H5O_t *oh        = NULL;    /* Object header for location */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_TAG(loc->addr, FAIL)
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the type of the object */
-    if(H5O__obj_type_real(oh, obj_type) < 0)
+    if (H5O__obj_type_real(oh, obj_type) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_obj_type() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__obj_type_real
+ * Function:    H5O__obj_type_real
  *
- * Purpose:	Returns the type of object pointed to by `oh'.
+ * Purpose:    Returns the type of object pointed to by `oh'.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, November 21, 2005
  *
  *-------------------------------------------------------------------------
@@ -1695,31 +1673,29 @@ done:
 static herr_t
 H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type)
 {
-    const H5O_obj_class_t *obj_class;           /* Class of object for header */
+    const H5O_obj_class_t *obj_class; /* Class of object for header */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(oh);
     HDassert(obj_type);
 
     /* Look up class for object header */
-    if(NULL == (obj_class = H5O__obj_class_real(oh))) {
+    if (NULL == (obj_class = H5O__obj_class_real(oh))) {
         /* Clear error stack from "failed" class lookup */
         H5E_clear_stack(NULL);
 
         /* Set type to "unknown" */
         *obj_type = H5O_TYPE_UNKNOWN;
     }
-    else {
+    else
         /* Set object type */
         *obj_type = obj_class->type;
-    }
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__obj_type_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__obj_class
  *
@@ -1728,7 +1704,7 @@ H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type)
  * Return:      Success:    An object class
  *              Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, November  6, 2006
  *
  *-------------------------------------------------------------------------
@@ -1736,36 +1712,35 @@ H5O__obj_type_real(const H5O_t *oh, H5O_type_t *obj_type)
 const H5O_obj_class_t *
 H5O__obj_class(const H5O_loc_t *loc)
 {
-    H5O_t	*oh = NULL;                     /* Object header for location */
-    const H5O_obj_class_t *ret_value = NULL;    /* Return value */
+    H5O_t *                oh        = NULL; /* Object header for location */
+    const H5O_obj_class_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_PACKAGE_TAG(loc->addr)
 
     /* Load the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header")
 
     /* Test whether entry qualifies as a particular type of object */
-    if(NULL == (ret_value = H5O__obj_class_real(oh)))
+    if (NULL == (ret_value = H5O__obj_class_real(oh)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, NULL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O__obj_class() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__obj_class_real
+ * Function:    H5O__obj_class_real
  *
- * Purpose:	Returns the class of object pointed to by `oh'.
+ * Purpose:    Returns the class of object pointed to by `oh'.
  *
- * Return:	Success:	An object class
- *		Failure:	NULL
+ * Return:    Success:    An object class
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, November 21, 2005
  *
  *-------------------------------------------------------------------------
@@ -1773,66 +1748,65 @@ done:
 static const H5O_obj_class_t *
 H5O__obj_class_real(const H5O_t *oh)
 {
-    size_t	i;                      /* Local index variable */
-    const H5O_obj_class_t *ret_value = NULL;   /* Return value */
+    size_t                 i;                /* Local index variable */
+    const H5O_obj_class_t *ret_value = NULL; /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(oh);
 
     /* Test whether entry qualifies as a particular type of object */
     /* (Note: loop is in reverse order, to test specific objects first) */
-    for(i = NELMTS(H5O_obj_class_g); i > 0; --i) {
-        htri_t	isa;            /* Is entry a particular type? */
+    for (i = NELMTS(H5O_obj_class_g); i > 0; --i) {
+        htri_t isa; /* Is entry a particular type? */
 
-        if((isa = (H5O_obj_class_g[i - 1]->isa)(oh)) < 0)
+        if ((isa = (H5O_obj_class_g[i - 1]->isa)(oh)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
-        else if(isa)
+        else if (isa)
             HGOTO_DONE(H5O_obj_class_g[i - 1])
     }
 
-    if(0 == i)
+    if (0 == i)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, NULL, "unable to determine object type")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__obj_class_real() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_loc
+ * Function:    H5O_get_loc
  *
- * Purpose:	Gets the object location for an object given its ID.
+ * Purpose:    Gets the object location for an object given its ID.
  *
- * Return:	Success:	Pointer to H5O_loc_t
- *		Failure:	NULL
+ * Return:    Success:    Pointer to H5O_loc_t
+ *        Failure:    NULL
  *
- * Programmer:	James Laird
- *		July 25 2006
+ * Programmer:    James Laird
+ *        July 25 2006
  *
  *-------------------------------------------------------------------------
  */
 H5O_loc_t *
 H5O_get_loc(hid_t object_id)
 {
-    H5O_loc_t   *ret_value = NULL;      /* Return value */
+    H5O_loc_t *ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
-    switch(H5I_get_type(object_id)) {
+    switch (H5I_get_type(object_id)) {
         case H5I_GROUP:
-            if(NULL == (ret_value = H5O_OBJ_GROUP->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_GROUP->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from group ID")
             break;
 
         case H5I_DATASET:
-            if(NULL == (ret_value = H5O_OBJ_DATASET->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_DATASET->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from dataset ID")
             break;
 
         case H5I_DATATYPE:
-            if(NULL == (ret_value = H5O_OBJ_DATATYPE->get_oloc(object_id)))
+            if (NULL == (ret_value = H5O_OBJ_DATATYPE->get_oloc(object_id)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, NULL, "unable to get object location from datatype ID")
             break;
 
@@ -1852,6 +1826,7 @@ H5O_get_loc(hid_t object_id)
         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, NULL, "invalid object type")
@@ -1861,16 +1836,15 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_loc() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_loc_reset
+ * Function:    H5O_loc_reset
  *
- * Purpose:	Reset a object location to an empty state
+ * Purpose:    Reset a object location to an empty state
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              Monday, September 19, 2005
  *
  *-------------------------------------------------------------------------
@@ -1890,27 +1864,17 @@ H5O_loc_reset(H5O_loc_t *loc)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_loc_reset() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_loc_copy
  *
- * Purpose:     Copy object location information
+ * Purpose:     Copy object location information, according to the depth.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *            Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *              koziol@ncsa.uiuc.edu
+ * Programmer:    Quincey Koziol
  *              Monday, September 19, 2005
  *
- * Notes:       'depth' parameter determines how much of the group entry
- *              structure we want to copy.  The values are:
- *                  H5_COPY_SHALLOW - Copy all the field values from the source
- *                      to the destination, but not copying objects pointed to.
- *                      (Destination "takes ownership" of objects pointed to)
- *                  H5_COPY_DEEP - Copy all the fields from the source to
- *                      the destination, deep copying objects pointed to.
- *
  *-------------------------------------------------------------------------
  */
 herr_t
@@ -1923,35 +1887,95 @@ H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth)
     HDassert(dst);
     HDassert(depth == H5_COPY_SHALLOW || depth == H5_COPY_DEEP);
 
+    /* Invoke correct routine */
+    if (depth == H5_COPY_SHALLOW)
+        H5O_loc_copy_shallow(dst, src);
+    else
+        H5O_loc_copy_deep(dst, src);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5O_loc_copy() */
+
+/*-------------------------------------------------------------------------
+ * Function:    H5O_loc_copy_shallow
+ *
+ * Purpose:     Shallow copy object location information.  Copies all the field
+ *              values from the source to the destination, but not copying
+ *              objects pointed to.  (i.e. destination "takes ownership" of
+ *              objects pointed to)
+ *
+ * Return:    Success:    Non-negative
+ *            Failure:    Negative
+ *
+ * Programmer:	Quincey Koziol
+ *	        January 18, 2020
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5O_loc_copy_shallow(H5O_loc_t *dst, H5O_loc_t *src)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+    /* Check arguments */
+    HDassert(src);
+    HDassert(dst);
+
     /* Copy the top level information */
     H5MM_memcpy(dst, src, sizeof(H5O_loc_t));
 
-    /* Deep copy the names */
-    if(depth == H5_COPY_DEEP) {
-        /* If the original entry was holding open the file, this one should
-         * hold it open, too.
-         */
-        if(src->holding_file)
-            H5F_INCR_NOPEN_OBJS(dst->file);
-    }
-    else if(depth == H5_COPY_SHALLOW) {
-        H5O_loc_reset(src);
-    }
+    /* Reset the source location, as the destination 'owns' it now */
+    H5O_loc_reset(src);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5O_loc_copy() */
+} /* end H5O_loc_copy_shallow() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_loc_hold_file
+ * Function:    H5O_loc_copy_deep
+ *
+ * Purpose:     Deep copy object location information.  Copies all the fields
+ *              from the source to the destination, deep copying objects
+ *              pointed to.
+ *
+ * Return:    Success:    Non-negative
+ *            Failure:    Negative
+ *
+ * Programmer:	David Young
+ *	        January 18, 2020
  *
- * Purpose:	Have this object header hold a file open until it is
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5O_loc_copy_deep(H5O_loc_t *dst, const H5O_loc_t *src)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+    /* Check arguments */
+    HDassert(src);
+    HDassert(dst);
+
+    /* Copy the top level information */
+    H5MM_memcpy(dst, src, sizeof(H5O_loc_t));
+
+    /* If the original entry was holding open the file, this one should
+     * hold it open, too.
+     */
+    if (src->holding_file)
+        H5F_INCR_NOPEN_OBJS(dst->file);
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5O_loc_copy_deep() */
+
+/*-------------------------------------------------------------------------
+ * Function:    H5O_loc_hold_file
+ *
+ * Purpose:    Have this object header hold a file open until it is
  *              released.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	James Laird
+ * Programmer:    James Laird
  *              Wednesday, August 16, 2006
  *
  *-------------------------------------------------------------------------
@@ -1966,7 +1990,7 @@ H5O_loc_hold_file(H5O_loc_t *loc)
     HDassert(loc->file);
 
     /* If this location is not already holding its file open, do so. */
-    if(!loc->holding_file) {
+    if (!loc->holding_file) {
         H5F_INCR_NOPEN_OBJS(loc->file);
         loc->holding_file = TRUE;
     }
@@ -1974,18 +1998,17 @@ H5O_loc_hold_file(H5O_loc_t *loc)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O_loc_hold_file() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_loc_free
+ * Function:    H5O_loc_free
  *
- * Purpose:	Release resources used by this object header location.
+ * Purpose:    Release resources used by this object header location.
  *              Not to be confused with H5O_close; this is used on
  *              locations that don't correspond to open objects.
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	James Laird
+ * Programmer:    James Laird
  *              Wednesday, August 16, 2006
  *
  *-------------------------------------------------------------------------
@@ -2001,11 +2024,11 @@ H5O_loc_free(H5O_loc_t *loc)
     HDassert(loc);
 
     /* If this location is holding its file open try to close the file. */
-    if(loc->holding_file) {
+    if (loc->holding_file) {
         H5F_DECR_NOPEN_OBJS(loc->file);
         loc->holding_file = FALSE;
-        if(H5F_NOPEN_OBJS(loc->file) <= 0) {
-            if(H5F_try_close(loc->file, NULL) < 0)
+        if (H5F_NOPEN_OBJS(loc->file) <= 0) {
+            if (H5F_try_close(loc->file, NULL) < 0)
                 HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file")
         }
     }
@@ -2014,25 +2037,24 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_loc_free() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_hdr_info
+ * Function:    H5O_get_hdr_info
  *
- * Purpose:	Retrieve the object header information for an object
+ * Purpose:    Retrieve the object header information for an object
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		September 22 2009
+ * Programmer:    Quincey Koziol
+ *        September 22 2009
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_get_hdr_info(const H5O_loc_t *loc, H5O_hdr_info_t *hdr)
 {
-    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_NOAPI(FAIL)
 
@@ -2044,42 +2066,41 @@ H5O_get_hdr_info(const H5O_loc_t *loc, H5O_hdr_info_t *hdr)
     HDmemset(hdr, 0, sizeof(*hdr));
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, FAIL, "unable to load object header")
 
     /* Get the information for the object header */
-    if(H5O__get_hdr_info_real(oh, hdr) < 0)
+    if (H5O__get_hdr_info_real(oh, hdr) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object header info")
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
-	HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+        HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_get_hdr_info() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__get_hdr_info_real
+ * Function:    H5O__get_hdr_info_real
  *
- * Purpose:	Internal routine to retrieve the object header information for an object
+ * Purpose:    Internal routine to retrieve the object header information for an object
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		September 22 2009
+ * Programmer:    Quincey Koziol
+ *        September 22 2009
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
 H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
 {
-    const H5O_mesg_t *curr_msg;         /* Pointer to current message being operated on */
-    const H5O_chunk_t *curr_chunk;	/* Pointer to current message being operated on */
-    unsigned u;                         /* Local index variable */
+    const H5O_mesg_t * curr_msg;   /* Pointer to current message being operated on */
+    const H5O_chunk_t *curr_chunk; /* Pointer to current message being operated on */
+    unsigned           u;          /* Local index variable */
 
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Check args */
     HDassert(oh);
@@ -2096,18 +2117,18 @@ H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
     hdr->flags = oh->flags;
 
     /* Iterate over all the messages, accumulating message size & type information */
-    hdr->space.meta = (hsize_t)H5O_SIZEOF_HDR(oh) + (hsize_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
-    hdr->space.mesg = 0;
-    hdr->space.free = 0;
+    hdr->space.meta   = (hsize_t)H5O_SIZEOF_HDR(oh) + (hsize_t)(H5O_SIZEOF_CHKHDR_OH(oh) * (oh->nchunks - 1));
+    hdr->space.mesg   = 0;
+    hdr->space.free   = 0;
     hdr->mesg.present = 0;
-    hdr->mesg.shared = 0;
-    for(u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
-        uint64_t type_flag;             /* Flag for message type */
+    hdr->mesg.shared  = 0;
+    for (u = 0, curr_msg = &oh->mesg[0]; u < oh->nmesgs; u++, curr_msg++) {
+        uint64_t type_flag; /* Flag for message type */
 
         /* Accumulate space usage information, based on the type of message */
-        if(H5O_NULL_ID == curr_msg->type->id)
+        if (H5O_NULL_ID == curr_msg->type->id)
             hdr->space.free += (hsize_t)((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size);
-        else if(H5O_CONT_ID == curr_msg->type->id)
+        else if (H5O_CONT_ID == curr_msg->type->id)
             hdr->space.meta += (hsize_t)((size_t)H5O_SIZEOF_MSGHDR_OH(oh) + curr_msg->raw_size);
         else {
             hdr->space.meta += (hsize_t)H5O_SIZEOF_MSGHDR_OH(oh);
@@ -2119,13 +2140,13 @@ H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
         hdr->mesg.present |= type_flag;
 
         /* Set flag if the message is shared in some way */
-        if(curr_msg->flags & H5O_MSG_FLAG_SHARED)                                   \
+        if (curr_msg->flags & H5O_MSG_FLAG_SHARED)
             hdr->mesg.shared |= type_flag;
     } /* end for */
 
     /* Iterate over all the chunks, adding any gaps to the free space */
     hdr->space.total = 0;
-    for(u = 0, curr_chunk = &oh->chunk[0]; u < oh->nchunks; u++, curr_chunk++) {
+    for (u = 0, curr_chunk = &oh->chunk[0]; u < oh->nchunks; u++, curr_chunk++) {
         /* Accumulate the size of the header on disk */
         hdr->space.total += curr_chunk->size;
 
@@ -2139,16 +2160,13 @@ H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__get_hdr_info_real() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O_get_info
  *
- * Purpose:     Retrieve the information for an object
+ * Purpose:     Retrieve the data model information for an object
  *
- * Note:        Add a parameter "fields" to indicate selection of object info.
- *  
- * Return:      Success:	Non-negative
- *              Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
  * Programmer:  Quincey Koziol
  *              November 21 2006
@@ -2156,11 +2174,11 @@ H5O__get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O_get_info(const H5O_loc_t *loc, H5O_info_t *oinfo, unsigned fields)
+H5O_get_info(const H5O_loc_t *loc, H5O_info2_t *oinfo, unsigned fields)
 {
-    const H5O_obj_class_t *obj_class;   /* Class of object for header */
-    H5O_t *oh = NULL;                   /* Object header */
-    herr_t ret_value = SUCCEED;         /* Return value */
+    const H5O_obj_class_t *obj_class;           /* Class of object for header */
+    H5O_t *                oh        = NULL;    /* Object header */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_TAG(loc->addr, FAIL)
 
@@ -2169,41 +2187,43 @@ H5O_get_info(const H5O_loc_t *loc, H5O_info_t *oinfo, unsigned fields)
     HDassert(oinfo);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Get class for object */
-    if(NULL == (obj_class = H5O__obj_class_real(oh)))
+    if (NULL == (obj_class = H5O__obj_class_real(oh)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine object class")
 
     /* Reset the object info structure */
-    HDmemset(oinfo, 0, sizeof(*oinfo));
+    if (H5O__reset_info2(oinfo) < 0)
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't reset object data struct")
 
     /* Get basic information, if requested */
-    if(fields & H5O_INFO_BASIC) {
+    if (fields & H5O_INFO_BASIC) {
         /* Retrieve the file's fileno */
         H5F_GET_FILENO(loc->file, oinfo->fileno);
 
-        /* Set the object's address */
-        oinfo->addr = loc->addr;
+        /* Set the object's address into the token */
+        if (H5VL_native_addr_to_token(loc->file, H5I_FILE, loc->addr, &oinfo->token) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTSERIALIZE, FAIL, "can't serialize address into object token")
 
         /* Retrieve the type of the object */
         oinfo->type = obj_class->type;
 
         /* Set the object's reference count */
         oinfo->rc = oh->nlink;
-    } /* end if */
+    }
 
     /* Get time information, if requested */
-    if(fields & H5O_INFO_TIME) {
-        if(oh->version > H5O_VERSION_1) {
+    if (fields & H5O_INFO_TIME) {
+        if (oh->version > H5O_VERSION_1) {
             oinfo->atime = oh->atime;
             oinfo->mtime = oh->mtime;
             oinfo->ctime = oh->ctime;
             oinfo->btime = oh->btime;
         } /* end if */
         else {
-            htri_t exists;                 /* Flag if header message of interest exists */
+            htri_t exists; /* Flag if header message of interest exists */
 
             /* No information for access & modification fields */
             /* (we stopped updating the "modification time" header message for
@@ -2215,136 +2235,120 @@ H5O_get_info(const H5O_loc_t *loc, H5O_info_t *oinfo, unsigned fields)
             oinfo->btime = 0;
 
             /* Might be information for modification time */
-            if((exists = H5O_msg_exists_oh(oh, H5O_MTIME_ID)) < 0)
+            if ((exists = H5O_msg_exists_oh(oh, H5O_MTIME_ID)) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for MTIME message")
-           if(exists > 0) {
+            if (exists > 0) {
                 /* Get "old style" modification time info */
-                if(NULL == H5O_msg_read_oh(loc->file, oh, H5O_MTIME_ID, &oinfo->ctime))
+                if (NULL == H5O_msg_read_oh(loc->file, oh, H5O_MTIME_ID, &oinfo->ctime))
                     HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read MTIME message")
             } /* end if */
             else {
                 /* Check for "new style" modification time info */
-                if((exists = H5O_msg_exists_oh(oh, H5O_MTIME_NEW_ID)) < 0)
+                if ((exists = H5O_msg_exists_oh(oh, H5O_MTIME_NEW_ID)) < 0)
                     HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "unable to check for MTIME_NEW message")
-                if(exists > 0) {
+                if (exists > 0) {
                     /* Get "new style" modification time info */
-                    if(NULL == H5O_msg_read_oh(loc->file, oh, H5O_MTIME_NEW_ID, &oinfo->ctime))
+                    if (NULL == H5O_msg_read_oh(loc->file, oh, H5O_MTIME_NEW_ID, &oinfo->ctime))
                         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't read MTIME_NEW message")
                 } /* end if */
                 else
                     oinfo->ctime = 0;
             } /* end else */
-         } /* end else */
-    } /* end if */
-
-    /* Get the information for the object header, if requested */
-    if(fields & H5O_INFO_HDR)
-        if(H5O__get_hdr_info_real(oh, &oinfo->hdr) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object header info")
+        }     /* end else */
+    }         /* end if */
 
     /* Retrieve # of attributes */
-    if(fields & H5O_INFO_NUM_ATTRS)
-        if(H5O__attr_count_real(loc->file, oh, &oinfo->num_attrs) < 0)
+    if (fields & H5O_INFO_NUM_ATTRS)
+        if (H5O__attr_count_real(loc->file, oh, &oinfo->num_attrs) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve attribute count")
 
-    /* Get B-tree & heap metadata storage size, if requested */
-    if(fields & H5O_INFO_META_SIZE) {
-        /* Check for 'bh_info' callback for this type of object */
-        if(obj_class->bh_info)
-            /* Call the object's class 'bh_info' routine */
-            if((obj_class->bh_info)(loc, oh, &oinfo->meta_size.obj) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object's btree & heap info")
-
-        /* Get B-tree & heap info for any attributes */
-        if(!(fields & H5O_INFO_NUM_ATTRS) || oinfo->num_attrs > 0) {
-            if(H5O__attr_bh_info(loc->file, oh, &oinfo->meta_size.attr) < 0)
-                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve attribute btree & heap info")
-        } /* end if */
-    } /* end if */
-
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTUNPROTECT, FAIL, "unable to release object header")
 
     FUNC_LEAVE_NOAPI_TAG(ret_value)
 } /* end H5O_get_info() */
 
-
 /*-------------------------------------------------------------------------
- * Function:    H5O__get_info_by_idx
+ * Function:    H5O_get_native_info
  *
- * Purpose:     Internal routine to retrieve an object's info according to
- *              an index within a group.
- *
- *
- * Note:        Add a parameter "fields" to indicate selection of object info.
+ * Purpose:     Retrieve the native file-format information for an object
  *
- * Return:      Success:	Non-negative
- *              Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
  * Programmer:  Quincey Koziol
- *              December 28, 2017
+ *              November 21 2006
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__get_info_by_idx(const H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t n, H5O_info_t *oinfo, unsigned fields)
+H5O_get_native_info(const H5O_loc_t *loc, H5O_native_info_t *oinfo, unsigned fields)
 {
-    H5G_loc_t   obj_loc;                /* Location used to open group */
-    H5G_name_t  obj_path;            	/* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    herr_t ret_value = SUCCEED;		/* Return value */
+    const H5O_obj_class_t *obj_class;           /* Class of object for header */
+    H5O_t *                oh        = NULL;    /* Object header */
+    herr_t                 ret_value = SUCCEED; /* Return value */
 
-    FUNC_ENTER_PACKAGE
+    FUNC_ENTER_NOAPI_TAG(loc->addr, FAIL)
 
-    /* Check arguments */
+    /* Check args */
     HDassert(loc);
-    HDassert(group_name && *group_name);
     HDassert(oinfo);
 
-    /* Set up opened group location to fill in */
-    obj_loc.oloc = &obj_oloc;
-    obj_loc.path = &obj_path;
-    H5G_loc_reset(&obj_loc);
+    /* Get the object header */
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
-    /* Find the object's location, according to the order in the index */
-    if(H5G_loc_find_by_idx(loc, group_name, idx_type, order, n, &obj_loc/*out*/) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found")
-    loc_found = TRUE;
+    /* Get class for object */
+    if (NULL == (obj_class = H5O__obj_class_real(oh)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to determine object class")
+
+    /* Reset the object info structure */
+    HDmemset(oinfo, 0, sizeof(*oinfo));
+
+    /* Get the information for the object header, if requested */
+    if (fields & H5O_NATIVE_INFO_HDR)
+        if (H5O__get_hdr_info_real(oh, &oinfo->hdr) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object header info")
+
+    /* Get B-tree & heap metadata storage size, if requested */
+    if (fields & H5O_NATIVE_INFO_META_SIZE) {
+        /* Check for 'bh_info' callback for this type of object */
+        if (obj_class->bh_info)
+            /* Call the object's class 'bh_info' routine */
+            if ((obj_class->bh_info)(loc, oh, &oinfo->meta_size.obj) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object's btree & heap info")
 
-    /* Retrieve the object's information */
-    if(H5O_get_info(obj_loc.oloc, oinfo, fields) < 0)
-        HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve object info")
+        /* Get B-tree & heap info for any attributes */
+        if (H5O__attr_bh_info(loc->file, oh, &oinfo->meta_size.attr) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "can't retrieve attribute btree & heap info")
+    } /* end if */
 
 done:
-    /* Release the object location */
-    if(loc_found && H5G_loc_free(&obj_loc) < 0)
-        HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
+    if (oh && H5O_unprotect(loc, 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__get_info_by_idx() */
+    FUNC_LEAVE_NOAPI_TAG(ret_value)
+} /* end H5O_get_native_info() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_create_plist
+ * Function:    H5O_get_create_plist
  *
- * Purpose:	Retrieve the object creation properties for an object
+ * Purpose:    Retrieve the object creation properties for an object
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		November 28 2006
+ * Programmer:    Quincey Koziol
+ *        November 28 2006
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_get_create_plist(const H5O_loc_t *loc, H5P_genplist_t *oc_plist)
 {
-    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_NOAPI(FAIL)
 
@@ -2353,53 +2357,56 @@ H5O_get_create_plist(const H5O_loc_t *loc, H5P_genplist_t *oc_plist)
     HDassert(oc_plist);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set property values, if they were used for the object */
-    if(oh->version > H5O_VERSION_1) {
-        uint8_t ohdr_flags;             /* "User-visible" object header status flags */
+    if (oh->version > H5O_VERSION_1) {
+        uint8_t ohdr_flags; /* "User-visible" object header status flags */
 
         /* Set attribute storage values */
-        if(H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
-            HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set max. # of compact attributes in property list")
-        if(H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
+        if (H5P_set(oc_plist, H5O_CRT_ATTR_MAX_COMPACT_NAME, &oh->max_compact) < 0)
+            HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL,
+                        "can't set max. # of compact attributes in property list")
+        if (H5P_set(oc_plist, H5O_CRT_ATTR_MIN_DENSE_NAME, &oh->min_dense) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTSET, FAIL, "can't set min. # of dense attributes in property list")
 
         /* Mask off non-"user visible" flags */
-        ohdr_flags = oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED | H5O_HDR_STORE_TIMES);
+        H5_CHECKED_ASSIGN(ohdr_flags, uint8_t,
+                          oh->flags & (H5O_HDR_ATTR_CRT_ORDER_TRACKED | H5O_HDR_ATTR_CRT_ORDER_INDEXED |
+                                       H5O_HDR_STORE_TIMES),
+                          int);
 
         /* Set object header flags */
-        if(H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
+        if (H5P_set(oc_plist, H5O_CRT_OHDR_FLAGS_NAME, &ohdr_flags) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set object header flags")
     } /* end if */
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_get_create_plist() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_nlinks
+ * Function:    H5O_get_nlinks
  *
- * Purpose:	Retrieve the number of link messages read in from the file
+ * Purpose:    Retrieve the number of link messages read in from the file
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		March 11 2007
+ * Programmer:    Quincey Koziol
+ *        March 11 2007
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_get_nlinks(const H5O_loc_t *loc, hsize_t *nlinks)
 {
-    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_NOAPI(FAIL)
 
@@ -2408,38 +2415,37 @@ H5O_get_nlinks(const H5O_loc_t *loc, hsize_t *nlinks)
     HDassert(nlinks);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Retrieve the # of link messages seen when the object header was loaded */
     *nlinks = oh->link_msgs_seen;
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_get_nlinks() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_obj_create
+ * Function:    H5O_obj_create
  *
- * Purpose:	Creates an object, in an abstract manner.
+ * Purpose:    Creates an object, in an abstract manner.
  *
- * Return:	Success:	Pointer to object opened
- *		Failure:	NULL
+ * Return:    Success:    Pointer to object opened
+ *        Failure:    NULL
  *
- * Programmer:	Quincey Koziol
- *		April 9 2007
+ * Programmer:    Quincey Koziol
+ *        April 9 2007
  *
  *-------------------------------------------------------------------------
  */
 void *
 H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc)
 {
-    size_t u;                           /* Local index variable */
-    void *ret_value = NULL;             /* Return value */
+    size_t u;                /* Local index variable */
+    void * ret_value = NULL; /* Return value */
 
     FUNC_ENTER_NOAPI(NULL)
 
@@ -2450,39 +2456,38 @@ H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc
     HDassert(obj_loc);
 
     /* Iterate through the object classes */
-    for(u = 0; u < NELMTS(H5O_obj_class_g); u++) {
+    for (u = 0; u < NELMTS(H5O_obj_class_g); u++) {
         /* Check for correct type of object to create */
-	if(H5O_obj_class_g[u]->type == obj_type) {
+        if (H5O_obj_class_g[u]->type == obj_type) {
             /* Call the object class's 'create' routine */
             HDassert(H5O_obj_class_g[u]->create);
-            if(NULL == (ret_value = H5O_obj_class_g[u]->create(f, crt_info, obj_loc)))
+            if (NULL == (ret_value = H5O_obj_class_g[u]->create(f, crt_info, obj_loc)))
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, NULL, "unable to open object")
 
             /* Break out of loop */
             break;
         } /* end if */
-    } /* end for */
+    }     /* end for */
     HDassert(ret_value);
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O_obj_create() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_oh_addr
+ * Function:    H5O_get_oh_addr
  *
- * Purpose:	Retrieve the address of the object header
+ * Purpose:    Retrieve the address of the object header
  *
- * Note:	This routine participates in the "Inlining C struct access"
- *		pattern, don't call it directly, use the appropriate macro
- *		defined in H5Oprivate.h.
+ * Note:    This routine participates in the "Inlining C struct access"
+ *        pattern, don't call it directly, use the appropriate macro
+ *        defined in H5Oprivate.h.
  *
- * Return:	Success:	Valid haddr_t
- *		Failure:	HADDR_UNDEF
+ * Return:    Success:    Valid haddr_t
+ *        Failure:    HADDR_UNDEF
  *
- * Programmer:	Quincey Koziol
- *		March 15 2007
+ * Programmer:    Quincey Koziol
+ *        March 15 2007
  *
  *-------------------------------------------------------------------------
  */
@@ -2498,12 +2503,11 @@ H5O_get_oh_addr(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->chunk[0].addr)
 } /* end H5O_get_oh_addr() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_oh_flags
+ * Function:    H5O_get_oh_flags
  *
- * Programmer:	Jacob Smith
- *		2018 August 17
+ * Programmer:  Jacob Smith
+ *              2018 August 17
  *
  *-------------------------------------------------------------------------
  */
@@ -2515,16 +2519,15 @@ H5O_get_oh_flags(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->flags); /* flags can be 0 */
 } /* H5O_get_oh_flags() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_oh_mtime
+ * Function:    H5O_get_oh_mtime
  *
- * Purpose:	Retrieve an object's modification time. Assumes that the
+ * Purpose:     Retrieve an object's modification time. Assumes that the
  *              caller has verified that accessing this variable is appropriate
  *              to the header in question.
  *
- * Programmer:	Jacob Smith
- *		2018 August 17
+ * Programmer:  Jacob Smith
+ *              2018 August 17
  *
  *-------------------------------------------------------------------------
  */
@@ -2537,12 +2540,11 @@ H5O_get_oh_mtime(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->mtime);
 } /* H5O_get_oh_mtime() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_oh_version
+ * Function:    H5O_get_oh_version
  *
- * Programmer:	Jacob Smith
- *		2018 August 17
+ * Programmer:  Jacob Smith
+ *              2018 August 17
  *
  *-------------------------------------------------------------------------
  */
@@ -2555,25 +2557,24 @@ H5O_get_oh_version(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->version);
 } /* H5O_get_oh_version() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_rc_and_type
+ * Function:    H5O_get_rc_and_type
  *
- * Purpose:	Retrieve an object's reference count and type
+ * Purpose:    Retrieve an object's reference count and type
  *
- * Return:	Success:	Non-negative
- *		Failure:	Negative
+ * Return:    Success:    Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *		November  4 2007
+ * Programmer:    Quincey Koziol
+ *        November  4 2007
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O_get_rc_and_type(const H5O_loc_t *loc, unsigned *rc, H5O_type_t *otype)
 {
-    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_NOAPI(FAIL)
 
@@ -2581,26 +2582,25 @@ H5O_get_rc_and_type(const H5O_loc_t *loc, unsigned *rc, H5O_type_t *otype)
     HDassert(loc);
 
     /* Get the object header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to load object header")
 
     /* Set the object's reference count */
-    if(rc)
+    if (rc)
         *rc = oh->nlink;
 
     /* Retrieve the type of the object */
-    if(otype)
-        if(H5O__obj_type_real(oh, otype) < 0)
+    if (otype)
+        if (H5O__obj_type_real(oh, otype) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to determine object type")
 
 done:
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_get_rc_and_type() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__free_visit_visited
  *
@@ -2609,46 +2609,44 @@ done:
  * Return:      Non-negative on success, negative on failure
  *
  * Programmer:  Quincey Koziol
- *	        Nov 25, 2007
+ *            Nov 25, 2007
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data/*in,out*/)
+H5O__free_visit_visited(void *item, void H5_ATTR_UNUSED *key, void H5_ATTR_UNUSED *operator_data /*in,out*/)
 {
-    FUNC_ENTER_STATIC_NOERR
+    FUNC_ENTER_PACKAGE_NOERR
 
     item = H5FL_FREE(H5_obj_t, item);
 
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5O__free_visit_visited() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__visit_cb
+ * Function:    H5O__visit_cb
  *
  * Purpose:     Callback function for recursively visiting objects from a group
  *
- * Return:	Success:        Non-negative
- *		Failure:	Negative
+ * Return:    Success:        Non-negative
+ *        Failure:    Negative
  *
- * Programmer:	Quincey Koziol
- *	        Nov 25, 2007
+ * Programmer:    Quincey Koziol
+ *            Nov 25, 2007
  *
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5O__visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *linfo,
-    void *_udata)
+H5O__visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info2_t *linfo, void *_udata)
 {
-    H5O_iter_visit_ud_t *udata = (H5O_iter_visit_ud_t *)_udata;     /* User data for callback */
-    H5G_loc_t   obj_loc;                /* Location of object */
-    H5G_name_t  obj_path;            	/* Object's group hier. path */
-    H5O_loc_t   obj_oloc;            	/* Object's object location */
-    hbool_t     obj_found = FALSE;      /* Object at 'name' found */
-    herr_t ret_value = H5_ITER_CONT;    /* Return value */
+    H5O_iter_visit_ud_t *udata = (H5O_iter_visit_ud_t *)_udata; /* User data for callback */
+    H5G_loc_t            obj_loc;                               /* Location of object */
+    H5G_name_t           obj_path;                              /* Object's group hier. path */
+    H5O_loc_t            obj_oloc;                              /* Object's object location */
+    hbool_t              obj_found = FALSE;                     /* Object at 'name' found */
+    herr_t               ret_value = H5_ITER_CONT;              /* Return value */
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_PACKAGE
 
     /* Sanity check */
     HDassert(name);
@@ -2656,8 +2654,8 @@ H5O__visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *li
     HDassert(udata);
 
     /* Check if this is a hard link */
-    if(linfo->type == H5L_TYPE_HARD) {
-        H5_obj_t obj_pos;       /* Object "position" for this object */
+    if (linfo->type == H5L_TYPE_HARD) {
+        H5_obj_t obj_pos; /* Object "position" for this object */
 
         /* Set up opened group location to fill in */
         obj_loc.oloc = &obj_oloc;
@@ -2666,7 +2664,7 @@ H5O__visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *li
 
         /* Find the object using the LAPL passed in */
         /* (Correctly handles mounted files) */
-        if(H5G_loc_find(udata->start_loc, name, &obj_loc/*out*/) < 0)
+        if (H5G_loc_find(udata->start_loc, name, &obj_loc /*out*/) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
         obj_found = TRUE;
 
@@ -2675,47 +2673,47 @@ H5O__visit_cb(hid_t H5_ATTR_UNUSED group, const char *name, const H5L_info_t *li
         obj_pos.addr = obj_oloc.addr;
 
         /* Check if we've seen the object the link references before */
-        if(NULL == H5SL_search(udata->visited, &obj_pos)) {
-            H5O_info_t oinfo;           /* Object info */
+        if (NULL == H5SL_search(udata->visited, &obj_pos)) {
+            H5O_info2_t oinfo; /* Object info */
 
             /* Get the object's info */
-            if(H5O_get_info(&obj_oloc, &oinfo, udata->fields) < 0)
+            if (H5O_get_info(&obj_oloc, &oinfo, udata->fields) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
 
             /* Make the application callback */
             ret_value = (udata->op)(udata->obj_id, name, &oinfo, udata->op_data);
 
             /* Check for continuing to visit objects */
-            if(ret_value == H5_ITER_CONT) {
+            if (ret_value == H5_ITER_CONT) {
                 /* If its ref count is > 1, we add it to the list of visited objects */
                 /* (because it could come up again during traversal) */
-                if(oinfo.rc > 1) {
-                    H5_obj_t *new_node;                  /* New object node for visited list */
+                if (oinfo.rc > 1) {
+                    H5_obj_t *new_node; /* New object node for visited list */
 
                     /* Allocate new object "position" node */
-                    if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+                    if ((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
                         HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
 
                     /* Set node information */
                     *new_node = obj_pos;
 
                     /* Add to list of visited objects */
-                    if(H5SL_insert(udata->visited, new_node, new_node) < 0)
-                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+                    if (H5SL_insert(udata->visited, new_node, new_node) < 0)
+                        HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR,
+                                    "can't insert object node into visited list")
                 } /* end if */
-            } /* end if */
-        } /* end if */
-    } /* end if */
+            }     /* end if */
+        }         /* end if */
+    }             /* end if */
 
 done:
     /* Release resources */
-    if(obj_found && H5G_loc_free(&obj_loc) < 0)
+    if (obj_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__visit_cb() */
 
-
 /*-------------------------------------------------------------------------
  * Function:    H5O__visit
  *
@@ -2745,25 +2743,25 @@ done:
  *                          library, or the negative value returned by one
  *                          of the operators.
  *
- * Programmer:	Quincey Koziol
+ * Programmer:    Quincey Koziol
  *              November 24 2007
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__visit(H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, H5O_iterate_t op, void *op_data, unsigned fields)
+H5O__visit(H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+           H5O_iterate2_t op, void *op_data, unsigned fields)
 {
-    H5O_iter_visit_ud_t udata;  /* User data for callback */
-    H5G_loc_t   obj_loc;        /* Location used to open object */
-    H5G_name_t  obj_path;       /* Opened object group hier. path */
-    H5O_loc_t   obj_oloc;       /* Opened object object location */
-    hbool_t     loc_found = FALSE;      /* Entry at 'name' found */
-    H5O_info_t  oinfo;          /* Object info struct */
-    void       *obj = NULL;     /* Object */
-    H5I_type_t  opened_type;    /* ID type of object */
-    hid_t       obj_id = H5I_INVALID_HID;  /* ID of object */
-    herr_t      ret_value = FAIL;       /* Return value */
+    H5O_iter_visit_ud_t udata;                       /* User data for callback */
+    H5G_loc_t           obj_loc;                     /* Location used to open object */
+    H5G_name_t          obj_path;                    /* Opened object group hier. path */
+    H5O_loc_t           obj_oloc;                    /* Opened object object location */
+    hbool_t             loc_found = FALSE;           /* Entry at 'name' found */
+    H5O_info2_t         oinfo;                       /* Object info struct */
+    void *              obj = NULL;                  /* Object */
+    H5I_type_t          opened_type;                 /* ID type of object */
+    hid_t               obj_id    = H5I_INVALID_HID; /* ID of object */
+    herr_t              ret_value = FAIL;            /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2779,111 +2777,113 @@ H5O__visit(H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
     H5G_loc_reset(&obj_loc);
 
     /* Find the object's location */
-    if(H5G_loc_find(loc, obj_name, &obj_loc/*out*/) < 0)
+    if (H5G_loc_find(loc, obj_name, &obj_loc /*out*/) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_NOTFOUND, FAIL, "object not found")
     loc_found = TRUE;
 
     /* Get the object's info */
-    if(H5O_get_info(&obj_oloc, &oinfo, fields) < 0)
+    if (H5O_get_info(&obj_oloc, &oinfo, fields) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTGET, FAIL, "unable to get object info")
 
     /* Open the object */
     /* (Takes ownership of the obj_loc information) */
-    if(NULL == (obj = H5O_open_by_loc(&obj_loc, &opened_type)))
+    if (NULL == (obj = H5O_open_by_loc(&obj_loc, &opened_type)))
         HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object")
 
     /* Get an ID for the visited object */
-    if((obj_id = H5VL_wrap_register(opened_type, obj, TRUE)) < 0)
-        HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register visited object")
+    if ((obj_id = H5VL_wrap_register(opened_type, obj, TRUE)) < 0)
+        HGOTO_ERROR(H5E_ID, H5E_CANTREGISTER, FAIL, "unable to register visited object")
 
     /* Make callback for starting object */
-    if((ret_value = op(obj_id, ".", &oinfo, op_data)) < 0)
+    if ((ret_value = op(obj_id, ".", &oinfo, op_data)) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "can't visit objects")
 
     /* Check return value of first callback */
-    if(ret_value != H5_ITER_CONT)
+    if (ret_value != H5_ITER_CONT)
         HGOTO_DONE(ret_value);
 
     /* Check for object being a group */
-    if(oinfo.type == H5O_TYPE_GROUP) {
-        H5G_loc_t	start_loc;          /* Location of starting group */
-        H5G_loc_t	vis_loc;            /* Location of visited group */
+    if (oinfo.type == H5O_TYPE_GROUP) {
+        H5G_loc_t start_loc; /* Location of starting group */
+        H5G_loc_t vis_loc;   /* Location of visited group */
 
         /* Get the location of the starting group */
-        if(H5G_loc(obj_id, &start_loc) < 0)
+        if (H5G_loc(obj_id, &start_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Set up user data for visiting links */
-        udata.obj_id = obj_id;
+        udata.obj_id    = obj_id;
         udata.start_loc = &start_loc;
-        udata.op = op;
-        udata.op_data = op_data;
-        udata.fields = fields;
+        udata.op        = op;
+        udata.op_data   = op_data;
+        udata.fields    = fields;
 
         /* Create skip list to store visited object information */
-        if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
+        if ((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
 
         /* If its ref count is > 1, we add it to the list of visited objects */
         /* (because it could come up again during traversal) */
-        if(oinfo.rc > 1) {
-            H5_obj_t *obj_pos;                  /* New object node for visited list */
+        if (oinfo.rc > 1) {
+            H5_obj_t *obj_pos; /* New object node for visited list */
 
             /* Allocate new object "position" node */
-            if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+            if ((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
                 HGOTO_ERROR(H5E_OHDR, H5E_NOSPACE, FAIL, "can't allocate object node")
 
             /* Construct unique "position" for this object */
             obj_pos->fileno = oinfo.fileno;
-            obj_pos->addr = oinfo.addr;
+
+            /* De-serialize object token into an object address */
+            if (H5VL_native_token_to_addr(loc->oloc->file, H5I_FILE, oinfo.token, &(obj_pos->addr)) < 0)
+                HGOTO_ERROR(H5E_OHDR, H5E_CANTUNSERIALIZE, FAIL,
+                            "can't deserialize object token into address")
 
             /* Add to list of visited objects */
-            if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+            if (H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
                 HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
         }
 
         /* Get the location of the visited group */
-        if(H5G_loc(obj_id, &vis_loc) < 0)
+        if (H5G_loc(obj_id, &vis_loc) < 0)
             HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
 
         /* Call internal group visitation routine */
-        if((ret_value = H5G_visit(&vis_loc, ".", idx_type, order, H5O__visit_cb, &udata)) < 0)
+        if ((ret_value = H5G_visit(&vis_loc, ".", idx_type, order, H5O__visit_cb, &udata)) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_BADITER, FAIL, "object visitation failed")
     } /* end if */
 
 done:
-/* XXX (VOL MERGE): Probably also want to consider closing obj here on failures */
-    if(obj_id != H5I_INVALID_HID) {
-        if(H5I_dec_app_ref(obj_id) < 0)
+    /* XXX (VOL MERGE): Probably also want to consider closing obj here on failures */
+    if (obj_id != H5I_INVALID_HID) {
+        if (H5I_dec_app_ref(obj_id) < 0)
             HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "unable to close object")
     }
-    else if(loc_found && H5G_loc_free(&obj_loc) < 0)
+    else if (loc_found && H5G_loc_free(&obj_loc) < 0)
         HDONE_ERROR(H5E_OHDR, H5E_CANTRELEASE, FAIL, "can't free location")
 
-    if(udata.visited)
+    if (udata.visited)
         H5SL_destroy(udata.visited, H5O__free_visit_visited, NULL);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__visit() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__inc_rc
+ * Function:    H5O__inc_rc
  *
- * Purpose:	Increments the reference count on an object header
+ * Purpose:    Increments the reference count on an object header
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Jul 13 2008
+ * Programmer:    Quincey Koziol
+ *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O__inc_rc(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -2891,8 +2891,8 @@ H5O__inc_rc(H5O_t *oh)
     HDassert(oh);
 
     /* Pin the object header when the reference count goes above 0 */
-    if(oh->rc == 0)
-        if(H5AC_pin_protected_entry(oh) < 0)
+    if (oh->rc == 0)
+        if (H5AC_pin_protected_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTPIN, FAIL, "unable to pin object header")
 
     /* Increment reference count */
@@ -2902,43 +2902,41 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__inc_rc() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__dec_rc
+ * Function:    H5O__dec_rc
  *
- * Purpose:	Decrements the reference count on an object header
+ * Purpose:    Decrements the reference count on an object header
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@hdfgroup.org
- *		Jul 13 2008
+ * Programmer:    Quincey Koziol
+ *        Jul 13 2008
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5O__dec_rc(H5O_t *oh)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
     /* check args */
-    HDassert(oh);
+    if (!oh)
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid object header")
 
     /* Decrement reference count */
     oh->rc--;
 
     /* Unpin the object header when the reference count goes back to 0 */
-    if(oh->rc == 0)
-        if(H5AC_unpin_entry(oh) < 0)
+    if (oh->rc == 0)
+        if (H5AC_unpin_entry(oh) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTUNPIN, FAIL, "unable to unpin object header")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__dec_rc() */
 
-
 /*-------------------------------------------------------------------------
  * Function:   H5O_dec_rc_by_loc
  *
@@ -2948,7 +2946,6 @@ done:
  * Return:     Non-negative on success/Negative on failure
  *
  * Programmer: Quincey Koziol
- *             koziol@hdfgroup.org
  *             Oct 08 2010
  *
  *-------------------------------------------------------------------------
@@ -2956,8 +2953,8 @@ done:
 herr_t
 H5O_dec_rc_by_loc(const H5O_loc_t *loc)
 {
-    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_NOAPI(FAIL)
 
@@ -2965,32 +2962,31 @@ H5O_dec_rc_by_loc(const H5O_loc_t *loc)
     HDassert(loc);
 
     /* Get header */
-    if(NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
-       HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
+    if (NULL == (oh = H5O_protect(loc, H5AC__READ_ONLY_FLAG, FALSE)))
+        HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, FAIL, "unable to protect object header")
 
     /* Decrement the reference count on the object header */
     /* (which will unpin it, if appropriate) */
-    if(H5O__dec_rc(oh) < 0)
+    if (H5O__dec_rc(oh) < 0)
         HGOTO_ERROR(H5E_OHDR, H5E_CANTDEC, FAIL, "unable to decrement reference count on object header")
 
 done:
     /* Release the object header from the cache */
-    if(oh && H5O_unprotect(loc, oh, H5AC__NO_FLAGS_SET) < 0)
+    if (oh && H5O_unprotect(loc, 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_dec_rc_by_loc() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O_get_proxy
+ * Function:    H5O_get_proxy
  *
- * Purpose:	Retrieve the proxy for the object header.
+ * Purpose:    Retrieve the proxy for the object header.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		July 24 2016
+ * Programmer:    Quincey Koziol
+ *        July 24 2016
  *
  *-------------------------------------------------------------------------
  */
@@ -3005,25 +3001,23 @@ H5O_get_proxy(const H5O_t *oh)
     FUNC_LEAVE_NOAPI(oh->proxy)
 } /* end H5O_get_proxy() */
 
-
 /*-------------------------------------------------------------------------
- * Function:	H5O__free
+ * Function:    H5O__free
  *
- * Purpose:	Destroys an object header.
+ * Purpose:    Destroys an object header.
  *
- * Return:	Non-negative on success/Negative on failure
+ * Return:    Non-negative on success/Negative on failure
  *
- * Programmer:	Quincey Koziol
- *		koziol@ncsa.uiuc.edu
- *		Jan 15 2003
+ * Programmer:    Quincey Koziol
+ *        Jan 15 2003
  *
  *-------------------------------------------------------------------------
  */
 herr_t
-H5O__free(H5O_t *oh)
+H5O__free(H5O_t *oh, hbool_t force)
 {
-    unsigned	u;                      /* Local index variable */
-    herr_t      ret_value = SUCCEED;    /* Return value */
+    unsigned u;                   /* Local index variable */
+    herr_t   ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_PACKAGE
 
@@ -3032,22 +3026,24 @@ H5O__free(H5O_t *oh)
     HDassert(0 == oh->rc);
 
     /* Destroy chunks */
-    if(oh->chunk) {
-        for(u = 0; u < oh->nchunks; u++)
+    if (oh->chunk) {
+        for (u = 0; u < oh->nchunks; u++)
             oh->chunk[u].image = H5FL_BLK_FREE(chunk_image, oh->chunk[u].image);
 
         oh->chunk = (H5O_chunk_t *)H5FL_SEQ_FREE(H5O_chunk_t, oh->chunk);
     } /* end if */
 
     /* Destroy messages */
-    if(oh->mesg) {
-        for(u = 0; u < oh->nmesgs; u++) {
+    if (oh->mesg) {
+        for (u = 0; u < oh->nmesgs; u++) {
 #ifndef NDEBUG
             /* Verify that message is clean, unless it could have been marked
-             * dirty by decoding */
-            if(oh->ndecode_dirtied && oh->mesg[u].dirty)
+             * dirty by decoding, or if this is a forced free (in case of
+             * failure during creation of the object some messages may be dirty)
+             */
+            if (oh->ndecode_dirtied && oh->mesg[u].dirty)
                 oh->ndecode_dirtied--;
-            else
+            else if (!force)
                 HDassert(oh->mesg[u].dirty == 0);
 #endif /* NDEBUG */
 
@@ -3061,8 +3057,8 @@ H5O__free(H5O_t *oh)
     } /* end if */
 
     /* Destroy the proxy */
-    if(oh->proxy)
-        if(H5AC_proxy_entry_dest(oh->proxy) < 0)
+    if (oh->proxy)
+        if (H5AC_proxy_entry_dest(oh->proxy) < 0)
             HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to destroy virtual entry used for proxy")
 
     /* destroy object header */
@@ -3072,3 +3068,24 @@ done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5O__free() */
 
+/*-------------------------------------------------------------------------
+ * Function:    H5O__reset_info2
+ *
+ * Purpose:     Resets/initializes an H5O_info2_t struct.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5O__reset_info2(H5O_info2_t *oinfo)
+{
+    FUNC_ENTER_PACKAGE_NOERR;
+
+    /* Reset the passed-in info struct */
+    HDmemset(oinfo, 0, sizeof(H5O_info2_t));
+    oinfo->type  = H5O_TYPE_UNKNOWN;
+    oinfo->token = H5O_TOKEN_UNDEF;
+
+    FUNC_LEAVE_NOAPI(SUCCEED);
+} /* end H5O__reset_info2() */