Reformat source (#244)

27 files changed, 770 insertions, 813 deletions

diff --git a/examples/h5_attribute.c b/examples/h5_attribute.c
index e127e40..9de573e 100644
--- a/examples/h5_attribute.c
+++ b/examples/h5_attribute.c
@@ -184,7 +184,7 @@ main(void)
     printf("The value of the attribute \"Integer attribute\" is %d \n", point_out);
     ret = H5Aclose(attr);
 
-//! [H5Oget_info3_snip]
+    //! [H5Oget_info3_snip]
 
     /*
      * Find string attribute by iterating through all attributes
@@ -205,7 +205,7 @@ main(void)
         ret = H5Tclose(atype);
     }
 
-//! [H5Oget_info3_snip]
+    //! [H5Oget_info3_snip]
     /*
      * Get attribute info using iteration function.
      */
diff --git a/examples/h5_extlink.c b/examples/h5_extlink.c
index bdd8b2f..ebc542c 100644
--- a/examples/h5_extlink.c
+++ b/examples/h5_extlink.c
@@ -414,14 +414,14 @@ UD_hard_create(const char *link_name, hid_t loc_group, const void *udata, size_t
 
     token = *((H5O_token_t *)udata);
 
-//! [H5Open_by_token_snip]
+    //! [H5Open_by_token_snip]
 
     /* Open the object this link points to so that we can increment
      * its reference count. This also ensures that the token passed
      * in points to a real object (although this check is not perfect!) */
     target_obj = H5Oopen_by_token(loc_group, token);
 
-//! [H5Open_by_token_snip]
+    //! [H5Open_by_token_snip]
 
     if (target_obj < 0) {
         ret_value = -1;
diff --git a/src/H5A.c b/src/H5A.c
index 0a71a33..f6cc814 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -277,7 +277,7 @@ H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, attr_name, type_id, space_id, acpl_id, aapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on attribute ID")
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -426,7 +426,7 @@ H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE12(FUNC, "*s*sIui*s*siiiiii", app_file, app_func, app_line, loc_id, obj_name, attr_name, type_id, space_id, acpl_id, aapl_id, lapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on attribute ID")
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -589,7 +589,7 @@ H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, attr_name, aapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on attribute ID")
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -720,7 +720,7 @@ H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_l
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIui*s*siii", app_file, app_func, app_line, loc_id, obj_name, attr_name, aapl_id, lapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on attribute ID")
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -860,7 +860,7 @@ H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE11(FUNC, "*s*sIui*sIiIohiii", app_file, app_func, app_line, loc_id, obj_name, idx_type, order, n, aapl_id, lapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_ATTR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on attribute ID")
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -972,7 +972,7 @@ H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIuii*xi", app_file, app_func, app_line, attr_id, dtype_id, buf, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1080,7 +1080,7 @@ H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIuii*xi", app_file, app_func, app_line, attr_id, dtype_id, buf, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1658,7 +1658,7 @@ H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*s*si", app_file, app_func, app_line, loc_id, old_name, new_name, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1778,7 +1778,7 @@ H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIui*s*s*sii", app_file, app_func, app_line, loc_id, obj_name, old_attr_name, new_attr_name, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -2211,7 +2211,7 @@ H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, attr_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -2362,7 +2362,7 @@ H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*s*bi", app_file, app_func, app_line, obj_id, attr_name, attr_exists, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -2481,7 +2481,7 @@ H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIui*s*s*bii", app_file, app_func, app_line, loc_id, obj_name, attr_name, attr_exists, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_ATTR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 993961f..6ec7b40 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -67,7 +67,7 @@ extern "C" {
  *
  * \see H5Acreate(), H5Aopen()
  */
-H5_DLL herr_t  H5Aclose(hid_t attr_id);
+H5_DLL herr_t H5Aclose(hid_t attr_id);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -115,8 +115,8 @@ H5_DLL herr_t  H5Aclose(hid_t attr_id);
  * \see H5Aclose()
  *
  */
-H5_DLL hid_t   H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
-                          hid_t aapl_id);
+H5_DLL hid_t H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
+                        hid_t aapl_id);
 H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
                              const char *attr_name, hid_t type_id, hid_t space_id, hid_t acpl_id,
                              hid_t aapl_id, hid_t es_id);
@@ -167,8 +167,8 @@ H5_DLL hid_t H5Acreate_async(const char *app_file, const char *app_func, unsigne
  * \since 1.8.0
  *
  */
-H5_DLL hid_t   H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
-                                 hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
+H5_DLL hid_t H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
+                               hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -190,7 +190,7 @@ H5_DLL hid_t   H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char
  * \since 1.0.0
  *
  */
-H5_DLL herr_t  H5Adelete(hid_t loc_id, const char *attr_name);
+H5_DLL herr_t H5Adelete(hid_t loc_id, const char *attr_name);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -240,8 +240,8 @@ H5_DLL herr_t  H5Adelete(hid_t loc_id, const char *attr_name);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Adelete_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t lapl_id);
+H5_DLL herr_t H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                               hsize_t n, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -270,8 +270,7 @@ H5_DLL herr_t  H5Adelete_by_idx(hid_t loc_id, const char *obj_name,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Adelete_by_name(hid_t loc_id, const char *obj_name,
-    const char *attr_name, hid_t lapl_id);
+H5_DLL herr_t H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -323,8 +322,7 @@ H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name);
  * \since 1.8.0
  *
  */
-H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name,
-    const char *attr_name, hid_t lapl_id);
+H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name, const char *attr_name, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -345,7 +343,7 @@ H5_DLL htri_t H5Aexists_by_name(hid_t obj_id, const char *obj_name,
  * \since 1.8.0
  *
  */
-H5_DLL hid_t   H5Aget_create_plist(hid_t attr_id);
+H5_DLL hid_t H5Aget_create_plist(hid_t attr_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -387,7 +385,7 @@ H5_DLL hid_t   H5Aget_create_plist(hid_t attr_id);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/);
+H5_DLL herr_t H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -429,9 +427,8 @@ H5_DLL herr_t  H5Aget_info(hid_t attr_id, H5A_info_t *ainfo /*out*/);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Aget_info_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    H5A_info_t *ainfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t n, H5A_info_t *ainfo /*out*/, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -465,8 +462,8 @@ H5_DLL herr_t  H5Aget_info_by_idx(hid_t loc_id, const char *obj_name,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Aget_info_by_name(hid_t loc_id, const char *obj_name,
-    const char *attr_name, H5A_info_t *ainfo /*out*/, hid_t lapl_id);
+H5_DLL herr_t H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
+                                  H5A_info_t *ainfo /*out*/, hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -541,9 +538,9 @@ H5_DLL ssize_t H5Aget_name(hid_t attr_id, size_t buf_size, char *buf);
  * \since 1.8.0
  *
  */
-H5_DLL ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name,
-    H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
-    char *name /*out*/, size_t size, hid_t lapl_id);
+H5_DLL ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t n, char *name /*out*/, size_t size,
+                                  hid_t lapl_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -562,7 +559,7 @@ H5_DLL ssize_t H5Aget_name_by_idx(hid_t loc_id, const char *obj_name,
  * \since 1.0.0
  *
  */
-H5_DLL hid_t   H5Aget_space(hid_t attr_id);
+H5_DLL hid_t H5Aget_space(hid_t attr_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -603,7 +600,7 @@ H5_DLL hsize_t H5Aget_storage_size(hid_t attr_id);
  * \since 1.0.0
  *
  */
-H5_DLL hid_t   H5Aget_type(hid_t attr_id);
+H5_DLL hid_t H5Aget_type(hid_t attr_id);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -663,7 +660,7 @@ H5_DLL hid_t   H5Aget_type(hid_t attr_id);
  *          in the next step of the iteration.
  *
  *          The #H5A_operator2_t prototype for the \p op parameter is a
- *          user defined function where: 
+ *          user defined function where:
  *          The operation receives the location identifier for the group or
  *          dataset being iterated over, \p location_id; the name of the
  *          current object attribute, \p attr_name; the attribute’s info
@@ -690,8 +687,8 @@ H5_DLL hid_t   H5Aget_type(hid_t attr_id);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Aiterate2(hid_t loc_id, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data);
+H5_DLL herr_t H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order, hsize_t *idx,
+                          H5A_operator2_t op, void *op_data);
 /*--------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -784,13 +781,13 @@ H5_DLL herr_t  H5Aiterate2(hid_t loc_id, H5_index_t idx_type,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-    H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data,
-    hid_t lapl_id);
-H5_DLL hid_t H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
-                                     hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
-                                     hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id,
-                                     hid_t es_id);
+H5_DLL herr_t H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                 H5_iter_order_t order, hsize_t *idx, H5A_operator2_t op, void *op_data,
+                                 hid_t lapl_id);
+H5_DLL hid_t  H5Acreate_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
+                                      hid_t loc_id, const char *obj_name, const char *attr_name, hid_t type_id,
+                                      hid_t space_id, hid_t acpl_id, hid_t aapl_id, hid_t lapl_id,
+                                      hid_t es_id);
 /*--------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -821,7 +818,7 @@ H5_DLL hid_t H5Acreate_by_name_async(const char *app_file, const char *app_func,
  *
  * \see H5Aclose(), H5Acreate()
  */
-H5_DLL hid_t   H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
+H5_DLL hid_t H5Aopen(hid_t obj_id, const char *attr_name, hid_t aapl_id);
 H5_DLL hid_t H5Aopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id,
                            const char *attr_name, hid_t aapl_id, hid_t es_id);
 /*--------------------------------------------------------------------------*/
@@ -869,8 +866,8 @@ H5_DLL hid_t H5Aopen_async(const char *app_file, const char *app_func, unsigned
  * \since 1.8.0
  *
  */
-H5_DLL hid_t   H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
-                              hsize_t n, hid_t aapl_id, hid_t lapl_id);
+H5_DLL hid_t H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, H5_iter_order_t order,
+                            hsize_t n, hid_t aapl_id, hid_t lapl_id);
 H5_DLL hid_t H5Aopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
                                   const char *obj_name, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
                                   hid_t aapl_id, hid_t lapl_id, hid_t es_id);
@@ -915,8 +912,8 @@ H5_DLL hid_t H5Aopen_by_idx_async(const char *app_file, const char *app_func, un
  * \since 1.8.0
  *
  */
-H5_DLL hid_t   H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
-                               hid_t lapl_id);
+H5_DLL hid_t H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
+                             hid_t lapl_id);
 H5_DLL hid_t H5Aopen_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
                                    hid_t loc_id, const char *obj_name, const char *attr_name, hid_t aapl_id,
                                    hid_t lapl_id, hid_t es_id);
@@ -946,8 +943,8 @@ H5_DLL hid_t H5Aopen_by_name_async(const char *app_file, const char *app_func, u
  *
  * \see H5Awrite()
  *
-*/
-H5_DLL herr_t  H5Aread(hid_t attr_id, hid_t type_id, void *buf);
+ */
+H5_DLL herr_t H5Aread(hid_t attr_id, hid_t type_id, void *buf);
 /*-------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -969,7 +966,7 @@ H5_DLL herr_t  H5Aread(hid_t attr_id, hid_t type_id, void *buf);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t  H5Arename(hid_t loc_id, const char *old_name, const char *new_name);
+H5_DLL herr_t H5Arename(hid_t loc_id, const char *old_name, const char *new_name);
 H5_DLL herr_t H5Aread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id,
                             hid_t dtype_id, void *buf, hid_t es_id);
 /*--------------------------------------------------------------------------*/
@@ -1003,14 +1000,14 @@ H5_DLL herr_t H5Aread_async(const char *app_file, const char *app_func, unsigned
  * \see H5Aread()
  *
  */
-H5_DLL herr_t  H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
-H5_DLL herr_t  H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id,
-                              hid_t type_id, const void *buf, hid_t es_id);
-H5_DLL herr_t  H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
-                               const char *old_name, const char *new_name, hid_t es_id);
-H5_DLL herr_t  H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
-                                       hid_t loc_id, const char *obj_name, const char *old_attr_name,
-                                       const char *new_attr_name, hid_t lapl_id, hid_t es_id);
+H5_DLL herr_t H5Awrite(hid_t attr_id, hid_t type_id, const void *buf);
+H5_DLL herr_t H5Awrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id,
+                             hid_t type_id, const void *buf, hid_t es_id);
+H5_DLL herr_t H5Arename_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
+                              const char *old_name, const char *new_name, hid_t es_id);
+H5_DLL herr_t H5Arename_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
+                                      hid_t loc_id, const char *obj_name, const char *old_attr_name,
+                                      const char *new_attr_name, hid_t lapl_id, hid_t es_id);
 H5_DLL herr_t H5Aexists_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id,
                               const char *attr_name, hbool_t *exists, hid_t es_id);
 H5_DLL herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
@@ -1039,8 +1036,8 @@ H5_DLL herr_t H5Aexists_by_name_async(const char *app_file, const char *app_func
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Arename_by_name(hid_t loc_id, const char *obj_name,
-    const char *old_attr_name, const char *new_attr_name, hid_t lapl_id);
+H5_DLL herr_t H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
+                                const char *new_attr_name, hid_t lapl_id);
 H5_DLL herr_t H5Aclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t attr_id,
                              hid_t es_id);
 
@@ -1138,7 +1135,7 @@ typedef herr_t (*H5A_operator1_t)(hid_t location_id /*in*/, const char *attr_nam
  * \see H5Aclose()
  *
  */
-H5_DLL hid_t  H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id);
+H5_DLL hid_t H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t acpl_id);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -1159,7 +1156,7 @@ H5_DLL hid_t  H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t sp
  * \since 1.0.0
  *
  */
-H5_DLL int     H5Aget_num_attrs(hid_t loc_id);
+H5_DLL int H5Aget_num_attrs(hid_t loc_id);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -1215,8 +1212,7 @@ H5_DLL int     H5Aget_num_attrs(hid_t loc_id);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t  H5Aiterate1(hid_t loc_id, unsigned *idx, H5A_operator1_t op,
-    void *op_data);
+H5_DLL herr_t H5Aiterate1(hid_t loc_id, unsigned *idx, H5A_operator1_t op, void *op_data);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -1243,7 +1239,7 @@ H5_DLL herr_t  H5Aiterate1(hid_t loc_id, unsigned *idx, H5A_operator1_t op,
  * \since 1.0.0
  *
  */
-H5_DLL hid_t   H5Aopen_idx(hid_t loc_id, unsigned idx);
+H5_DLL hid_t H5Aopen_idx(hid_t loc_id, unsigned idx);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -1268,7 +1264,7 @@ H5_DLL hid_t   H5Aopen_idx(hid_t loc_id, unsigned idx);
  * \since 1.0.0
  *
  */
-H5_DLL hid_t   H5Aopen_name(hid_t loc_id, const char *name);
+H5_DLL hid_t H5Aopen_name(hid_t loc_id, const char *name);
 
 #endif /* H5_NO_DEPRECATED_SYMBOLS */
 
diff --git a/src/H5D.c b/src/H5D.c
index 02e6099..f1ac2df 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -229,7 +229,7 @@ H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE11(FUNC, "*s*sIui*siiiiii", app_file, app_func, app_line, loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on dataset ID")
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -438,7 +438,7 @@ H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, dapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on dataset ID")
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -532,7 +532,7 @@ H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, dset_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -641,7 +641,7 @@ H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, dset_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_DATASET, H5E_CANTDEC, H5I_INVALID_HID,
                             "can't decrement count on dataspace ID")
@@ -1012,7 +1012,7 @@ H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIuiiiiixi", app_file, app_func, app_line, dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1199,7 +1199,7 @@ H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIuiiiii*xi", app_file, app_func, app_line, dset_id, mem_type_id, mem_space_id, file_space_id, dxpl_id, buf, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1756,7 +1756,7 @@ H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_lin
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                 H5ARG_TRACE6(FUNC, "*s*sIui*hi", app_file, app_func, app_line, dset_id, size, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5Dpublic.h b/src/H5Dpublic.h
index 8d0ef30..935b1be 100644
--- a/src/H5Dpublic.h
+++ b/src/H5Dpublic.h
@@ -198,8 +198,8 @@ extern "C" {
  * \see H5Dopen2(), H5Dclose(), H5Tset_size()
  *
  */
-H5_DLL hid_t  H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id,
-                         hid_t dcpl_id, hid_t dapl_id);
+H5_DLL hid_t H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id,
+                        hid_t dcpl_id, hid_t dapl_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -224,9 +224,9 @@ H5_DLL hid_t  H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t sp
  * \see H5Dcreate2()
  *
  */
-H5_DLL hid_t  H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
-                              const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id,
-                              hid_t dapl_id, hid_t es_id);
+H5_DLL hid_t H5Dcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
+                             const char *name, hid_t type_id, hid_t space_id, hid_t lcpl_id, hid_t dcpl_id,
+                             hid_t dapl_id, hid_t es_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -287,7 +287,7 @@ H5_DLL hid_t  H5Dcreate_async(const char *app_file, const char *app_func, unsign
  * \see H5Olink(), H5Dcreate(), Using Identifiers
  *
  */
-H5_DLL hid_t  H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id);
+H5_DLL hid_t H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, hid_t dapl_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -321,7 +321,7 @@ H5_DLL hid_t  H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t
  * \see H5Dcreate2(), H5Dclose()
  *
  */
-H5_DLL hid_t  H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id);
+H5_DLL hid_t H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -342,8 +342,8 @@ H5_DLL hid_t  H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id);
  * \see H5Dopen2()
  *
  */
-H5_DLL hid_t  H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
-                            const char *name, hid_t dapl_id, hid_t es_id);
+H5_DLL hid_t H5Dopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
+                           const char *name, hid_t dapl_id, hid_t es_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -366,7 +366,7 @@ H5_DLL hid_t  H5Dopen_async(const char *app_file, const char *app_func, unsigned
  * \see H5Sclose()
  *
  */
-H5_DLL hid_t  H5Dget_space(hid_t dset_id);
+H5_DLL hid_t H5Dget_space(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -385,8 +385,8 @@ H5_DLL hid_t  H5Dget_space(hid_t dset_id);
  * \see H5Dget_space()
  *
  */
-H5_DLL hid_t  H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
-                                 hid_t es_id);
+H5_DLL hid_t H5Dget_space_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
+                                hid_t es_id);
 
 H5_DLL herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation);
 
@@ -428,7 +428,7 @@ H5_DLL herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
  *          given a text description.
  *
  */
-H5_DLL hid_t  H5Dget_type(hid_t dset_id);
+H5_DLL hid_t H5Dget_type(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -449,7 +449,7 @@ H5_DLL hid_t  H5Dget_type(hid_t dset_id);
  *          with H5Pclose() to prevent resource leaks.
  *
  */
-H5_DLL hid_t  H5Dget_create_plist(hid_t dset_id);
+H5_DLL hid_t H5Dget_create_plist(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -488,7 +488,7 @@ H5_DLL hid_t  H5Dget_create_plist(hid_t dset_id);
  * \since 1.8.3
  *
  */
-H5_DLL hid_t  H5Dget_access_plist(hid_t dset_id);
+H5_DLL hid_t H5Dget_access_plist(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -559,7 +559,7 @@ H5_DLL hsize_t H5Dget_storage_size(hid_t dset_id);
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_bytes);
+H5_DLL herr_t H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, hsize_t *chunk_bytes);
 
 /**
  * --------------------------------------------------------------------------
@@ -593,7 +593,7 @@ H5_DLL herr_t  H5Dget_chunk_storage_size(hid_t dset_id, const hsize_t *offset, h
  * \since 1.10.5
  *
  */
-H5_DLL herr_t  H5Dget_num_chunks(hid_t dset_id, hid_t fspace_id, hsize_t *nchunks);
+H5_DLL herr_t H5Dget_num_chunks(hid_t dset_id, hid_t fspace_id, hsize_t *nchunks);
 
 /**
  * --------------------------------------------------------------------------
@@ -624,8 +624,8 @@ H5_DLL herr_t  H5Dget_num_chunks(hid_t dset_id, hid_t fspace_id, hsize_t *nchunk
  * \since 1.10.5
  *
  */
-H5_DLL herr_t  H5Dget_chunk_info_by_coord(hid_t dset_id, const hsize_t *offset, unsigned *filter_mask,
-                                          haddr_t *addr, hsize_t *size);
+H5_DLL herr_t H5Dget_chunk_info_by_coord(hid_t dset_id, const hsize_t *offset, unsigned *filter_mask,
+                                         haddr_t *addr, hsize_t *size);
 
 /**
  * --------------------------------------------------------------------------
@@ -673,8 +673,8 @@ H5_DLL herr_t  H5Dget_chunk_info_by_coord(hid_t dset_id, const hsize_t *offset,
  * \since 1.10.5
  *
  */
-H5_DLL herr_t  H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t chk_idx, hsize_t *offset,
-                                 unsigned *filter_mask, haddr_t *addr, hsize_t *size);
+H5_DLL herr_t H5Dget_chunk_info(hid_t dset_id, hid_t fspace_id, hsize_t chk_idx, hsize_t *offset,
+                                unsigned *filter_mask, haddr_t *addr, hsize_t *size);
 
 /**
  * --------------------------------------------------------------------------
@@ -790,8 +790,8 @@ H5_DLL haddr_t H5Dget_offset(hid_t dset_id);
  *          default data transfer properties are used.
  *
  */
-H5_DLL herr_t  H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
-                       hid_t dxpl_id, void *buf /*out*/);
+H5_DLL herr_t H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
+                      hid_t dxpl_id, void *buf /*out*/);
 
 /**
  * --------------------------------------------------------------------------
@@ -815,9 +815,9 @@ H5_DLL herr_t  H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid
  * \see H5Dread()
  *
  */
-H5_DLL herr_t  H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
-                             hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
-                             void *buf /*out*/, hid_t es_id);
+H5_DLL herr_t H5Dread_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
+                            hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
+                            void *buf /*out*/, hid_t es_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -927,8 +927,8 @@ H5_DLL herr_t  H5Dread_async(const char *app_file, const char *app_func, unsigne
  * \see H5Pset_fill_time(), H5Pset_alloc_time()
  *
  */
-H5_DLL herr_t  H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
-                        hid_t dxpl_id, const void *buf);
+H5_DLL herr_t H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id,
+                       hid_t dxpl_id, const void *buf);
 
 /**
  * --------------------------------------------------------------------------
@@ -952,9 +952,9 @@ H5_DLL herr_t  H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, hi
  * \see H5Dwrite()
  *
  */
-H5_DLL herr_t  H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
-                              hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
-                              const void *buf, hid_t es_id);
+H5_DLL herr_t H5Dwrite_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
+                             hid_t mem_type_id, hid_t mem_space_id, hid_t file_space_id, hid_t dxpl_id,
+                             const void *buf, hid_t es_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1022,8 +1022,8 @@ H5_DLL herr_t  H5Dwrite_async(const char *app_file, const char *app_func, unsign
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset,
-                              size_t data_size, const void *buf);
+H5_DLL herr_t H5Dwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, const hsize_t *offset,
+                             size_t data_size, const void *buf);
 
 /**
  * --------------------------------------------------------------------------
@@ -1078,8 +1078,8 @@ H5_DLL herr_t  H5Dwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters, co
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters,
-                             void *buf);
+H5_DLL herr_t H5Dread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *filters,
+                            void *buf);
 
 /**
  * --------------------------------------------------------------------------
@@ -1154,7 +1154,7 @@ H5_DLL herr_t  H5Dread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data);
+H5_DLL herr_t H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, void *operator_data);
 
 /**
  * --------------------------------------------------------------------------
@@ -1181,7 +1181,7 @@ H5_DLL herr_t  H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dvlen_get_buf_size(hid_t dset_id, hid_t type_id, hid_t space_id, hsize_t *size);
+H5_DLL herr_t H5Dvlen_get_buf_size(hid_t dset_id, hid_t type_id, hid_t space_id, hsize_t *size);
 
 /**
  * --------------------------------------------------------------------------
@@ -1224,7 +1224,7 @@ H5_DLL herr_t  H5Dvlen_get_buf_size(hid_t dset_id, hid_t type_id, hid_t space_id
  *          - H5Pcreate_anon()
  *
  */
-H5_DLL herr_t  H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_t space_id);
+H5_DLL herr_t H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_t space_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1288,7 +1288,7 @@ H5_DLL herr_t  H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t bu
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Dset_extent(hid_t dset_id, const hsize_t size[]);
+H5_DLL herr_t H5Dset_extent(hid_t dset_id, const hsize_t size[]);
 
 /**
  * --------------------------------------------------------------------------
@@ -1309,8 +1309,8 @@ H5_DLL herr_t  H5Dset_extent(hid_t dset_id, const hsize_t size[]);
  * \see H5Dset_extent()
  *
  */
-H5_DLL herr_t  H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_line,
-                                   hid_t dset_id, const hsize_t size[], hid_t es_id);
+H5_DLL herr_t H5Dset_extent_async(const char *app_file, const char *app_func, unsigned app_line,
+                                  hid_t dset_id, const hsize_t size[], hid_t es_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1333,9 +1333,9 @@ H5_DLL herr_t  H5Dset_extent_async(const char *app_file, const char *app_func, u
  *          that the data is actually flushed to disk.
  *
  */
-H5_DLL herr_t  H5Dflush(hid_t dset_id);
+H5_DLL herr_t H5Dflush(hid_t dset_id);
 
-H5_DLL herr_t  H5Dwait(hid_t dset_id);
+H5_DLL herr_t H5Dwait(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1359,7 +1359,7 @@ H5_DLL herr_t  H5Dwait(hid_t dset_id);
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Drefresh(hid_t dset_id);
+H5_DLL herr_t H5Drefresh(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1430,8 +1430,8 @@ H5_DLL herr_t  H5Drefresh(hid_t dset_id);
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id,
-                          void *dst_buf);
+H5_DLL herr_t H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, hid_t dst_space_id,
+                         void *dst_buf);
 
 /**
  * --------------------------------------------------------------------------
@@ -1508,8 +1508,8 @@ H5_DLL herr_t  H5Dscatter(H5D_scatter_func_t op, void *op_data, hid_t type_id, h
  * \since 1.10.2
  *
  */
-H5_DLL herr_t  H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size,
-                         void *dst_buf, H5D_gather_func_t op, void *op_data);
+H5_DLL herr_t H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id, size_t dst_buf_size,
+                        void *dst_buf, H5D_gather_func_t op, void *op_data);
 
 /**
  * --------------------------------------------------------------------------
@@ -1532,7 +1532,7 @@ H5_DLL herr_t  H5Dgather(hid_t src_space_id, const void *src_buf, hid_t type_id,
  * \see H5Dcreate2(), H5Dopen2()
  *
  */
-H5_DLL herr_t  H5Dclose(hid_t dset_id);
+H5_DLL herr_t H5Dclose(hid_t dset_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -1551,8 +1551,8 @@ H5_DLL herr_t  H5Dclose(hid_t dset_id);
  * \see H5Dclose()
  *
  */
-H5_DLL herr_t  H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
-                              hid_t es_id);
+H5_DLL herr_t H5Dclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t dset_id,
+                             hid_t es_id);
 
 /* Internal API routines */
 H5_DLL herr_t H5Ddebug(hid_t dset_id);
diff --git a/src/H5F.c b/src/H5F.c
index 64d37ce..0d71947 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -652,7 +652,7 @@ H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, c
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE8(FUNC, "*s*sIu*sIuiii", app_file, app_func, app_line, filename, flags, fcpl_id, fapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_FILE, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on file ID")
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -671,7 +671,7 @@ H5Fcreate_async(const char *app_file, const char *app_func, unsigned app_line, c
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE8(FUNC, "*s*sIu*sIuiii", app_file, app_func, app_line, filename, flags, fcpl_id, fapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
 
 done:
@@ -829,7 +829,7 @@ H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, con
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIu*sIuii", app_file, app_func, app_line, filename, flags, fapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_FILE, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on file ID")
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -848,7 +848,7 @@ H5Fopen_async(const char *app_file, const char *app_func, unsigned app_line, con
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIu*sIuii", app_file, app_func, app_line, filename, flags, fapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
 
 done:
@@ -956,7 +956,7 @@ H5Fflush_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                 H5ARG_TRACE6(FUNC, "*s*sIuiFsi", app_file, app_func, app_line, object_id, scope, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1050,7 +1050,7 @@ H5Fclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, file_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1352,7 +1352,7 @@ H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, file_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref(ret_value) < 0)
                 HDONE_ERROR(H5E_FILE, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on file ID")
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -1371,7 +1371,7 @@ H5Freopen_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, file_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_FILE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
 
 done:
diff --git a/src/H5G.c b/src/H5G.c
index 0c39279..04bb5b5 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -272,7 +272,7 @@ H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIui*siiii", app_file, app_func, app_line, loc_id, name, lcpl_id, gcpl_id, gapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on group ID")
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -476,7 +476,7 @@ H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, gapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_SYM, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on group ID")
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -623,7 +623,7 @@ H5Gget_info_async(const char *app_file, const char *app_func, unsigned app_line,
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                 H5ARG_TRACE6(FUNC, "*s*sIuixi", app_file, app_func, app_line, loc_id, group_info, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -729,7 +729,7 @@ H5Gget_info_by_name_async(const char *app_file, const char *app_func, unsigned a
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE8(FUNC, "*s*sIui*sxii", app_file, app_func, app_line, loc_id, name, group_info, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -842,7 +842,7 @@ H5Gget_info_by_idx_async(const char *app_file, const char *app_func, unsigned ap
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE11(FUNC, "*s*sIui*sIiIohxii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, group_info, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -932,7 +932,7 @@ H5Gclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, group_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5Gpublic.h b/src/H5Gpublic.h
index 26617d3..fef9025 100644
--- a/src/H5Gpublic.h
+++ b/src/H5Gpublic.h
@@ -60,7 +60,6 @@ typedef struct H5G_info_t {
 } H5G_info_t;
 //! [H5G_info_t_snip]
 
-
 /********************/
 /* Public Variables */
 /********************/
@@ -117,7 +116,7 @@ extern "C" {
  * \see H5Gopen2(), H5Gclose()
  *
  */
-H5_DLL hid_t  H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id);
+H5_DLL hid_t H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -140,8 +139,8 @@ H5_DLL hid_t  H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gc
  * \see H5Gcreate2()
  *
  */
-H5_DLL hid_t  H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
-                              const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id);
+H5_DLL hid_t H5Gcreate_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
+                             const char *name, hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -190,7 +189,7 @@ H5_DLL hid_t  H5Gcreate_async(const char *app_file, const char *app_func, unsign
  * \since 1.8.0
  *
  */
-H5_DLL hid_t  H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
+H5_DLL hid_t H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -220,7 +219,7 @@ H5_DLL hid_t  H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id);
  * \see H5Gcreate2(), H5Gclose()
  *
  */
-H5_DLL hid_t  H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
+H5_DLL hid_t H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
 
 /**
  * --------------------------------------------------------------------------
@@ -241,8 +240,8 @@ H5_DLL hid_t  H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id);
  * \see H5Gopen2()
  *
  */
-H5_DLL hid_t  H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
-                            const char *name, hid_t gapl_id, hid_t es_id);
+H5_DLL hid_t H5Gopen_async(const char *app_file, const char *app_func, unsigned app_line, hid_t loc_id,
+                           const char *name, hid_t gapl_id, hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -265,7 +264,7 @@ H5_DLL hid_t  H5Gopen_async(const char *app_file, const char *app_func, unsigned
  * \see H5Gcreate2(), H5Gclose()
  *
  */
-H5_DLL hid_t  H5Gget_create_plist(hid_t group_id);
+H5_DLL hid_t H5Gget_create_plist(hid_t group_id);
 
 /**
  *-------------------------------------------------------------------------
diff --git a/src/H5L.c b/src/H5L.c
index 2fdfb7f..e107602 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -566,7 +566,7 @@ H5Lcreate_soft_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIu*si*siii", app_file, app_func, app_line, link_target, link_loc_id, link_name, lcpl_id, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -716,12 +716,12 @@ H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_li
                      const char *cur_name, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
                      hid_t lapl_id, hid_t es_id)
 {
-    H5VL_object_t vol_obj;                      /* Object for loc_id */
-    H5VL_object_t *vol_obj_ptr = &vol_obj;      /* Pointer to object for loc_id */
+    H5VL_object_t   vol_obj;                        /* Object for loc_id */
+    H5VL_object_t * vol_obj_ptr     = &vol_obj;     /* Pointer to object for loc_id */
     H5VL_object_t **vol_obj_ptr_ptr = &vol_obj_ptr; /* Pointer to object pointer */
-    void *         token     = NULL;            /* Request token for async operation        */
-    void **        token_ptr = H5_REQUEST_NULL; /* Pointer to request token for async operation        */
-    herr_t         ret_value = SUCCEED;         /* Return value */
+    void *          token           = NULL;         /* Request token for async operation        */
+    void **         token_ptr = H5_REQUEST_NULL;    /* Pointer to request token for async operation        */
+    herr_t          ret_value = SUCCEED;            /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE10("e", "*s*sIui*si*siii", app_file, app_func, app_line, cur_loc_id, cur_name, new_loc_id,
@@ -741,7 +741,7 @@ H5Lcreate_hard_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj_ptr->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*si*siii", app_file, app_func, app_line, cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1021,7 +1021,7 @@ H5Ldelete_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1146,7 +1146,7 @@ H5Ldelete_by_idx_async(const char *app_file, const char *app_func, unsigned app_
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*sIiIohii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1373,9 +1373,9 @@ H5Lexists_async(const char *app_file, const char *app_func, unsigned app_line, h
     /* If a token was created, add the token to the event set */
     if (NULL != token)
         if (H5ES_insert(es_id, vol_obj->connector, token,
-        /* clang-format off */
+                        /* clang-format off */
                         H5ARG_TRACE8(FUNC, "*s*sIui*s*bii", app_file, app_func, app_line, loc_id, name, exists, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1813,7 +1813,7 @@ H5Literate_async(const char *app_file, const char *app_func, unsigned app_line,
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIuiIiIo*hLI*xi", app_file, app_func, app_line, group_id, idx_type, order, idx_p, op, op_data, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_LINK, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5M.c b/src/H5M.c
index 0f609e2..9deb2f2 100644
--- a/src/H5M.c
+++ b/src/H5M.c
@@ -370,7 +370,7 @@ H5Mcreate_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE11(FUNC, "*s*sIui*siiiiii", app_file, app_func, app_line, loc_id, name, key_type_id, val_type_id, lcpl_id, mcpl_id, mapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_MAP, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on map ID")
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -577,7 +577,7 @@ H5Mopen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, mapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_MAP, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on map ID")
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -671,7 +671,7 @@ H5Mclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, map_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -985,7 +985,7 @@ H5Mput_async(const char *app_file, const char *app_func, unsigned app_line, hid_
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIuii*xi*xii", app_file, app_func, app_line, map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1114,7 +1114,7 @@ H5Mget_async(const char *app_file, const char *app_func, unsigned app_line, hid_
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIuii*xi*xii", app_file, app_func, app_line, map_id, key_mem_type_id, key, val_mem_type_id, value, dxpl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_MAP, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5O.c b/src/H5O.c
index 8287f22..2cdb37d 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -202,7 +202,7 @@ H5Oopen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, lapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on object ID")
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -335,7 +335,7 @@ H5Oopen_by_idx_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*sIiIohii", app_file, app_func, app_line, loc_id, group_name, idx_type, order, n, lapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HDONE_ERROR(H5E_OHDR, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on object ID")
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -594,7 +594,7 @@ H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*si*siii", app_file, app_func, app_line, src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -696,7 +696,7 @@ H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, obj_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -798,7 +798,7 @@ H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line,
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, oid, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1188,7 +1188,8 @@ H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned a
     herr_t         ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_API(FAIL)
-    H5TRACE9("e", "*s*sIui*sxIuii", app_file, app_func, app_line, loc_id, name, oinfo, fields, lapl_id, es_id);
+    H5TRACE9("e", "*s*sIui*sxIuii", app_file, app_func, app_line, loc_id, name, oinfo, fields, lapl_id,
+             es_id);
 
     /* Set up request token pointer for asynchronous operation */
     if (H5ES_NONE != es_id)
@@ -1203,7 +1204,7 @@ H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned a
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE9(FUNC, "*s*sIui*sxIuii", app_file, app_func, app_line, loc_id, name, oinfo, fields, lapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -1930,7 +1931,7 @@ H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hi
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE5(FUNC, "*s*sIuii", app_file, app_func, app_line, object_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
diff --git a/src/H5Opublic.h b/src/H5Opublic.h
index 340f8d7..9f2c64f 100644
--- a/src/H5Opublic.h
+++ b/src/H5Opublic.h
@@ -222,22 +222,22 @@ extern "C" {
  *          specified by a location, \p loc_id, and a path name, \p name, in an HDF5 file.
  *
  *          This function opens the object in the same manner as H5Gopen(), H5Topen(), and H5Dopen().
- *          However, H5Oopen() does not require the type of object to be known beforehand.  
+ *          However, H5Oopen() does not require the type of object to be known beforehand.
  *          This can be useful with user-defined links, for instance, when only a path may be known.
  *
  *          H5Oopen() cannot be used to open a dataspace, attribute, property list, or file.
  *
- *          Once an object of unknown type has been opened with H5Oopen(), 
+ *          Once an object of unknown type has been opened with H5Oopen(),
  *          the type of that object can be determined by means of an H5Iget_type() call.
  *
  *          \p loc_id may be a file, group, dataset, named datatype, or attribute.
- *          If an attribute is specified for \p loc_id then the object where the 
+ *          If an attribute is specified for \p loc_id then the object where the
  *          attribute is attached will be accessed.
  *
  *          \p name must be the path to that object relative to \p loc_id.
  *
- *          \p lapl_id is the link access property list associated with the link pointing to 
- *          the object.  If default link access properties are appropriate, this can be 
+ *          \p lapl_id is the link access property list associated with the link pointing to
+ *          the object.  If default link access properties are appropriate, this can be
  *          passed in as #H5P_DEFAULT.
  *
  *          When it is no longer needed, the opened object should be closed with
@@ -245,7 +245,7 @@ extern "C" {
  *
  * \version 1.8.1 Fortran subroutine introduced in this release.
  *
- * \since 1.8.0 
+ * \since 1.8.0
  *
  */
 H5_DLL hid_t H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id);
@@ -263,14 +263,14 @@ H5_DLL hid_t H5Oopen_async(const char *app_file, const char *app_func, unsigned
  *
  * \return \hid_ti{object}
  *
- * \details H5Oopen_by_token() opens an object specified by the object 
+ * \details H5Oopen_by_token() opens an object specified by the object
  *          identifier, \p loc_id and object token, \p token.
  *
  * \par Example
  *      An example snippet from examples/h5_extlink.c:
  *      \snippet h5_extlink.c H5Open_by_token_snip
  *
- * \since 1.12.0 
+ * \since 1.12.0
  *
  */
 H5_DLL hid_t H5Oopen_by_token(hid_t loc_id, H5O_token_t token);
@@ -290,11 +290,11 @@ H5_DLL hid_t H5Oopen_by_token(hid_t loc_id, H5O_token_t token);
  *
  * \return \hid_tv{object}
  *
- * \details H5Open_by_idx() opens the nth object in the group specified by \p loc_id 
+ * \details H5Open_by_idx() opens the nth object in the group specified by \p loc_id
  *          and \p group_name.
  *
  *          \p loc_id specifies a location identifier.  \p group_name specifies the group relative to
- *          \p loc_id in which the object can be found.  If \p loc_id fully specifies the group 
+ *          \p loc_id in which the object can be found.  If \p loc_id fully specifies the group
  *          in which the object resides, \p group_name can be a dot (.).
  *
  *          The specific object to be opened within the group is specified by the three parameters:
@@ -305,22 +305,22 @@ H5_DLL hid_t H5Oopen_by_token(hid_t loc_id, H5O_token_t token);
  *
  *          \indexes
  *
- *          \p order specifies the order in which the objects are to be referenced for the purposes 
+ *          \p order specifies the order in which the objects are to be referenced for the purposes
  *          of this function.  Valid orders include the following:
  *
  *          \orders
  *
- *          Note that for #H5_ITER_NATIVE, rather than implying a particular order, 
- *          it instructs the HDF5 library to iterate through the objects in the fastest 
+ *          Note that for #H5_ITER_NATIVE, rather than implying a particular order,
+ *          it instructs the HDF5 library to iterate through the objects in the fastest
  *          available order, i.e., in a natural order.
- * 
- *          \p n specifies the position of the object within the index.  Note that this count is 
- *          zero-based; 0 (zero) indicates that the function will return the value of the first object; 
+ *
+ *          \p n specifies the position of the object within the index.  Note that this count is
+ *          zero-based; 0 (zero) indicates that the function will return the value of the first object;
  *          if \p n is 5, the function will return the value of the sixth object; etc.
  *
  *          \p lapl_id specifies the link access property list to be used in accessing the object.
  *
- *          An object opened with this function should be closed when it is no longer needed so that 
+ *          An object opened with this function should be closed when it is no longer needed so that
  *          resource leaks will not develop.  H5Oclose() can be used to close groups, datasets,
  *          or committed datatypes.
  *
@@ -345,7 +345,7 @@ H5_DLL hid_t H5Oopen_by_idx_async(const char *app_file, const char *app_func, un
  * \param[in] name The name of the link to check
  * \lapl_id
  *
- * \return Returns a positive value if the object pointed to by the \p loc_id and \p name combination exists. 
+ * \return Returns a positive value if the object pointed to by the \p loc_id and \p name combination exists.
  * \return Returns 0 if the object pointed to by the \p loc_id and \p name combination does not exist.
  * \return Returns a negatvie value when the function fails.
  *
@@ -424,7 +424,7 @@ H5_DLL hid_t H5Oopen_by_idx_async(const char *app_file, const char *app_func, un
  * \since 1.8.5
  *
  */
-H5_DLL htri_t  H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
+H5_DLL htri_t H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -438,14 +438,15 @@ H5_DLL htri_t  H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
  *
  * \return \herr_t
  *
- * \details H5Oget_info3() specifies an object by its identifier, \p loc_id , and 
+ * \details H5Oget_info3() specifies an object by its identifier, \p loc_id , and
  *          retrieves the metadata describing that object in \p oinfo , an H5O_info2_t \c struct.
  *
  *          The H5O_info2_t \c struct is defined in H5Opublic.h as follows :
  *          \snippet this H5O_info2_t_snip
  *
  *          Note the following about H5O_info2_t :
- *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been implemented.
+ *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been
+ *implemented.
  *          - The \c atime value is the last time the object was read or written.
  *          - The \c mtime value is the last time the raw data in the object was changed.
  *          - The \c ctime value is the last time the metadata for the object was changed.
@@ -454,15 +455,15 @@ H5_DLL htri_t  H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
  *          The H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
  *
- *          The H5O_type_t \c enum indicates the object type and 
+ *          The H5O_type_t \c enum indicates the object type and
  *          is defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
- *      
+ *
  *          Note that the object retrieved as indicated by \p loc_id
  *          refers only to the types specified by H5O_type_t.
  *
- *          The \p fields parameter contains flags to determine which fields will be filled in 
- *          the H5O_info2_t \c struct returned in \p oinfo. 
+ *          The \p fields parameter contains flags to determine which fields will be filled in
+ *          the H5O_info2_t \c struct returned in \p oinfo.
  *          These flags are defined in the H5Opublic.h file:
  *
  *          \obj_info_fields
@@ -487,13 +488,13 @@ H5_DLL htri_t  H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id);
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
+H5_DLL herr_t H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
 
 /**
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object by 
+ * \brief Retrieves the metadata for an object, identifying the object by
  *        location and relative name
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -504,8 +505,8 @@ H5_DLL herr_t  H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
  *
  * \return \herr_t
  *
- * \details H5Oget_info_by_name3() specifies an object’s location and name, 
- *          \p loc_id and \p name, respectively, and retrieves the metadata 
+ * \details H5Oget_info_by_name3() specifies an object’s location and name,
+ *          \p loc_id and \p name, respectively, and retrieves the metadata
  *          describing that object in \p oinfo, an H5O_info2_t struct.
  *
  *          \p oinfo, in which the object information is returned, is a \c struct of
@@ -514,7 +515,8 @@ H5_DLL herr_t  H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
  *          \snippet this H5O_info2_t_snip
  *
  *          Note the following about H5O_info2_t :
- *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been implemented.
+ *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been
+ *implemented.
  *          - The \c atime value is the last time the object was read or written.
  *          - The \c mtime value is the last time the raw data in the object was changed.
  *          - The \c ctime value is the last time the metadata for the object was changed.
@@ -523,20 +525,20 @@ H5_DLL herr_t  H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
  *          The H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
  *
- *          The H5O_type_t \c enum indicates the object type and 
+ *          The H5O_type_t \c enum indicates the object type and
  *          is defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
  *
  *          Note that the object retrieved as indicated by \p loc_id
  *          refers only to the types specified by H5O_type_t.
  *
- *          The \p fields parameter contains flags to determine which fields will be filled in 
- *          the H5O_info2_t \c struct returned in \p oinfo. 
+ *          The \p fields parameter contains flags to determine which fields will be filled in
+ *          the H5O_info2_t \c struct returned in \p oinfo.
  *          These flags are defined in the H5Opublic.h file:
  *
  *          \obj_info_fields
  *
- *          The link access property list, \c lapl_id, is not currently used; 
+ *          The link access property list, \c lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
  * \par Example
@@ -546,17 +548,17 @@ H5_DLL herr_t  H5Oget_info3(hid_t loc_id, H5O_info2_t *oinfo, unsigned fields);
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t *oinfo, unsigned fields,
-                                    hid_t lapl_id);
-H5_DLL herr_t  H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
-                                         hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/,
-                                         unsigned fields, hid_t lapl_id, hid_t es_id);
+H5_DLL herr_t H5Oget_info_by_name3(hid_t loc_id, const char *name, H5O_info2_t *oinfo, unsigned fields,
+                                   hid_t lapl_id);
+H5_DLL herr_t H5Oget_info_by_name_async(const char *app_file, const char *app_func, unsigned app_line,
+                                        hid_t loc_id, const char *name, H5O_info2_t *oinfo /*out*/,
+                                        unsigned fields, hid_t lapl_id, hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object 
+ * \brief Retrieves the metadata for an object, identifying the object
  *        by an index position
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -591,7 +593,8 @@ H5_DLL herr_t  H5Oget_info_by_name_async(const char *app_file, const char *app_f
  *          \snippet this H5O_info2_t_snip
  *
  *          Note the following about H5O_info2_t :
- *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been implemented.
+ *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been
+ *implemented.
  *          - The \c atime value is the last time the object was read or written.
  *          - The \c mtime value is the last time the raw data in the object was changed.
  *          - The \c ctime value is the last time the metadata for the object was changed.
@@ -600,19 +603,19 @@ H5_DLL herr_t  H5Oget_info_by_name_async(const char *app_file, const char *app_f
  *          H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
  *
- *          The #H5O_type_t \c enum indicates the object type and 
+ *          The #H5O_type_t \c enum indicates the object type and
  *          is defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
  *
  *          Note that the object retrieved as indicated by \p loc_id
  *          refers only to the types specified by #H5O_type_t.
  *
- *          The \p fields parameter contains flags to determine which fields will be filled in 
- *          the H5O_info2_t \c struct returned in \p oinfo. 
+ *          The \p fields parameter contains flags to determine which fields will be filled in
+ *          the H5O_info2_t \c struct returned in \p oinfo.
  *          These flags are defined in the H5Opublic.h file:
  *          \obj_info_fields
  *
- *          The link access property list, \c lapl_id, is not currently used; 
+ *          The link access property list, \c lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
  * \par Example
@@ -622,9 +625,9 @@ H5_DLL herr_t  H5Oget_info_by_name_async(const char *app_file, const char *app_f
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-                                   H5_iter_order_t order, hsize_t n, H5O_info2_t *oinfo, unsigned fields,
-                                   hid_t lapl_id);
+H5_DLL herr_t H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                  H5_iter_order_t order, hsize_t n, H5O_info2_t *oinfo, unsigned fields,
+                                  hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -658,7 +661,7 @@ H5_DLL herr_t  H5Oget_info_by_idx3(hid_t loc_id, const char *group_name, H5_inde
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo, unsigned fields);
+H5_DLL herr_t H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo, unsigned fields);
 
 /**
  *-------------------------------------------------------------------------
@@ -693,14 +696,14 @@ H5_DLL herr_t  H5Oget_native_info(hid_t loc_id, H5O_native_info_t *oinfo, unsign
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_native_info_t *oinfo,
-                                          unsigned fields, hid_t lapl_id);
+H5_DLL herr_t H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_native_info_t *oinfo,
+                                         unsigned fields, hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieve native file format information about an object 
+ * \brief Retrieve native file format information about an object
  *        according to the order of an index
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -733,15 +736,15 @@ H5_DLL herr_t  H5Oget_native_info_by_name(hid_t loc_id, const char *name, H5O_na
  *          Possible values defined in H5Opublic.h are:
  *          \snippet this H5O_native_info_fields_snip
  *
- *          The link access property list, \c lapl_id, is not currently used; 
+ *          The link access property list, \c lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
-                                         H5_iter_order_t order, hsize_t n, H5O_native_info_t *oinfo,
-                                         unsigned fields, hid_t lapl_id);
+H5_DLL herr_t H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+                                        H5_iter_order_t order, hsize_t n, H5O_native_info_t *oinfo,
+                                        unsigned fields, hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -750,7 +753,7 @@ H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H
  * \brief Creates a hard link to an object in an HDF5 file
  *
  * \param[in] obj_id Object to be linked
- * \param[in] new_loc_id Location identifier at which object is to be linked; 
+ * \param[in] new_loc_id Location identifier at which object is to be linked;
  *                       may be a file, group, dataset, named datatype or attribute identifier.
  * \param[in] new_name Name of link to be created, relative to \p new_loc_id.
  * \lcpl_id
@@ -766,7 +769,7 @@ H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H
  *          H5Olink() is designed for two purposes:
  *          - To create the first hard link to an object that has just
  *            been created with H5Dcreate_anon(), H5Gcreate_anon(), or
- *            H5Tcommit_anon().  
+ *            H5Tcommit_anon().
  *          - To add additional structure to an existing
  *            file so that, for example, an object can be shared among
  *            multiple groups.
@@ -784,7 +787,7 @@ H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H
  * \code
  *
  *      // Creates a link creation property list (LCPL).
- *      hid_t lcpl_id = H5Pcreate(H5P_LINK_CREATE);  
+ *      hid_t lcpl_id = H5Pcreate(H5P_LINK_CREATE);
  *
  *      // Sets "create missing intermediate groups" property in that LCPL.
  *      int status = H5Pset_create_intermediate_group(lcpl_id, TRUE);
@@ -797,7 +800,7 @@ H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H
  *
  * \endcode
  *
- * \par 
+ * \par
  *      Note that unless the object is intended to be temporary,
  *      the H5O_LINK call is mandatory if an object created with one
  *      of the H5*_CREATE_ANON functions (or with H5T_COMMIT_ANON)
@@ -810,7 +813,7 @@ H5_DLL herr_t  H5Oget_native_info_by_idx(hid_t loc_id, const char *group_name, H
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id);
+H5_DLL herr_t H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -836,8 +839,8 @@ H5_DLL herr_t  H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid
  *          count, an H5Oget_info() call is required; the reference count
  *          is returned in the \c rc field of the #H5O_info_t \c struct.
  *
- * \warning This function must be used with care! 
- * \warning Improper use can lead to inaccessible data, wasted space in the file, 
+ * \warning This function must be used with care!
+ * \warning Improper use can lead to inaccessible data, wasted space in the file,
  *          or <b><em>file corruption</em></b>.
  *
  * \version 1.8.11 Fortran subroutine introduced in this release.
@@ -845,7 +848,7 @@ H5_DLL herr_t  H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Oincr_refcount(hid_t object_id);
+H5_DLL herr_t H5Oincr_refcount(hid_t object_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -871,8 +874,8 @@ H5_DLL herr_t  H5Oincr_refcount(hid_t object_id);
  *          count, an H5Oget_info() call is required; the reference count
  *          is returned in the \c rc field of the #H5O_info_t \c struct.
  *
- * \warning This function must be used with care! 
- * \warning Improper use can lead to inaccessible data, wasted space in the file, 
+ * \warning This function must be used with care!
+ * \warning Improper use can lead to inaccessible data, wasted space in the file,
  *          or <b><em>file corruption</em></b>.
  *
  * \version 1.8.11 Fortran subroutine introduced in this release.
@@ -880,7 +883,7 @@ H5_DLL herr_t  H5Oincr_refcount(hid_t object_id);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
+H5_DLL herr_t H5Odecr_refcount(hid_t object_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -888,7 +891,7 @@ H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
  *
  * \brief Copies an object in an HDF5 file
  *
- * \param[in] src_loc_id Object identifier indicating the location of the 
+ * \param[in] src_loc_id Object identifier indicating the location of the
  *                       source object to be copied
  * \param[in] src_name Name of the source object to be copied
  * \param[in] dst_loc_id Location identifier specifying the destination
@@ -909,20 +912,20 @@ H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
  *
  *          The copy will be created with the path specified in \p dst_name,
  *          which must not pre-exist in the destination location. If
- *          \p dst_name already exists at the location \p dst_loc_id, 
- *          H5Ocopy() will fail. If \p dst_name is an absolute path, 
+ *          \p dst_name already exists at the location \p dst_loc_id,
+ *          H5Ocopy() will fail. If \p dst_name is an absolute path,
  *          the copy will be created relative to the file’s root group.
  *
  *          The copy of the object is created with the property lists
  *          specified by \p ocpypl_id and \p lcpl_id. #H5P_DEFAULT can be passed
  *          in for these property lists. The default behavior:
  *
- *          - of the link creation property list is to NOT create 
+ *          - of the link creation property list is to NOT create
  *             intermediate groups.
- *          - of the flags specified by the object creation property list 
- *            is described in H5Pset_copy_object(). 
+ *          - of the flags specified by the object creation property list
+ *            is described in H5Pset_copy_object().
  *
- *          These property lists or flags can be modified to govern the 
+ *          These property lists or flags can be modified to govern the
  *          behavior of H5Ocopy() as follows:
  *
  *          - A flag controlling the creation of intermediate groups that
@@ -936,7 +939,7 @@ H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
  *          - Flags controlling other aspects of object copying are set in the
  *              object copy property list \p ocpypl_id with H5Pset_copy_object().
  *
- *          H5Ocopy() will always try to make a copy of the object specified 
+ *          H5Ocopy() will always try to make a copy of the object specified
  *          in \p src_name.
  *
  *          - If the object specified by \p src_name is a group containing a
@@ -963,8 +966,8 @@ H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
  *          - H5Pset_create_intermediate_group()
  *          - H5Pset_mcdt_search_cb()
  *          .
- *      - Copying Committed Datatypes with #H5Ocopy - A comprehensive 
- *        discussion of copying committed datatypes (PDF) in 
+ *      - Copying Committed Datatypes with #H5Ocopy - A comprehensive
+ *        discussion of copying committed datatypes (PDF) in
  *        Advanced Topics in HDF5
  *
  * \version 1.8.9 Fortran subroutine introduced in this release.
@@ -972,11 +975,11 @@ H5_DLL herr_t  H5Odecr_refcount(hid_t object_id);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name,
-                       hid_t ocpypl_id, hid_t lcpl_id);
-H5_DLL herr_t  H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid_t src_loc_id,
-                             const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id,
-                             hid_t lcpl_id, hid_t es_id);
+H5_DLL herr_t H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, const char *dst_name,
+                      hid_t ocpypl_id, hid_t lcpl_id);
+H5_DLL herr_t H5Ocopy_async(const char *app_file, const char *app_func, unsigned app_line, hid_t src_loc_id,
+                            const char *src_name, hid_t dst_loc_id, const char *dst_name, hid_t ocpypl_id,
+                            hid_t lcpl_id, hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1007,12 +1010,12 @@ H5_DLL herr_t  H5Ocopy_async(const char *app_file, const char *app_func, unsigne
  *          will be attached to the object to which the attribute belongs
  *          and not to the attribute itself.
  *
- * \version 1.8.11 Fortran subroutine introduced in this release.  
+ * \version 1.8.11 Fortran subroutine introduced in this release.
  *
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Oset_comment(hid_t obj_id, const char *comment);
+H5_DLL herr_t H5Oset_comment(hid_t obj_id, const char *comment);
 
 /**
  *-------------------------------------------------------------------------
@@ -1030,12 +1033,12 @@ H5_DLL herr_t  H5Oset_comment(hid_t obj_id, const char *comment);
  * \details H5Oset_comment_by_name() sets the comment for the specified object
  *          to the contents of \p comment. Any previously existing comment
  *          is overwritten.
- * 
+ *
  *          The target object is specified by \p loc_id and \p name.
- *          \p loc_id can specify any object in the file. 
+ *          \p loc_id can specify any object in the file.
  *          \p name can be one of the following:
  *
- *          - The name of the object specified as a path relative to \p loc_id 
+ *          - The name of the object specified as a path relative to \p loc_id
  *          - An absolute name of the object, starting from \c /, the file’s root group
  *          - A dot (\c .), if \p loc_id fully specifies the object
  *
@@ -1056,12 +1059,12 @@ H5_DLL herr_t  H5Oset_comment(hid_t obj_id, const char *comment);
  *          link access property list can come into play when traversing
  *          links to access an object.
  *
- * \version 1.8.11 Fortran subroutine introduced in this release.  
+ * \version 1.8.11 Fortran subroutine introduced in this release.
  *
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id);
+H5_DLL herr_t H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1080,7 +1083,7 @@ H5_DLL herr_t  H5Oset_comment_by_name(hid_t loc_id, const char *name, const char
  *
  * \details H5Oget_comment() retrieves the comment for the specified object in
  *          the buffer \p comment.
- *           
+ *
  *          The target object is specified by an identifier, \p object_id.
  *
  *          The size in bytes of the buffer \p comment, including the \c NULL
@@ -1096,7 +1099,7 @@ H5_DLL herr_t  H5Oset_comment_by_name(hid_t loc_id, const char *name, const char
  *          If an object does not have a comment, the empty string is
  *          returned in \p comment.
  *
- * \version 1.8.11 Fortran subroutine introduced in this release.  
+ * \version 1.8.11 Fortran subroutine introduced in this release.
  *
  * \since 1.8.0
  *
@@ -1115,26 +1118,26 @@ H5_DLL ssize_t H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize);
  * \param[in] bufsize Anticipated required size of the \p comment buffer
  * \lapl_id
  *
- * \return Upon success, returns the number of characters in the comment, 
- *         not including the \c NULL terminator, or zero (\c 0) if the object 
- *         has no comment. The value returned may be larger than \c bufsize. 
+ * \return Upon success, returns the number of characters in the comment,
+ *         not including the \c NULL terminator, or zero (\c 0) if the object
+ *         has no comment. The value returned may be larger than \c bufsize.
  *         Otherwise returns a negative value.
  *
- * \details H5Oget_comment_by_name() retrieves the comment for an object 
+ * \details H5Oget_comment_by_name() retrieves the comment for an object
  *          in the buffer \p comment.
  *
  *          The target object is specified by \p loc_id and \p name.
- *          \p loc_id can specify any object in the file. 
+ *          \p loc_id can specify any object in the file.
  *          \p name can be one of the following:
  *
- *          - The name of the object relative to \p loc_id 
+ *          - The name of the object relative to \p loc_id
  *          - An absolute name of the object, starting from \c /, the file’s root group
  *          - A dot (\c .), if \p loc_id fully specifies the object
  *
  *          The size in bytes of the comment, including the \c NULL terminator,
  *          is specified in \p bufsize. If \p bufsize is unknown, a preliminary
  *          H5Oget_comment_by_name() call with the pointer \p comment set
- *          to \c NULL will return the size of the comment <em>without</em> 
+ *          to \c NULL will return the size of the comment <em>without</em>
  *          the \c NULL terminator.
  *
  *          If \p bufsize is set to a smaller value than described above,
@@ -1148,7 +1151,7 @@ H5_DLL ssize_t H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize);
  *          link access property list can come into play when traversing
  *          links to access an object.
  *
- * \version 1.8.11 Fortran subroutine introduced in this release.  
+ * \version 1.8.11 Fortran subroutine introduced in this release.
  *
  * \since 1.8.0
  *
@@ -1165,11 +1168,11 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  * \fgdta_loc_obj_id{obj_id}
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
- * \param[in] fields Flags specifying the fields to be retrieved to the 
+ * \param[in] fields Flags specifying the fields to be retrieved to the
  *                   callback \p op
  *
  * \return On success, returns the return value of the first operator
@@ -1180,21 +1183,21 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *         within the library, or the first negative value returned by
  *         an operator.
  *
- * \details H5Ovisit3() is a recursive iteration function to visit the 
- *          object \p obj_id and, if \p obj_id is a group, all objects in 
- *          and below it in an HDF5 file, thus providing a mechanism for 
- *          an application to perform a common set of operations across 
- *          all of those objects or a dynamically selected subset. 
- *          For non-recursive iteration across the members of a group, 
+ * \details H5Ovisit3() is a recursive iteration function to visit the
+ *          object \p obj_id and, if \p obj_id is a group, all objects in
+ *          and below it in an HDF5 file, thus providing a mechanism for
+ *          an application to perform a common set of operations across
+ *          all of those objects or a dynamically selected subset.
+ *          For non-recursive iteration across the members of a group,
  *          see H5Literate2().
  *
  *          If \p obj_id is a group identifier, that group serves as the
  *          root of a recursive iteration. If \p obj_id is a file identifier,
  *          that file’s root group serves as the root of the recursive
- *          iteration.  If \p obj_id is an attribute identifier, 
+ *          iteration.  If \p obj_id is an attribute identifier,
  *          then the object where the attribute is attached will be iterated.
- *          If \p obj_id is any other type of object, such as a dataset or 
- *          named datatype, there is no iteration.  
+ *          If \p obj_id is any other type of object, such as a dataset or
+ *          named datatype, there is no iteration.
  *
  *          Two parameters are used to establish the iteration: \p idx_type
  *          and \p order.
@@ -1208,12 +1211,12 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in 
- *          a value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in
+ *          a value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -1227,28 +1230,28 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *
  *          \snippet this H5O_iterate2_t_snip
  *
- *          The parameters of this callback function have the following values 
+ *          The parameters of this callback function have the following values
  *          or meanings:
  *          <table>
  *          <tr>
  *              <td>\c obj</td>
- *              <td>Object that serves as root of the iteration; 
+ *              <td>Object that serves as root of the iteration;
  *                  same value as the H5Ovisit() \p obj_id parameter</td>
  *          </tr>
  *          <tr>
  *          <td>\c name</td>
- *          <td>Name of object, relative to \c obj, being examined at 
+ *          <td>Name of object, relative to \c obj, being examined at
  *              current step of the iteration</td>
  *          </tr>
  *          <tr>
  *              <td>\c info</td>
- *              <td>H5O_info2_t \c struct containing information 
+ *              <td>H5O_info2_t \c struct containing information
  *                  regarding that object</td>
  *          </tr>
  *          <tr>
  *              <td>\c op_data</td>
- *              <td>User-defined pointer to data required by the application in 
- *                  processing the object; a pass-through of the \c op_data pointer 
+ *              <td>User-defined pointer to data required by the application in
+ *                  processing the object; a pass-through of the \c op_data pointer
  *                  provided with the H5Ovisit() function call</td>
  *          </tr>
  *          </table>
@@ -1258,29 +1261,29 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *
  *          H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
- *      
- *          The #H5O_type_t enum indicates the object type and is 
+ *
+ *          The #H5O_type_t enum indicates the object type and is
  *          defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
- *      
- *          Note that the object retrieved as indicated by \p obj_id 
+ *
+ *          Note that the object retrieved as indicated by \p obj_id
  *          refers only to the types specified by #H5O_type_t.
  *
  *          The return values from an operator are:
- *          - Zero causes the visit iterator to continue, returning zero when all 
+ *          - Zero causes the visit iterator to continue, returning zero when all
  *            group members have been processed.
- *          - A positive value causes the visit iterator to immediately return that 
+ *          - A positive value causes the visit iterator to immediately return that
  *            positive value, indicating short-circuit success.
- *          - A negative value causes the visit iterator to immediately return that 
+ *          - A negative value causes the visit iterator to immediately return that
  *            value, indicating failure.
  *
- *          The H5Ovisit3() \p op_data parameter is a user-defined pointer to the data 
- *          required to process objects in the course of the iteration. This pointer 
- *          is passed back to each step of the iteration in the callback 
- *          function’s \p op_data parameter. 
+ *          The H5Ovisit3() \p op_data parameter is a user-defined pointer to the data
+ *          required to process objects in the course of the iteration. This pointer
+ *          is passed back to each step of the iteration in the callback
+ *          function’s \p op_data parameter.
  *
- *          The \p fields parameter contains flags to determine which fields will 
- *          be retrieved by the \p op callback function. These flags are defined 
+ *          The \p fields parameter contains flags to determine which fields will
+ *          be retrieved by the \p op callback function. These flags are defined
  *          in the H5Opublic.h file:
  *          \obj_info_fields
  *
@@ -1302,7 +1305,7 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -1313,7 +1316,7 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  *       the routine was called. The C++ application should save some
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
- *      
+ *
  * \par Example
  *      An example snippet from test/links.c:
  *      \snippet links.c H5Ovisit3_snip
@@ -1321,8 +1324,8 @@ H5_DLL ssize_t H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comm
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op,
-                         void *op_data, unsigned fields);
+H5_DLL herr_t H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order, H5O_iterate2_t op,
+                        void *op_data, unsigned fields);
 
 /**
  *-------------------------------------------------------------------------
@@ -1335,11 +1338,11 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *                     \p loc_id, that will serve as root of the iteration
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
- * \param[in] fields Flags specifying the fields to be retrieved to the 
+ * \param[in] fields Flags specifying the fields to be retrieved to the
  *                   callback function \p op
  * \lapl_id
  *
@@ -1351,22 +1354,22 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *         within the library, or the first negative value returned by
  *         an operator.
  *
- * \details H5Ovisit_by_name3() is a recursive iteration function to visit 
- *          the object specified by the \p loc_id / \p obj_name parameter 
- *          pair and, if that object is a group, all objects in and below it 
- *          in an HDF5 file, thus providing a mechanism for an application to 
- *          perform a common set of operations across all of those objects or 
- *          a dynamically selected subset. For non-recursive iteration across 
+ * \details H5Ovisit_by_name3() is a recursive iteration function to visit
+ *          the object specified by the \p loc_id / \p obj_name parameter
+ *          pair and, if that object is a group, all objects in and below it
+ *          in an HDF5 file, thus providing a mechanism for an application to
+ *          perform a common set of operations across all of those objects or
+ *          a dynamically selected subset. For non-recursive iteration across
  *          the members of a group, see H5Literate2().
  *
  *          The object serving as the root of the iteration is specified
  *          by the \p loc_id / \p obj_name parameter pair. \p loc_id specifies
  *          a file or an object in a file;  if \p loc_id is an attribute identifier,
  *          the object where the attribute is attached will be used.
- *          \p obj_name specifies either an object in the file (with an absolute 
- *          name based in the file’s root group) or an object name relative 
+ *          \p obj_name specifies either an object in the file (with an absolute
+ *          name based in the file’s root group) or an object name relative
  *          to \p loc_id. If \p loc_id fully specifies the object that is to serve
- *          as the root of the iteration, \p obj_name should be '\c .' (a dot). 
+ *          as the root of the iteration, \p obj_name should be '\c .' (a dot).
  *          (Note that when \p loc_id fully specifies the object that is to serve
  *          as the root of the iteration, the user may wish to consider
  *          using H5Ovisit3() instead of H5Ovisit_by_name3().)
@@ -1383,12 +1386,12 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in a 
- *          value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in a
+ *          value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -1402,7 +1405,7 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *
  *          \snippet this H5O_iterate2_t_snip
  *
- *          The parameters of this callback function have the following 
+ *          The parameters of this callback function have the following
  *          values or meanings:
  *          <table>
  *          <tr>
@@ -1411,17 +1414,17 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *          </tr>
  *          <tr>
  *          <td>\c name</td>
- *          <td>Name of object, relative to \c obj, being examined at 
+ *          <td>Name of object, relative to \c obj, being examined at
  *              current step of the iteration</td>
  *          </tr>
  *          <tr>
  *              <td>\c info</td>
- *              <td>H5O_info2_t \c struct containing information 
+ *              <td>H5O_info2_t \c struct containing information
  *                  regarding that object</td>
  *          </tr>
  *          <tr>
  *              <td>\c op_data</td>
- *              <td>User-defined pointer to data required by the application in 
+ *              <td>User-defined pointer to data required by the application in
  *                  processing the object</td>
  *          </tr>
  *          </table>
@@ -1431,11 +1434,11 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *
  *          H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
- *      
- *          The #H5O_type_t enum indicates the object type and is 
+ *
+ *          The #H5O_type_t enum indicates the object type and is
  *          defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
- *      
+ *
  *          The H5Ovisit_by_name3() \p op_data parameter is a user-defined
  *          pointer to the data required to process objects in the course
  *          of the iteration. This pointer is passed back to each step of
@@ -1449,14 +1452,14 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *          that a link prefix be set in a link access property list
  *          (see H5Pset_elink_prefix()).
  *
- *          The \p fields parameter contains flags to determine which fields will 
- *          be retrieved by the \p op callback function. These flags are defined 
+ *          The \p fields parameter contains flags to determine which fields will
+ *          be retrieved by the \p op callback function. These flags are defined
  *          in the H5Opublic.h file:
  *          \obj_info_fields
  *
- *          H5Lvisit_by_name2() and H5Ovisit_by_name3() are companion 
- *          functions: one for examining and operating on links; the other 
- *          for examining and operating on the objects that those links point to. 
+ *          H5Lvisit_by_name2() and H5Ovisit_by_name3() are companion
+ *          functions: one for examining and operating on links; the other
+ *          for examining and operating on the objects that those links point to.
  *          Both functions ensure that by the time the function completes
  *          successfully, every link or object below the specified point
  *          in the file has been presented to the application for whatever
@@ -1468,7 +1471,7 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -1479,7 +1482,7 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  *       the routine was called. The C++ application should save some
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
- *      
+ *
  * \par Example
  *      An example snippet from test/links.c:
  *      \snippet links.c H5Ovisit_by_name3_snip
@@ -1487,9 +1490,9 @@ H5_DLL herr_t  H5Ovisit3(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t orde
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
-                                 H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields,
-                                 hid_t lapl_id);
+H5_DLL herr_t H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
+                                H5_iter_order_t order, H5O_iterate2_t op, void *op_data, unsigned fields,
+                                hid_t lapl_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1510,14 +1513,14 @@ H5_DLL herr_t  H5Ovisit_by_name3(hid_t loc_id, const char *obj_name, H5_index_t
  *          H5Oclose() is not used to close a dataspace, attribute, property
  *          list, or file.
  *
- * \version 1.8.8 Fortran subroutine introduced in this release.  
+ * \version 1.8.8 Fortran subroutine introduced in this release.
  *
  * \since 1.8.0
  *
  */
-H5_DLL herr_t  H5Oclose(hid_t object_id);
-H5_DLL herr_t  H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id,
-                              hid_t es_id);
+H5_DLL herr_t H5Oclose(hid_t object_id);
+H5_DLL herr_t H5Oclose_async(const char *app_file, const char *app_func, unsigned app_line, hid_t object_id,
+                             hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1532,7 +1535,7 @@ H5_DLL herr_t  H5Oclose_async(const char *app_file, const char *app_func, unsign
  * \details H5Oflush() causes all buffers associated with an object to be immediately
  *          flushed to disk without removing the data from the cache.
  *
- *          The object associated with \p object_id can be any named object in an 
+ *          The object associated with \p object_id can be any named object in an
  *          HDF5 file including a dataset, a group, or a committed datatype.
  *
  * \note HDF5 does not possess full control over buffering. H5Oflush()
@@ -1561,13 +1564,13 @@ H5_DLL herr_t  H5Oclose_async(const char *app_file, const char *app_func, unsign
  *      - H5Oare_mdc_flushes_disabled()
  *      - H5Odisable_mdc_flushes()
  *      - H5Oenable_mdc_flushes()
- * 
+ *
  * \since 1.10.0
  *
  */
-H5_DLL herr_t  H5Oflush(hid_t obj_id);
-H5_DLL herr_t  H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id,
-                              hid_t es_id);
+H5_DLL herr_t H5Oflush(hid_t obj_id);
+H5_DLL herr_t H5Oflush_async(const char *app_file, const char *app_func, unsigned app_line, hid_t obj_id,
+                             hid_t es_id);
 /**
  *-------------------------------------------------------------------------
  * \ingroup H5O
@@ -1586,24 +1589,24 @@ H5_DLL herr_t  H5Oflush_async(const char *app_file, const char *app_func, unsign
  *          the object. The reopened object is automatically re-registered
  *          with the same identifier.
  *
- *          The object associated with \p oid can be any named object in an 
+ *          The object associated with \p oid can be any named object in an
  *          HDF5 file including a dataset, a group, or a committed datatype.
- * 
+ *
  * \since 1.10.0
  *
  */
-H5_DLL herr_t  H5Orefresh(hid_t oid);
-H5_DLL herr_t  H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, hid_t oid,
-                                hid_t es_id);
+H5_DLL herr_t H5Orefresh(hid_t oid);
+H5_DLL herr_t H5Orefresh_async(const char *app_file, const char *app_func, unsigned app_line, hid_t oid,
+                               hid_t es_id);
 
 /**
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Prevents metadata entries for an HDF5 object from being flushed 
+ * \brief Prevents metadata entries for an HDF5 object from being flushed
  *        from the metadata cache to storage
  *
- * \param[in] object_id Identifier of the object that will have flushes disabled; 
+ * \param[in] object_id Identifier of the object that will have flushes disabled;
  *                      may be a group, named datatype, or dataset identifier
  *
  * \return \herr_t
@@ -1622,26 +1625,26 @@ H5_DLL herr_t  H5Orefresh_async(const char *app_file, const char *app_func, unsi
  *          HDF5 object level (datasets, groups, committed datatypes)
  *          and the entire metadata cache level.
  *
- * \note HDF5 objects include datasets, groups, and committed datatypes. 
+ * \note HDF5 objects include datasets, groups, and committed datatypes.
  *       Only #hid_t identifiers that represent these objects can be passed to the function.
- * \note Passing in a #hid_t identifier that represents any other HDF5 entity is 
+ * \note Passing in a #hid_t identifier that represents any other HDF5 entity is
  *       considered an error.
- * \note It is an error to pass an HDF5 file identifier 
+ * \note It is an error to pass an HDF5 file identifier
  *       (obtained from H5Fopen() or H5Fcreate())
  *       to this function.
- * \note Misuse of this function can cause the cache to exhaust 
+ * \note Misuse of this function can cause the cache to exhaust
  *       available memory.
- * \note Objects can be returned to the default automatic flush behavior 
+ * \note Objects can be returned to the default automatic flush behavior
  *       with H5Oenable_mdc_flushes().
- * \note Flush prevention only pertains to new or dirty metadata entries. 
+ * \note Flush prevention only pertains to new or dirty metadata entries.
  *       Clean entries can be evicted from the cache.
- * \note Calling this function on an object that has already had flushes 
+ * \note Calling this function on an object that has already had flushes
  *       disabled will return an error.
  *
  * \since 1.10.0
  *
  */
-H5_DLL herr_t  H5Odisable_mdc_flushes(hid_t object_id);
+H5_DLL herr_t H5Odisable_mdc_flushes(hid_t object_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1649,50 +1652,50 @@ H5_DLL herr_t  H5Odisable_mdc_flushes(hid_t object_id);
  *
  * \brief Enables flushing of dirty metadata entries from a file’s metadata cache
  *
- * \param[in] object_id Identifier of the object that will have flushes re-enabled; 
- *                      may be a group, named datatype, or dataset identifier 
+ * \param[in] object_id Identifier of the object that will have flushes re-enabled;
+ *                      may be a group, named datatype, or dataset identifier
  *
  * \return \herr_t
  *
  * \details H5Oenable_mdc_flushes(), H5Odisable_mdc_flushes()
- *          and associated flush functions can be used to control the flushing 
+ *          and associated flush functions can be used to control the flushing
  *          of entries from a file’s metadata cache.
  *
- *          This function allows an object or cache’s dirty metadata entries to be 
+ *          This function allows an object or cache’s dirty metadata entries to be
  *          flushed from the cache by the usual cache eviction/flush policy.
  *
- *          Metadata cache entries can be controlled at both the individual HDF5 
- *          object level (datasets, groups, committed datatypes) and the entire 
+ *          Metadata cache entries can be controlled at both the individual HDF5
+ *          object level (datasets, groups, committed datatypes) and the entire
  *          metadata cache level.
  *
  *
- * \note HDF5 objects include datasets, groups, and committed datatypes. 
- *       Only #hid_t identifiers that represent these objects can be 
+ * \note HDF5 objects include datasets, groups, and committed datatypes.
+ *       Only #hid_t identifiers that represent these objects can be
  *       passed to the function.
  *
  * \note Passing in a #hid_t identifier that represents any other HDF5 entity
  *       is considered an error.
  *
- * \note It is an error to pass an HDF5 file identifier 
+ * \note It is an error to pass an HDF5 file identifier
  *       (obtained from H5Fopen() or H5Fcreate())
  *       to this function.
  *
- * \note Using this function on an object that has not had flushes disabled 
- *       is considered an error. The state of an object can be determined 
+ * \note Using this function on an object that has not had flushes disabled
+ *       is considered an error. The state of an object can be determined
  *       with H5Oare_mdc_flushes_disabled().
  *
  * \note An object will be returned to the default flush algorithm when it is closed.
  *
- * \note All objects will be returned to the default flush algorithm when 
+ * \note All objects will be returned to the default flush algorithm when
  *       the file is closed.
  *
- * \note An object’s entries will not necessarily be flushed as a result of 
+ * \note An object’s entries will not necessarily be flushed as a result of
  *       calling this function.
  *
  * \since 1.10.0
  *
  */
-H5_DLL herr_t  H5Oenable_mdc_flushes(hid_t object_id);
+H5_DLL herr_t H5Oenable_mdc_flushes(hid_t object_id);
 
 /**
  *-------------------------------------------------------------------------
@@ -1700,11 +1703,11 @@ H5_DLL herr_t  H5Oenable_mdc_flushes(hid_t object_id);
  *
  * \brief Retrieves comment for specified object
  *
- * \param[in] object_id Identifier of an object in the cache; 
+ * \param[in] object_id Identifier of an object in the cache;
  *                      may be a group, named datatype, or dataset identifier
  * \param[out] are_disabled Flushes enabled/disabled
  *
- * \return \p are_disabled will be set to \c 1 if an object has had flushes disabled 
+ * \return \p are_disabled will be set to \c 1 if an object has had flushes disabled
  *            and \c 0 if it has not had flushes disabled.
  * \return \herr_t
  *
@@ -1712,22 +1715,22 @@ H5_DLL herr_t  H5Oenable_mdc_flushes(hid_t object_id);
  *          datatype) has had flushes of metadata entries disabled.
  *
  *          The H5Oenable_mdc_flushes(), H5Odisable_mdc_flushes() and
- *          associated flush functions can be used to control the flushing of 
+ *          associated flush functions can be used to control the flushing of
  *          entries from a file’s metadata cache. Metadata cache entries can be controlled
  *          at both the individual HDF5 object level (datasets, groups,
  *          committed datatypes) and the entire metadata cache level.
  *
- * \note HDF5 objects include datasets, groups, and committed datatypes. 
+ * \note HDF5 objects include datasets, groups, and committed datatypes.
  *       Only #hid_t identifiers that represent these objects can be passed to the function.
- * \note Passing in a #hid_t identifier that represents any other HDF5 entity is 
+ * \note Passing in a #hid_t identifier that represents any other HDF5 entity is
  *       considered an error.
- * \note It is an error to pass an HDF5 file identifier 
+ * \note It is an error to pass an HDF5 file identifier
  *       (obtained from H5Fopen() or H5Fcreate()) to this function.
  *
  * \since 1.10.0
  *
  */
-H5_DLL herr_t  H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled);
+H5_DLL herr_t H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disabled);
 
 /**
  *-------------------------------------------------------------------------
@@ -1742,14 +1745,14 @@ H5_DLL herr_t  H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disable
  *
  * \return \herr_t
  *
- * \details H5Otoken_cmp() compares two VOL connector object tokens, \p token1 
- *          and \p token2 for the file or group identifier specified by \p loc_id.  
+ * \details H5Otoken_cmp() compares two VOL connector object tokens, \p token1
+ *          and \p token2 for the file or group identifier specified by \p loc_id.
  *          Both object tokens must be from the same VOL connector class.
  *
  *          H5O_token_t is defined in H5public.h as follows:
  *          \snippet H5public.h H5O_token_t_snip
  *
- *          A comparison value, \p cmp_value, is returned, which indicates the 
+ *          A comparison value, \p cmp_value, is returned, which indicates the
  *          result of the comparison:
  *
  * <table>
@@ -1778,8 +1781,8 @@ H5_DLL herr_t  H5Oare_mdc_flushes_disabled(hid_t object_id, hbool_t *are_disable
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_token_t *token2,
-                            int *cmp_value);
+H5_DLL herr_t H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_token_t *token2,
+                           int *cmp_value);
 
 /**
  *-------------------------------------------------------------------------
@@ -1793,14 +1796,14 @@ H5_DLL herr_t  H5Otoken_cmp(hid_t loc_id, const H5O_token_t *token1, const H5O_t
  *
  * \return \herr_t
  *
- * \details H5Otoken_to_str() serializes a connector's object token specified by 
- *          \p token and the location identifier for the object, \p loc_id, 
+ * \details H5Otoken_to_str() serializes a connector's object token specified by
+ *          \p token and the location identifier for the object, \p loc_id,
  *          into a string, \p token_str.
  *
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Otoken_to_str(hid_t loc_id, const H5O_token_t *token, char **token_str);
+H5_DLL herr_t H5Otoken_to_str(hid_t loc_id, const H5O_token_t *token, char **token_str);
 
 /**
  *-------------------------------------------------------------------------
@@ -1814,14 +1817,14 @@ H5_DLL herr_t  H5Otoken_to_str(hid_t loc_id, const H5O_token_t *token, char **to
  *
  * \return \herr_t
  *
- * \details H5Otoken_from_str() deserializes a string, \p token_str, into a 
- *          connector object token, \p token, for the object specified by the 
+ * \details H5Otoken_from_str() deserializes a string, \p token_str, into a
+ *          connector object token, \p token, for the object specified by the
  *          location identifier, \p loc_id.
  *
  * \since 1.12.0
  *
  */
-H5_DLL herr_t  H5Otoken_from_str(hid_t loc_id, const char *token_str, H5O_token_t *token);
+H5_DLL herr_t H5Otoken_from_str(hid_t loc_id, const char *token_str, H5O_token_t *token);
 
 /* API Wrappers for async routines */
 /* (Must be defined _after_ the function prototype) */
@@ -1924,34 +1927,34 @@ typedef herr_t (*H5O_iterate1_t)(hid_t obj, const char *name, const H5O_info1_t
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Oopen_by_token().
  *
- * \details H5Oopen_by_addr() opens a group, dataset, or committed (named) datatype using its 
- *          address within an HDF5 file, \p addr. The resulting opened object is identical to 
- *          an object opened with H5Oopen() and should be closed with H5Oclose() or an 
+ * \details H5Oopen_by_addr() opens a group, dataset, or committed (named) datatype using its
+ *          address within an HDF5 file, \p addr. The resulting opened object is identical to
+ *          an object opened with H5Oopen() and should be closed with H5Oclose() or an
  *          object-type-specific closing function (such as H5Gclose()) when no longer needed.
  *
  *          \p loc_id is a location identifier in the file.
  *
- *          The object’s address within the file, \p addr, is the byte offset of the first byte 
- *          of the object header from the beginning of the HDF5 file space, i.e., from the 
- *          beginning of the super block (see the “HDF5 Storage Model” section of the The 
+ *          The object’s address within the file, \p addr, is the byte offset of the first byte
+ *          of the object header from the beginning of the HDF5 file space, i.e., from the
+ *          beginning of the super block (see the “HDF5 Storage Model” section of the The
  *          HDF5 Data Model and File Structure chapter of the <em>HDF5 User's Guide</em>.)
  *
  *          \p addr can be obtained via either of two function calls. H5Gget_objinfo() returns
- *          the object’s address in the \c objno field of the H5G_stat_t \c struct; 
+ *          the object’s address in the \c objno field of the H5G_stat_t \c struct;
  *          H5Lget_info() returns the address in the \c address field of the #H5L_info_t \c struct.
  *
- *          The address of the HDF5 file on a physical device has no effect on H5Oopen_by_addr(), 
- *          nor does the use of any file driver. As stated above, the object address is its 
- *          offset within the HDF5 file; HDF5’s file drivers will transparently map this to an 
+ *          The address of the HDF5 file on a physical device has no effect on H5Oopen_by_addr(),
+ *          nor does the use of any file driver. As stated above, the object address is its
+ *          offset within the HDF5 file; HDF5’s file drivers will transparently map this to an
  *          address on a storage device.
  *
- * \warning This function must be used with care! 
- * \warning Improper use can lead to inaccessible data, wasted space in the file, 
- *          or <b><em>file corruption</em></b>. 
- * \warning This function is dangerous if called on an invalid address. The risk can be safely 
+ * \warning This function must be used with care!
+ * \warning Improper use can lead to inaccessible data, wasted space in the file,
+ *          or <b><em>file corruption</em></b>.
+ * \warning This function is dangerous if called on an invalid address. The risk can be safely
  *          overcome by retrieving the object address with H5Gget_objinfo() or H5Lget_info()
- *          immediately before calling H5Oopen_by_addr(). The immediacy of the operation can be 
- *          important; if time has elapsed and the object has been deleted from the file, 
+ *          immediately before calling H5Oopen_by_addr(). The immediacy of the operation can be
+ *          important; if time has elapsed and the object has been deleted from the file,
  *          the address will be invalid and file corruption can result.
  *
  * \version 1.8.4 Fortran subroutine added in this release.
@@ -1959,7 +1962,7 @@ typedef herr_t (*H5O_iterate1_t)(hid_t obj, const char *name, const H5O_info1_t
  * \since 1.8.0
  *
  */
-H5_DLL hid_t  H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
+H5_DLL hid_t H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
 
 /**
  *-------------------------------------------------------------------------
@@ -1975,35 +1978,36 @@ H5_DLL hid_t  H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Oget_info3() or the macro #H5Oget_info.
  *
- * \details H5Oget_info1() specifies an object by its identifier, \p loc_id , and 
- *          retrieves the metadata describing that object in \p oinfo , 
+ * \details H5Oget_info1() specifies an object by its identifier, \p loc_id , and
+ *          retrieves the metadata describing that object in \p oinfo ,
  *          defined as a \c struct of type H5O_info1_t :
  *
  *          \snippet this H5O_info1_t_snip
  *
  *          Note the following about H5O_info1_t :
- *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been implemented.
+ *          - Of the four time fields (\c atime, \c mtime, \c ctime, and \c btime) only \c ctime has been
+ *implemented.
  *          - The \c atime value is the last time the object was read or written.
  *          - The \c mtime value is the last time the raw data in the object was changed.
  *          - The \c ctime value is the last time the metadata for the object was changed.
  *          - The \c btime value is the time the object was created.
  *          - The fields nested in the \c meta_size field are for internal library use only.
  *
- *          The #H5O_type_t \c enum indicates the object type and 
+ *          The #H5O_type_t \c enum indicates the object type and
  *          is defined in H5Opublic.h as follows:
  *          \snippet this H5O_type_t_snip
  *
  *          Note that the object retrieved as indicated by \p loc_id
  *          refers only to the types specified by #H5O_type_t.
  *
- *          An H5O_hdr_info_t \c struct holds object header metadata and is 
+ *          An H5O_hdr_info_t \c struct holds object header metadata and is
  *          defined in H5Opublic.h as follows:
  *          \snippet this H5O_hdr_info_t_snip
  *
- *          Valid values for the \c version field are \c H5O_VERSION_1 and \c H5O_VERSION_2. 
+ *          Valid values for the \c version field are \c H5O_VERSION_1 and \c H5O_VERSION_2.
  *          Version 2 of the object header is smaller and more efficient than version 1.
  *
- *          Please be aware that the information held by H5O_hdr_info_t may only be useful to 
+ *          Please be aware that the information held by H5O_hdr_info_t may only be useful to
  *          developers with extensive HDF5 experience.
  *
  * \note If you are iterating through a lot of different objects to
@@ -2018,13 +2022,12 @@ H5_DLL hid_t  H5Oopen_by_addr(hid_t loc_id, haddr_t addr);
  *       will force metadata entries to be evicted from the cache,
  *       thus freeing the memory associated with the entries.
  *
- * \version 1.10.5 The macro #H5Oget_info was removed and the function H5Oget_info1() was copied to H5Oget_info().
- * \version 1.10.3 Function H5Oget_info() was copied to H5Oget_info1(), and the macro #H5Oget_info was created.
- * \version 1.8.15 Added a note about the valid values for the \c version field in the H5O_hdr_info_t structure.
- * \version 1.8.11 Fortran subroutine introduced in this release.
- * \version 1.8.10 Added #H5O_type_t structure to the Description section. \n
- *                 Separated H5O_hdr_info_t structure from #H5O_info_t in the Description section. \n
- *                 Clarified the definition and implementation of the time fields.
+ * \version 1.10.5 The macro #H5Oget_info was removed and the function H5Oget_info1() was copied to
+ *H5Oget_info(). \version 1.10.3 Function H5Oget_info() was copied to H5Oget_info1(), and the macro
+ *#H5Oget_info was created. \version 1.8.15 Added a note about the valid values for the \c version field in
+ *the H5O_hdr_info_t structure. \version 1.8.11 Fortran subroutine introduced in this release. \version 1.8.10
+ *Added #H5O_type_t structure to the Description section. \n Separated H5O_hdr_info_t structure from
+ *#H5O_info_t in the Description section. \n Clarified the definition and implementation of the time fields.
  *
  * \since 1.8.0
  *
@@ -2035,7 +2038,7 @@ H5_DLL herr_t H5Oget_info1(hid_t loc_id, H5O_info1_t *oinfo);
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object 
+ * \brief Retrieves the metadata for an object, identifying the object
  *        by location and relative name
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -2048,21 +2051,21 @@ H5_DLL herr_t H5Oget_info1(hid_t loc_id, H5O_info1_t *oinfo);
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Oget_info_by_name2() or the macro #H5Oget_info_by_name.
  *
- * \details H5Oget_info_by_name1() specifies an object’s location and name, \p loc_id 
+ * \details H5Oget_info_by_name1() specifies an object’s location and name, \p loc_id
  *          and \p name, respectively, and retrieves the metadata describing that object
  *          in \p oinfo, an H5O_info1_t \c struct.
- *          
+ *
  *          The \c struct H5O_info1_t is defined in H5Opublic.h and described
  *          in the H5Oget_info1() function entry.
- *          
+ *
  *          The link access property list, \p lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
- * \version 1.10.5 The macro #H5Oget_info_by_name was removed and the function 
+ * \version 1.10.5 The macro #H5Oget_info_by_name was removed and the function
  *                 H5Oget_info_by_name1() was copied to H5Oget_info_by_name().
  * \version 1.10.3 Function H5Oget_info_by_name() was copied to H5Oget_info_by_name1()
  *                 and the macro #H5Oget_info_by_name was created.
- * \version 1.8.8 Fortran 2003 subroutine and \c h5o_info_t derived type introduced 
+ * \version 1.8.8 Fortran 2003 subroutine and \c h5o_info_t derived type introduced
  *                in this release.
  *
  * \since 1.8.0
@@ -2074,7 +2077,7 @@ H5_DLL herr_t H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info1_t *
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object 
+ * \brief Retrieves the metadata for an object, identifying the object
  *        by an index position
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -2110,10 +2113,10 @@ H5_DLL herr_t H5Oget_info_by_name1(hid_t loc_id, const char *name, H5O_info1_t *
  *          type H5O_info1_t .
  *          \snippet this H5O_info1_t_snip
  *
- *          The link access property list, \c lapl_id, is not currently used; 
+ *          The link access property list, \c lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
- * \version 1.10.5 The macro #H5Oget_info_by_idx was removed and the function 
+ * \version 1.10.5 The macro #H5Oget_info_by_idx was removed and the function
  *                 H5Oget_info_by_idx() was copied to H5Oget_info_by_idx1().
  * \version 1.10.3 Function H5Oget_info_by_idx() was copied to H5Oget_info_by_idx1()
  *                 and the macro #H5Oget_info_by_idx was created.
@@ -2140,12 +2143,12 @@ H5_DLL herr_t H5Oget_info_by_idx1(hid_t loc_id, const char *group_name, H5_index
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Oget_info3() or the macro H5Oget_info().
  *
- * \details H5Oget_info2() specifies an object by its identifier, \p loc_id , and 
+ * \details H5Oget_info2() specifies an object by its identifier, \p loc_id , and
  *          retrieves the metadata describing that object in \p oinfo , an H5O_info1_t \c struct.
  *          This \c struct type is described in H5Oget_info1().
  *
- *          The \p fields parameter contains flags to determine which fields will be filled in 
- *          the H5O_info1_t \c struct returned in \p oinfo. 
+ *          The \p fields parameter contains flags to determine which fields will be filled in
+ *          the H5O_info1_t \c struct returned in \p oinfo.
  *          These flags are defined in the H5Opublic.h file:
  *
  *          \obj_info_fields
@@ -2171,7 +2174,7 @@ H5_DLL herr_t H5Oget_info2(hid_t loc_id, H5O_info1_t *oinfo, unsigned fields);
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object 
+ * \brief Retrieves the metadata for an object, identifying the object
  *        by location and relative name
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -2188,7 +2191,7 @@ H5_DLL herr_t H5Oget_info2(hid_t loc_id, H5O_info1_t *oinfo, unsigned fields);
  * \details H5Oget_info_by_name2() specifies an object’s location and name, \p loc_id and
  *          \p name, respectively, and retrieves the metadata describing
  *          that object in \p oinfo, an H5O_info1_t \c struct.
- *          
+ *
  *          The \c struct H5O_info1_t is defined in H5Opublic.h and described
  *          in the H5Oget_info1() function entry.
  *
@@ -2198,7 +2201,7 @@ H5_DLL herr_t H5Oget_info2(hid_t loc_id, H5O_info1_t *oinfo, unsigned fields);
  *
  *          \obj_info_fields
  *
- *          The link access property list, \p lapl_id, is not currently used; 
+ *          The link access property list, \p lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
  * \since 1.10.3
@@ -2211,7 +2214,7 @@ H5_DLL herr_t H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info1_t *
  *-------------------------------------------------------------------------
  * \ingroup H5O
  *
- * \brief Retrieves the metadata for an object, identifying the object 
+ * \brief Retrieves the metadata for an object, identifying the object
  *        by an index position
  *
  * \fgdta_loc_obj_id{loc_id}
@@ -2236,18 +2239,18 @@ H5_DLL herr_t H5Oget_info_by_name2(hid_t loc_id, const char *name, H5O_info1_t *
  *          \p n within that index.
  *
  *          \p oinfo, in which the object information is returned, is a \c struct of
- *          type H5O_info1_t.  This and other \c struct types used 
+ *          type H5O_info1_t.  This and other \c struct types used
  *          by H5Oget_info_by_idx2() are described in H5Oget_info_by_idx1().
  *
  *          If \p loc_id fully specifies the group in which the object resides,
  *          i\p group_name can be a dot (\c .).
  *
  *          The \p fields parameter contains flags to determine which fields will be
- *          filled in the H5O_info1_t \c struct returned in \p oinfo. 
+ *          filled in the H5O_info1_t \c struct returned in \p oinfo.
  *          These flags are defined in the H5Opublic.h file:
  *          \obj_info_fields
  *
- *          The link access property list, \c lapl_id, is not currently used; 
+ *          The link access property list, \c lapl_id, is not currently used;
  *          it should be passed in as #H5P_DEFAULT.
  *
  * \since 1.10.3
@@ -2266,9 +2269,9 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  * \fgdta_loc_obj_id{obj_id}
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
  *
  * \return On success, returns the return value of the first operator
@@ -2282,21 +2285,21 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Ovisit3() or the macro #H5Ovisit.
  *
- * \details H5Ovisit1() is a recursive iteration function to visit the 
- *          object \p obj_id and, if \p obj_id is a group, all objects in 
- *          and below it in an HDF5 file, thus providing a mechanism for 
- *          an application to perform a common set of operations across all 
- *          of those objects or a dynamically selected subset. For 
- *          non-recursive iteration across the members of a group, 
+ * \details H5Ovisit1() is a recursive iteration function to visit the
+ *          object \p obj_id and, if \p obj_id is a group, all objects in
+ *          and below it in an HDF5 file, thus providing a mechanism for
+ *          an application to perform a common set of operations across all
+ *          of those objects or a dynamically selected subset. For
+ *          non-recursive iteration across the members of a group,
  *          see  H5Literate1().
  *
  *          If \p obj_id is a group identifier, that group serves as the
  *          root of a recursive iteration. If \p obj_id is a file identifier,
  *          that file’s root group serves as the root of the recursive
- *          iteration.  If \p obj_id is an attribute identifier, 
+ *          iteration.  If \p obj_id is an attribute identifier,
  *          then the object where the attribute is attached will be iterated.
- *          If \p obj_id is any other type of object, such as a dataset or 
- *          named datatype, there is no iteration.  
+ *          If \p obj_id is any other type of object, such as a dataset or
+ *          named datatype, there is no iteration.
  *
  *          Two parameters are used to establish the iteration: \p idx_type
  *          and \p order.
@@ -2310,12 +2313,12 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in 
- *          a value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in
+ *          a value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -2329,27 +2332,27 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  *
  *          \snippet this H5O_iterate1_t_snip
  *
- *          The parameters of this callback function have the following values 
+ *          The parameters of this callback function have the following values
  *          or meanings:
  *          <table>
  *          <tr>
  *              <td>\c obj</td>
- *              <td>Object that serves as root of the iteration; 
+ *              <td>Object that serves as root of the iteration;
  *                  same value as the H5Ovisit1() \p obj_id parameter</td>
  *          </tr>
  *          <tr>
  *          <td>\c name</td>
- *          <td>Name of object, relative to \c obj, being examined at 
+ *          <td>Name of object, relative to \c obj, being examined at
  *              current step of the iteration</td>
  *          </tr>
  *          <tr>
  *              <td>\c info</td>
- *              <td>H5O_info1_t \c struct containing information 
+ *              <td>H5O_info1_t \c struct containing information
  *                  regarding that object</td>
  *          </tr>
  *          <tr>
  *              <td>\c op_data</td>
- *              <td>User-defined pointer to data required by the application in 
+ *              <td>User-defined pointer to data required by the application in
  *                  processing the object</td>
  *          </tr>
  *          </table>
@@ -2358,17 +2361,17 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  *          \snippet this H5O_info1_t_snip
  *
  *          The return values from an operator are:
- *          - Zero causes the visit iterator to continue, returning zero when all 
+ *          - Zero causes the visit iterator to continue, returning zero when all
  *            group members have been processed.
- *          - A positive value causes the visit iterator to immediately return that 
+ *          - A positive value causes the visit iterator to immediately return that
  *            positive value, indicating short-circuit success.
- *          - A negative value causes the visit iterator to immediately return that 
+ *          - A negative value causes the visit iterator to immediately return that
  *            value, indicating failure.
  *
- *          The H5Ovisit1() \p op_data parameter is a user-defined pointer to the data 
- *          required to process objects in the course of the iteration. This pointer 
- *          is passed back to each step of the iteration in the callback 
- *          function’s \p op_data parameter. 
+ *          The H5Ovisit1() \p op_data parameter is a user-defined pointer to the data
+ *          required to process objects in the course of the iteration. This pointer
+ *          is passed back to each step of the iteration in the callback
+ *          function’s \p op_data parameter.
  *
  *          H5Lvisit1() and H5Ovisit1() are companion functions: one for
  *          examining and operating on links; the other for examining
@@ -2388,7 +2391,7 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -2399,10 +2402,10 @@ H5_DLL herr_t H5Oget_info_by_idx2(hid_t loc_id, const char *group_name, H5_index
  *       the routine was called. The C++ application should save some
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
- *      
- * \version 1.10.5 The macro #H5Ovisit was removed and the function 
+ *
+ * \version 1.10.5 The macro #H5Ovisit was removed and the function
  *          H5Ovisit1() was copied to H5Ovisit().
- * \version 1.10.3 Function H5Ovisit() was copied to H5Ovisit1(), 
+ * \version 1.10.3 Function H5Ovisit() was copied to H5Ovisit1(),
  *          and the macro #H5Ovisit was created.
  * \version 1.8.8 Fortran subroutine introduced in this release.
  *
@@ -2423,9 +2426,9 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *                     \p loc_id, that will serve as root of the iteration
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
  * \lapl_id
  *
@@ -2440,22 +2443,22 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Ovisit_by_name3() or the macro #H5Ovisit_by_name.
  *
- * \details H5Ovisit_by_name1() is a recursive iteration function to visit 
- *          the object specified by the \p loc_id / \p obj_name parameter 
- *          pair and, if that object is a group, all objects in and below it 
- *          in an HDF5 file, thus providing a mechanism for an application to 
- *          perform a common set of operations across all of those objects or 
- *          a dynamically selected subset. For non-recursive iteration across 
+ * \details H5Ovisit_by_name1() is a recursive iteration function to visit
+ *          the object specified by the \p loc_id / \p obj_name parameter
+ *          pair and, if that object is a group, all objects in and below it
+ *          in an HDF5 file, thus providing a mechanism for an application to
+ *          perform a common set of operations across all of those objects or
+ *          a dynamically selected subset. For non-recursive iteration across
  *          the members of a group, see H5Literate1().
  *
  *          The object serving as the root of the iteration is specified
  *          by the \p loc_id / \p obj_name parameter pair. \p loc_id specifies
  *          a file or an object in a file;  if \p loc_id is an attribute identifier,
  *          the object where the attribute is attached will be used.
- *          \p obj_name specifies either an object in the file (with an absolute 
- *          name based in the file’s root group) or an object name relative 
+ *          \p obj_name specifies either an object in the file (with an absolute
+ *          name based in the file’s root group) or an object name relative
  *          to \p loc_id. If \p loc_id fully specifies the object that is to serve
- *          as the root of the iteration, \p obj_name should be '\c .' (a dot). 
+ *          as the root of the iteration, \p obj_name should be '\c .' (a dot).
  *          (Note that when \p loc_id fully specifies the object that is to serve
  *          as the root of the iteration, the user may wish to consider
  *          using H5Ovisit1() instead of H5Ovisit_by_name1().)
@@ -2472,12 +2475,12 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in a 
- *          value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in a
+ *          value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -2506,9 +2509,9 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *          that a link prefix be set in a link access property list
  *          (see H5Pset_elink_prefix()).
  *
- *          H5Lvisit_by_name1() and H5Ovisit_by_name1() are companion 
- *          functions: one for examining and operating on links; the other 
- *          for examining and operating on the objects that those links point to. 
+ *          H5Lvisit_by_name1() and H5Ovisit_by_name1() are companion
+ *          functions: one for examining and operating on links; the other
+ *          for examining and operating on the objects that those links point to.
  *          Both functions ensure that by the time the function completes
  *          successfully, every link or object below the specified point
  *          in the file has been presented to the application for whatever
@@ -2520,7 +2523,7 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -2532,9 +2535,9 @@ H5_DLL herr_t H5Ovisit1(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
  *
- * \version 1.10.5 The macro #H5Ovisit_by_name was removed and the function 
+ * \version 1.10.5 The macro #H5Ovisit_by_name was removed and the function
  *          H5Ovisit_by_name1() was copied to #H5Ovisit_by_name.
- * \version 1.10.3 The H5Ovisit_by_name() function was renamed to H5Ovisit_by_name1(), 
+ * \version 1.10.3 The H5Ovisit_by_name() function was renamed to H5Ovisit_by_name1(),
  *          and the macro #H5Ovisit_by_name was created.
  * \version 1.8.11 Fortran subroutine introduced in this release.
  *
@@ -2553,11 +2556,11 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  * \fgdta_loc_obj_id{obj_id}
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
- * \param[in] fields Flags specifying the fields to be retrieved to the 
+ * \param[in] fields Flags specifying the fields to be retrieved to the
  *                   callback \p op
  *
  * \return On success, returns the return value of the first operator
@@ -2571,21 +2574,21 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Ovisit3() or the macro #H5Ovisit.
  *
- * \details H5Ovisit2() is a recursive iteration function to visit the 
- *          object \p obj_id and, if \p obj_id is a group, all objects in 
- *          and below it in an HDF5 file, thus providing a mechanism for 
- *          an application to perform a common set of operations across all 
- *          of those objects or a dynamically selected subset. For 
- *          non-recursive iteration across the members of a group, 
+ * \details H5Ovisit2() is a recursive iteration function to visit the
+ *          object \p obj_id and, if \p obj_id is a group, all objects in
+ *          and below it in an HDF5 file, thus providing a mechanism for
+ *          an application to perform a common set of operations across all
+ *          of those objects or a dynamically selected subset. For
+ *          non-recursive iteration across the members of a group,
  *          see H5Literate1().
  *
  *          If \p obj_id is a group identifier, that group serves as the
  *          root of a recursive iteration. If \p obj_id is a file identifier,
  *          that file’s root group serves as the root of the recursive
- *          iteration.  If \p obj_id is an attribute identifier, 
+ *          iteration.  If \p obj_id is an attribute identifier,
  *          then the object where the attribute is attached will be iterated.
- *          If \p obj_id is any other type of object, such as a dataset or 
- *          named datatype, there is no iteration.  
+ *          If \p obj_id is any other type of object, such as a dataset or
+ *          named datatype, there is no iteration.
  *
  *          Two parameters are used to establish the iteration: \p idx_type
  *          and \p order.
@@ -2599,12 +2602,12 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in 
- *          a value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in
+ *          a value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -2618,28 +2621,28 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  *
  *          \snippet this H5O_iterate1_t_snip
  *
- *          The parameters of this callback function have the following values 
+ *          The parameters of this callback function have the following values
  *          or meanings:
  *          <table>
  *          <tr>
  *              <td>\c obj</td>
- *              <td>Object that serves as root of the iteration; 
+ *              <td>Object that serves as root of the iteration;
  *                  same value as the H5Ovisit1() \p obj_id parameter</td>
  *          </tr>
  *          <tr>
  *          <td>\c name</td>
- *          <td>Name of object, relative to \c obj, being examined at 
+ *          <td>Name of object, relative to \c obj, being examined at
  *              current step of the iteration</td>
  *          </tr>
  *          <tr>
  *              <td>\c info</td>
- *              <td>H5O_info1_t \c struct containing information 
+ *              <td>H5O_info1_t \c struct containing information
  *                  regarding that object</td>
  *          </tr>
  *          <tr>
  *              <td>\c op_data</td>
- *              <td>User-defined pointer to data required by the application in 
- *                  processing the object; a pass-through of the \c op_data pointer 
+ *              <td>User-defined pointer to data required by the application in
+ *                  processing the object; a pass-through of the \c op_data pointer
  *                  provided with the H5Ovisit() function call</td>
  *          </tr>
  *          </table>
@@ -2648,20 +2651,20 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  *          described in the H5Oget_info1() function entry.
  *
  *          The return values from an operator are:
- *          - Zero causes the visit iterator to continue, returning zero when all 
+ *          - Zero causes the visit iterator to continue, returning zero when all
  *            group members have been processed.
- *          - A positive value causes the visit iterator to immediately return that 
+ *          - A positive value causes the visit iterator to immediately return that
  *            positive value, indicating short-circuit success.
- *          - A negative value causes the visit iterator to immediately return that 
+ *          - A negative value causes the visit iterator to immediately return that
  *            value, indicating failure.
  *
- *          The H5Ovisit2() \p op_data parameter is a user-defined pointer to the data 
- *          required to process objects in the course of the iteration. This pointer 
- *          is passed back to each step of the iteration in the callback 
- *          function’s \p op_data parameter. 
+ *          The H5Ovisit2() \p op_data parameter is a user-defined pointer to the data
+ *          required to process objects in the course of the iteration. This pointer
+ *          is passed back to each step of the iteration in the callback
+ *          function’s \p op_data parameter.
  *
- *          The \p fields parameter contains flags to determine which fields will 
- *          be retrieved by the \p op callback function. These flags are defined 
+ *          The \p fields parameter contains flags to determine which fields will
+ *          be retrieved by the \p op callback function. These flags are defined
  *          in the H5Opublic.h file:
  *          \obj_info_fields
  *
@@ -2683,7 +2686,7 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -2694,7 +2697,7 @@ H5_DLL herr_t H5Ovisit_by_name1(hid_t loc_id, const char *obj_name, H5_index_t i
  *       the routine was called. The C++ application should save some
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
- *      
+ *
  * \since 1.10.3
  *
  */
@@ -2712,11 +2715,11 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *                     \p loc_id, that will serve as root of the iteration
  * \idx_type
  * \order
- * \param[in] op Callback function passing data regarding the object 
+ * \param[in] op Callback function passing data regarding the object
  *               to the calling application
- * \param[in] op_data User-defined pointer to data required by the application 
+ * \param[in] op_data User-defined pointer to data required by the application
  *                    for its processing of the object
- * \param[in] fields Flags specifying the fields to be retrieved to the 
+ * \param[in] fields Flags specifying the fields to be retrieved to the
  *                   callback function \p op
  * \lapl_id
  *
@@ -2731,22 +2734,22 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  * \deprecated As of HDF5-1.12 this function has been deprecated in favor of
  *             the function H5Ovisit_by_name3() or the macro #H5Ovisit_by_name.
  *
- * \details H5Ovisit_by_name2() is a recursive iteration function to visit 
- *          the object specified by the \p loc_id / \p obj_name parameter 
- *          pair and, if that object is a group, all objects in and below it 
- *          in an HDF5 file, thus providing a mechanism for an application to 
- *          perform a common set of operations across all of those objects or 
- *          a dynamically selected subset. For non-recursive iteration across 
+ * \details H5Ovisit_by_name2() is a recursive iteration function to visit
+ *          the object specified by the \p loc_id / \p obj_name parameter
+ *          pair and, if that object is a group, all objects in and below it
+ *          in an HDF5 file, thus providing a mechanism for an application to
+ *          perform a common set of operations across all of those objects or
+ *          a dynamically selected subset. For non-recursive iteration across
  *          the members of a group, see #H5Literate.
  *
  *          The object serving as the root of the iteration is specified
  *          by the \p loc_id / \p obj_name parameter pair. \p loc_id specifies
  *          a file or an object in a file;  if \p loc_id is an attribute identifier,
  *          the object where the attribute is attached will be used.
- *          \p obj_name specifies either an object in the file (with an absolute 
- *          name based in the file’s root group) or an object name relative 
+ *          \p obj_name specifies either an object in the file (with an absolute
+ *          name based in the file’s root group) or an object name relative
  *          to \p loc_id. If \p loc_id fully specifies the object that is to serve
- *          as the root of the iteration, \p obj_name should be '\c .' (a dot). 
+ *          as the root of the iteration, \p obj_name should be '\c .' (a dot).
  *          (Note that when \p loc_id fully specifies the object that is to serve
  *          as the root of the iteration, the user may wish to consider
  *          using H5Ovisit2() instead of #H5Ovisit_by_name.)
@@ -2763,12 +2766,12 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *
  *          \indexes
  *
- *          Note that the index type passed in \p idx_type is a 
- *          <em>best effort</em> setting. If the application passes in a 
- *          value indicating iteration in creation order and a group is 
- *          encountered that was not tracked in creation order, that group 
- *          will be iterated over in alpha-numeric order by name, or 
- *          <em>name order</em>.  (<em>Name order</em> is the native order 
+ *          Note that the index type passed in \p idx_type is a
+ *          <em>best effort</em> setting. If the application passes in a
+ *          value indicating iteration in creation order and a group is
+ *          encountered that was not tracked in creation order, that group
+ *          will be iterated over in alpha-numeric order by name, or
+ *          <em>name order</em>.  (<em>Name order</em> is the native order
  *          used by the HDF5 library and is always available.)
  *
  *          \p order specifies the order in which objects are to be inspected
@@ -2797,14 +2800,14 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *          that a link prefix be set in a link access property list
  *          (see H5Pset_elink_prefix()).
  *
- *          The \p fields parameter contains flags to determine which fields will 
- *          be retrieved by the \p op callback function. These flags are defined 
+ *          The \p fields parameter contains flags to determine which fields will
+ *          be retrieved by the \p op callback function. These flags are defined
  *          in the H5Opublic.h file:
  *          \obj_info_fields
  *
- *          #H5Lvisit_by_name and #H5Ovisit_by_name are companion 
- *          functions: one for examining and operating on links; the other 
- *          for examining and operating on the objects that those links point to. 
+ *          #H5Lvisit_by_name and #H5Ovisit_by_name are companion
+ *          functions: one for examining and operating on links; the other
+ *          for examining and operating on the objects that those links point to.
  *          Both functions ensure that by the time the function completes
  *          successfully, every link or object below the specified point
  *          in the file has been presented to the application for whatever
@@ -2816,7 +2819,7 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *       from normally.
  *
  * \note Examples of this kind of routine include callbacks such as
- *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and 
+ *       H5Pset_elink_cb() and H5Pset_type_conv_cb() and
  *       functions such as H5Tconvert() and H5Ewalk2().
  *
  * \note Exiting the routine in its normal fashion allows the HDF5
@@ -2827,7 +2830,7 @@ H5_DLL herr_t H5Ovisit2(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order
  *       the routine was called. The C++ application should save some
  *       state as the routine is started so that any problem that occurs
  *       might be diagnosed.
- *      
+ *
  * \since 1.10.3
  *
  */
diff --git a/src/H5PLpath.c b/src/H5PLpath.c
index d566f66..62ac936 100644
--- a/src/H5PLpath.c
+++ b/src/H5PLpath.c
@@ -686,7 +686,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__path_table_iterate_process_path() */
-#else  /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
 static herr_t
 H5PL__path_table_iterate_process_path(const char *plugin_path, H5PL_iterate_type_t iter_type,
                                       H5PL_iterate_t iter_op, void *op_data)
@@ -908,7 +908,7 @@ done:
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5PL__find_plugin_in_path() */
-#else  /* H5_HAVE_WIN32_API */
+#else /* H5_HAVE_WIN32_API */
 static herr_t
 H5PL__find_plugin_in_path(const H5PL_search_params_t *search_params, hbool_t *found, const char *dir,
                           const void **plugin_info)
diff --git a/src/H5Ppublic.h b/src/H5Ppublic.h
index 90383bd..dcf9104 100644
--- a/src/H5Ppublic.h
+++ b/src/H5Ppublic.h
@@ -334,8 +334,7 @@ H5_DLL hid_t H5Pcopy(hid_t plist_id);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const
-char *name);
+H5_DLL herr_t H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name);
 /**
  * \ingroup GPLO
  *
@@ -567,10 +566,9 @@ H5_DLL hid_t H5Pcreate(hid_t cls_id);
  * \since 1.4.0
  *
  */
-H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name,
-    H5P_cls_create_func_t create, void *create_data,
-    H5P_cls_copy_func_t copy, void *copy_data,
-    H5P_cls_close_func_t close, void *close_data);
+H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name, H5P_cls_create_func_t create, void *create_data,
+                             H5P_cls_copy_func_t copy, void *copy_data, H5P_cls_close_func_t close,
+                             void *close_data);
 /**
  * \ingroup GPLO
  *
@@ -599,7 +597,7 @@ H5_DLL hid_t H5Pcreate_class(hid_t parent, const char *name,
  * \since 1.10.0
  *
  */
-H5_DLL hid_t  H5Pdecode(const void *buf);
+H5_DLL hid_t H5Pdecode(const void *buf);
 /**
  * \ingroup GPLO
  *
@@ -723,7 +721,7 @@ H5_DLL htri_t H5Pexist(hid_t plist_id, const char *name);
  * \since 1.4.0
  *
  */
-H5_DLL herr_t H5Pget(hid_t plist_id, const char *name, void * value);
+H5_DLL herr_t H5Pget(hid_t plist_id, const char *name, void *value);
 /**
  *\ingroup GPLO
  *
@@ -1240,10 +1238,9 @@ H5_DLL herr_t H5Pget_size(hid_t id, const char *name, size_t *size);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size,
-    void *value, H5P_prp_set_func_t set, H5P_prp_get_func_t get,
-    H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy,
-    H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+H5_DLL herr_t H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value, H5P_prp_set_func_t set,
+                         H5P_prp_get_func_t get, H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy,
+                         H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
 /**
  * \ingroup GPLOA
  *
@@ -1335,8 +1332,7 @@ H5_DLL htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id);
  * \since 1.4.0
  *
  */
-H5_DLL int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func,
-            void *iter_data);
+H5_DLL int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data);
 /**
  * \ingroup GPLOA
  *
@@ -1620,11 +1616,10 @@ H5_DLL int H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size,
-    void *def_value, H5P_prp_create_func_t create,
-    H5P_prp_set_func_t set, H5P_prp_get_func_t get,
-    H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy,
-    H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
+H5_DLL herr_t H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value,
+                           H5P_prp_create_func_t create, H5P_prp_set_func_t set, H5P_prp_get_func_t get,
+                           H5P_prp_delete_func_t prp_del, H5P_prp_copy_func_t copy,
+                           H5P_prp_compare_func_t compare, H5P_prp_close_func_t close);
 /**
  * \ingroup GPLOA
  *
@@ -1866,12 +1861,9 @@ H5_DLL herr_t H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, un
  * \since 1.8.0
  *
  */
-H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx,
-       unsigned int *flags/*out*/,
-       size_t *cd_nelmts/*out*/,
-       unsigned cd_values[]/*out*/,
-       size_t namelen, char name[],
-       unsigned *filter_config /*out*/);
+H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags /*out*/,
+                                   size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                   char name[], unsigned *filter_config /*out*/);
 /**
  * \ingroup OCPL
  *
@@ -1927,10 +1919,9 @@ H5_DLL H5Z_filter_t H5Pget_filter2(hid_t plist_id, unsigned idx,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t filter_id,
-       unsigned int *flags/*out*/, size_t *cd_nelmts/*out*/,
-       unsigned cd_values[]/*out*/, size_t namelen, char name[]/*out*/,
-       unsigned *filter_config/*out*/);
+H5_DLL herr_t H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t filter_id, unsigned int *flags /*out*/,
+                                   size_t *cd_nelmts /*out*/, unsigned cd_values[] /*out*/, size_t namelen,
+                                   char name[] /*out*/, unsigned *filter_config /*out*/);
 /**
  * \ingroup OCPL
  *
@@ -2018,9 +2009,8 @@ H5_DLL herr_t H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter,
-        unsigned int flags, size_t cd_nelmts,
-        const unsigned int cd_values[/*cd_nelmts*/]);
+H5_DLL herr_t H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                               const unsigned int cd_values[/*cd_nelmts*/]);
 /**
  * \ingroup OCPL
  *
@@ -2494,9 +2484,8 @@ H5_DLL herr_t H5Pset_deflate(hid_t plist_id, unsigned level);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter,
-        unsigned int flags, size_t cd_nelmts,
-        const unsigned int c_values[]);
+H5_DLL herr_t H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, size_t cd_nelmts,
+                            const unsigned int c_values[]);
 /**
  * \ingroup OCPL
  *
@@ -2621,7 +2610,8 @@ H5_DLL herr_t H5Pget_file_space_page_size(hid_t plist_id, hsize_t *fsp_size);
  * \since 1.10.1
  *
  */
-H5_DLL herr_t H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy, hbool_t *persist, hsize_t *threshold);
+H5_DLL herr_t H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *strategy, hbool_t *persist,
+                                         hsize_t *threshold);
 /**
  * \ingroup FCPL
  *
@@ -2645,7 +2635,7 @@ H5_DLL herr_t H5Pget_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t *
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik/*out*/);
+H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out*/);
 /**
  * \ingroup FCPL
  *
@@ -2677,7 +2667,8 @@ H5_DLL herr_t H5Pget_istore_k(hid_t plist_id, unsigned *ik/*out*/);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags, unsigned *min_mesg_size);
+H5_DLL herr_t H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type_flags,
+                                       unsigned *min_mesg_size);
 /**
  * \ingroup FCPL
  *
@@ -2757,8 +2748,7 @@ H5_DLL herr_t H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list
  * \since  1.0.0
  *
  */
-H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/,
-       size_t *sizeof_size/*out*/);
+H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr /*out*/, size_t *sizeof_size /*out*/);
 /**
  * \ingroup FCPL
  *
@@ -2791,7 +2781,7 @@ H5_DLL herr_t H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr/*out*/,
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, unsigned *ik/*out*/, unsigned *lk/*out*/);
+H5_DLL herr_t H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out*/, unsigned *lk /*out*/);
 /**
  * \ingroup FCPL
  *
@@ -2868,7 +2858,8 @@ H5_DLL herr_t H5Pset_file_space_page_size(hid_t plist_id, hsize_t fsp_size);
  * \since 1.10.1
  *
  */
-H5_DLL herr_t H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold);
+H5_DLL herr_t H5Pset_file_space_strategy(hid_t plist_id, H5F_fspace_strategy_t strategy, hbool_t persist,
+                                         hsize_t threshold);
 /**
  * \ingroup FCPL
  *
@@ -2966,7 +2957,8 @@ H5_DLL herr_t H5Pset_istore_k(hid_t plist_id, unsigned ik);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags, unsigned min_mesg_size);
+H5_DLL herr_t H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_flags,
+                                       unsigned min_mesg_size);
 /**
  * \ingroup FCPL
  *
@@ -3058,8 +3050,7 @@ H5_DLL herr_t H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list,
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr,
-       size_t sizeof_size);
+H5_DLL herr_t H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size);
 /**
  * \ingroup FCPL
  *
@@ -3142,8 +3133,7 @@ H5_DLL herr_t H5Pset_userblock(hid_t plist_id, hsize_t size);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
-    hsize_t *alignment/*out*/);
+H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold /*out*/, hsize_t *alignment /*out*/);
 /**
  * \ingroup FAPL
  *
@@ -3178,10 +3168,8 @@ H5_DLL herr_t H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_cache(hid_t plist_id,
-       int *mdc_nelmts, /* out */
-       size_t *rdcc_nslots/*out*/,
-       size_t *rdcc_nbytes/*out*/, double *rdcc_w0);
+H5_DLL herr_t H5Pget_cache(hid_t plist_id, int *mdc_nelmts, /* out */
+                           size_t *rdcc_nslots /*out*/, size_t *rdcc_nbytes /*out*/, double *rdcc_w0);
 /**
  * \ingroup FAPL
  *
@@ -3381,8 +3369,8 @@ H5_DLL hid_t H5Pget_driver(hid_t plist_id);
  *
  */
 H5_DLL const void *H5Pget_driver_info(hid_t plist_id);
-H5_DLL herr_t H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size);
-H5_DLL herr_t H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close);
+H5_DLL herr_t      H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size);
+H5_DLL herr_t      H5Pget_evict_on_close(hid_t fapl_id, hbool_t *evict_on_close);
 /**
  * \ingroup FAPL
  *
@@ -3428,8 +3416,7 @@ H5_DLL herr_t H5Pget_family_offset(hid_t fapl_id, hsize_t *offset);
  */
 H5_DLL herr_t H5Pget_fclose_degree(hid_t fapl_id, H5F_close_degree_t *degree);
 H5_DLL herr_t H5Pget_file_image(hid_t fapl_id, void **buf_ptr_ptr, size_t *buf_len_ptr);
-H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id,
-       H5FD_file_image_callbacks_t *callbacks_ptr);
+H5_DLL herr_t H5Pget_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
 H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hbool_t *ignore_when_disabled);
 /**
  * \ingroup FAPL
@@ -3452,7 +3439,7 @@ H5_DLL herr_t H5Pget_file_locking(hid_t fapl_id, hbool_t *use_file_locking, hboo
  * \since 1.2.0
  *
  */
-H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/);
+H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref /*out*/);
 /**
  * \ingroup FAPL
  *
@@ -3483,13 +3470,12 @@ H5_DLL herr_t H5Pget_gc_references(hid_t fapl_id, unsigned *gc_ref/*out*/);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low,
-    H5F_libver_t *high);
-H5_DLL herr_t H5Pget_mdc_config(hid_t     plist_id,
-       H5AC_cache_config_t * config_ptr);    /* out */
+H5_DLL herr_t H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low, H5F_libver_t *high);
+H5_DLL herr_t H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr); /* out */
 H5_DLL herr_t H5Pget_mdc_image_config(hid_t plist_id, H5AC_cache_image_config_t *config_ptr /*out*/);
-H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location, size_t *location_size, hbool_t *start_on_access);
-H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size/*out*/);
+H5_DLL herr_t H5Pget_mdc_log_options(hid_t plist_id, hbool_t *is_enabled, char *location,
+                                     size_t *location_size, hbool_t *start_on_access);
+H5_DLL herr_t H5Pget_meta_block_size(hid_t fapl_id, hsize_t *size /*out*/);
 H5_DLL herr_t H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts);
 /**
  * \ingroup FAPL
@@ -3525,9 +3511,10 @@ H5_DLL herr_t H5Pget_metadata_read_attempts(hid_t plist_id, unsigned *attempts);
  */
 H5_DLL herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type);
 H5_DLL herr_t H5Pget_object_flush_cb(hid_t plist_id, H5F_flush_cb_t *func, void **udata);
-H5_DLL herr_t H5Pget_page_buffer_size(hid_t plist_id, size_t *buf_size, unsigned *min_meta_per, unsigned *min_raw_per);
-H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size/*out*/);
-H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size/*out*/);
+H5_DLL herr_t H5Pget_page_buffer_size(hid_t plist_id, size_t *buf_size, unsigned *min_meta_per,
+                                      unsigned *min_raw_per);
+H5_DLL herr_t H5Pget_sieve_buf_size(hid_t fapl_id, size_t *size /*out*/);
+H5_DLL herr_t H5Pget_small_data_block_size(hid_t fapl_id, hsize_t *size /*out*/);
 /**
  * \ingroup FAPL
  *
@@ -3600,8 +3587,7 @@ H5_DLL herr_t H5Pget_vol_info(hid_t plist_id, void **vol_info);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold,
-    hsize_t alignment);
+H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment);
 /**
  * \ingroup FAPL
  *
@@ -3696,9 +3682,8 @@ H5_DLL herr_t H5Pset_alignment(hid_t fapl_id, hsize_t threshold,
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts,
-       size_t rdcc_nslots, size_t rdcc_nbytes,
-       double rdcc_w0);
+H5_DLL herr_t H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nslots, size_t rdcc_nbytes,
+                           double rdcc_w0);
 H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size_t page_size);
 /**
  * \ingroup FAPL
@@ -3726,10 +3711,9 @@ H5_DLL herr_t H5Pset_core_write_tracking(hid_t fapl_id, hbool_t is_enabled, size
  *                documentation.
  *
  */
-H5_DLL herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id,
-        const void *driver_info);
-H5_DLL herr_t      H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size);
-H5_DLL herr_t      H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close);
+H5_DLL herr_t H5Pset_driver(hid_t plist_id, hid_t driver_id, const void *driver_info);
+H5_DLL herr_t H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size);
+H5_DLL herr_t H5Pset_evict_on_close(hid_t fapl_id, hbool_t evict_on_close);
 H5_DLL herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset);
 /**
  * \ingroup FAPL
@@ -3792,10 +3776,10 @@ H5_DLL herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset);
  *
  */
 H5_DLL herr_t H5Pset_fclose_degree(hid_t fapl_id, H5F_close_degree_t degree);
-H5_DLL herr_t      H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
-H5_DLL herr_t      H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
-H5_DLL herr_t      H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled);
-H5_DLL herr_t      H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
+H5_DLL herr_t H5Pset_file_image(hid_t fapl_id, void *buf_ptr, size_t buf_len);
+H5_DLL herr_t H5Pset_file_image_callbacks(hid_t fapl_id, H5FD_file_image_callbacks_t *callbacks_ptr);
+H5_DLL herr_t H5Pset_file_locking(hid_t fapl_id, hbool_t use_file_locking, hbool_t ignore_when_disabled);
+H5_DLL herr_t H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
 /**
  * \ingroup FAPL
  *
@@ -3917,7 +3901,8 @@ H5_DLL herr_t      H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
  *                  objects written with this setting may be accessible to a smaller
  *                  range of library versions than would be the case if low is set
  *                  to #H5F_LIBVER_EARLIEST.
- *              \li Earlier versions of the library may not be able to access objects created with this setting.
+ *              \li Earlier versions of the library may not be able to access objects created with this
+ * setting.
  *            </td>
  *           </tr>
  *          </table>
@@ -3927,17 +3912,16 @@ H5_DLL herr_t      H5Pset_gc_references(hid_t fapl_id, unsigned gc_ref);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
-    H5F_libver_t high);
-H5_DLL herr_t      H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr);
-H5_DLL herr_t      H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location,
-                                          hbool_t start_on_access);
-H5_DLL herr_t      H5Pset_meta_block_size(hid_t fapl_id, hsize_t size);
-H5_DLL herr_t      H5Pset_metadata_read_attempts(hid_t plist_id, unsigned attempts);
-H5_DLL herr_t      H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type);
-H5_DLL herr_t      H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata);
-H5_DLL herr_t      H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
-H5_DLL herr_t      H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
+H5_DLL herr_t H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low, H5F_libver_t high);
+H5_DLL herr_t H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr);
+H5_DLL herr_t H5Pset_mdc_log_options(hid_t plist_id, hbool_t is_enabled, const char *location,
+                                     hbool_t start_on_access);
+H5_DLL herr_t H5Pset_meta_block_size(hid_t fapl_id, hsize_t size);
+H5_DLL herr_t H5Pset_metadata_read_attempts(hid_t plist_id, unsigned attempts);
+H5_DLL herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type);
+H5_DLL herr_t H5Pset_object_flush_cb(hid_t plist_id, H5F_flush_cb_t func, void *udata);
+H5_DLL herr_t H5Pset_sieve_buf_size(hid_t fapl_id, size_t size);
+H5_DLL herr_t H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
 /**
  * \ingroup FAPL
  *
@@ -3956,7 +3940,7 @@ H5_DLL herr_t      H5Pset_small_data_block_size(hid_t fapl_id, hsize_t size);
  * \since 1.12.0
  *
  */
-H5_DLL herr_t      H5Pset_vol(hid_t plist_id, hid_t new_vol_id, const void *new_vol_info);
+H5_DLL herr_t H5Pset_vol(hid_t plist_id, hid_t new_vol_id, const void *new_vol_info);
 
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5Pset_all_coll_metadata_ops(hid_t plist_id, hbool_t is_collective);
@@ -4051,8 +4035,7 @@ H5_DLL herr_t H5Pfill_value_defined(hid_t plist, H5D_fill_value_t *status);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t
-    *alloc_time/*out*/);
+H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time /*out*/);
 /**
  * \ingroup DCPL
  *
@@ -4074,7 +4057,7 @@ H5_DLL herr_t H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t
  * \since 1.0.0
  *
  */
-H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/);
+H5_DLL int H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[] /*out*/);
 /**
  *
  * \ingroup DCPL
@@ -4156,9 +4139,8 @@ H5_DLL herr_t H5Pget_dset_no_attrs_hint(hid_t dcpl_id, hbool_t *minimize);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size,
-          char *name/*out*/, off_t *offset/*out*/,
-          hsize_t *size/*out*/);
+H5_DLL herr_t H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name /*out*/,
+                              off_t *offset /*out*/, hsize_t *size /*out*/);
 /**
  * \ingroup DCPL
  *
@@ -4219,8 +4201,7 @@ H5_DLL int H5Pget_external_count(hid_t plist_id);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t
-    *fill_time/*out*/);
+H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time /*out*/);
 /**
  * \ingroup DCPL
  *
@@ -4257,8 +4238,7 @@ H5_DLL herr_t H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id,
-     void *value/*out*/);
+H5_DLL herr_t H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value /*out*/);
 /**
  * \ingroup DCPL
  *
@@ -4313,7 +4293,7 @@ H5_DLL H5D_layout_t H5Pget_layout(hid_t plist_id);
  * \since 1.10.0
  *
  */
-H5_DLL herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count/*out*/);
+H5_DLL herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count /*out*/);
 /**
  * \ingroup DCPL
  *
@@ -4356,8 +4336,7 @@ H5_DLL herr_t H5Pget_virtual_count(hid_t dcpl_id, size_t *count/*out*/);
  * \since 1.10.0
  *
  */
-H5_DLL ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index,
-    char *name/*out*/, size_t size);
+H5_DLL ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
 /**
  * \ingroup DCPL
  *
@@ -4401,8 +4380,7 @@ H5_DLL ssize_t H5Pget_virtual_dsetname(hid_t dcpl_id, size_t index,
  * \since 1.10.0
  *
  */
-H5_DLL ssize_t H5Pget_virtual_filename(hid_t dcpl_id, size_t index,
-    char *name/*out*/, size_t size);
+H5_DLL ssize_t H5Pget_virtual_filename(hid_t dcpl_id, size_t index, char *name /*out*/, size_t size);
 /**
  * \ingroup DCPL
  *
@@ -4510,8 +4488,7 @@ H5_DLL hid_t H5Pget_virtual_vspace(hid_t dcpl_id, size_t index);
  * \since 1.6.0
  *
  */
-H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t
-    alloc_time);
+H5_DLL herr_t H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time);
 /**
  * \ingroup DCPL
  *
@@ -4666,8 +4643,7 @@ H5_DLL herr_t H5Pset_dset_no_attrs_hint(hid_t dcpl_id, hbool_t minimize);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset,
-          hsize_t size);
+H5_DLL herr_t H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size);
 /**
  * \ingroup DCPL
  *
@@ -4759,8 +4735,7 @@ H5_DLL herr_t H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id,
-     const void *value);
+H5_DLL herr_t H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value);
 /**
  * \ingroup DCPL
  *
@@ -4921,7 +4896,7 @@ H5_DLL herr_t H5Pset_layout(hid_t plist_id, H5D_layout_t layout);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t       H5Pset_nbit(hid_t plist_id);
+H5_DLL herr_t H5Pset_nbit(hid_t plist_id);
 /**
  * \ingroup DCPL
  *
@@ -5028,7 +5003,7 @@ H5_DLL herr_t       H5Pset_nbit(hid_t plist_id);
  * \since 1.8.0
  *
  */
-H5_DLL herr_t       H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
+H5_DLL herr_t H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_factor);
 /**
  * \ingroup DCPL
  *
@@ -5184,8 +5159,8 @@ H5_DLL herr_t       H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale
  *
  */
 H5_DLL herr_t H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block);
-H5_DLL herr_t       H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name,
-                                   const char *src_dset_name, hid_t src_space_id);
+H5_DLL herr_t H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *src_file_name,
+                             const char *src_dset_name, hid_t src_space_id);
 
 /* Dataset access property list (DAPL) routines */
 /**
@@ -5221,8 +5196,8 @@ H5_DLL herr_t       H5Pset_virtual(hid_t dcpl_id, hid_t vspace_id, const char *s
  * \since 1.10.0
  *
  */
-H5_DLL herr_t H5Pget_append_flush(hid_t dapl_id, unsigned dims,
-    hsize_t boundary[], H5D_append_cb_t *func, void **udata);
+H5_DLL herr_t H5Pget_append_flush(hid_t dapl_id, unsigned dims, hsize_t boundary[], H5D_append_cb_t *func,
+                                  void **udata);
 /**
  * \ingroup DAPL
  *
@@ -5253,10 +5228,8 @@ H5_DLL herr_t H5Pget_append_flush(hid_t dapl_id, unsigned dims,
  * \since 1.8.3
  *
  */
-H5_DLL herr_t H5Pget_chunk_cache(hid_t dapl_id,
-       size_t *rdcc_nslots/*out*/,
-       size_t *rdcc_nbytes/*out*/,
-       double *rdcc_w0/*out*/);
+H5_DLL herr_t H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots /*out*/, size_t *rdcc_nbytes /*out*/,
+                                 double *rdcc_w0 /*out*/);
 /**
  * \ingroup DAPL
  *
@@ -5296,7 +5269,7 @@ H5_DLL herr_t H5Pget_chunk_cache(hid_t dapl_id,
  * \since 1.10.0, 1.8.17
  *
  */
-H5_DLL ssize_t H5Pget_efile_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
+H5_DLL ssize_t H5Pget_efile_prefix(hid_t dapl_id, char *prefix /*out*/, size_t size);
 /**
  * \ingroup DAPL
  *
@@ -5330,7 +5303,7 @@ H5_DLL ssize_t H5Pget_efile_prefix(hid_t dapl_id, char* prefix /*out*/, size_t s
  * \since 1.10.2
  *
  */
-H5_DLL ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char* prefix /*out*/, size_t size);
+H5_DLL ssize_t H5Pget_virtual_prefix(hid_t dapl_id, char *prefix /*out*/, size_t size);
 /**
  * \ingroup DAPL
  *
@@ -5460,8 +5433,8 @@ H5_DLL herr_t H5Pget_virtual_view(hid_t dapl_id, H5D_vds_view_t *view);
  * \since 1.10.0
  *
  */
-H5_DLL herr_t H5Pset_append_flush(hid_t dapl_id, unsigned ndims,
-    const hsize_t boundary[], H5D_append_cb_t func, void *udata);
+H5_DLL herr_t H5Pset_append_flush(hid_t dapl_id, unsigned ndims, const hsize_t boundary[],
+                                  H5D_append_cb_t func, void *udata);
 /**
  * \ingroup DAPL
  *
@@ -5581,8 +5554,7 @@ H5_DLL herr_t H5Pset_append_flush(hid_t dapl_id, unsigned ndims,
  * \since 1.8.3
  *
  */
-H5_DLL herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots,
-       size_t rdcc_nbytes, double rdcc_w0);
+H5_DLL herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0);
 /**
  * \ingroup DAPL
  *
@@ -5650,7 +5622,7 @@ H5_DLL herr_t H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots,
  * \since 1.10.0, 1.8.17
  *
  */
-H5_DLL herr_t H5Pset_efile_prefix(hid_t dapl_id, const char* prefix);
+H5_DLL herr_t H5Pset_efile_prefix(hid_t dapl_id, const char *prefix);
 /**
  * \ingroup DAPL
  *
@@ -5676,7 +5648,7 @@ H5_DLL herr_t H5Pset_efile_prefix(hid_t dapl_id, const char* prefix);
  * \since 1.10.2
  *
  */
-H5_DLL herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char* prefix);
+H5_DLL herr_t H5Pset_virtual_prefix(hid_t dapl_id, const char *prefix);
 /**
  * \ingroup DAPL
  *
@@ -5759,11 +5731,9 @@ H5_DLL herr_t H5Pset_virtual_printf_gap(hid_t dapl_id, hsize_t gap_size);
 H5_DLL herr_t H5Pset_virtual_view(hid_t dapl_id, H5D_vds_view_t view);
 
 /* Dataset xfer property list (DXPL) routines */
-H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/,
-       double *middle/*out*/,
-       double *right/*out*/);
-H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
-        void **bkg/*out*/);
+H5_DLL herr_t H5Pget_btree_ratios(hid_t plist_id, double *left /*out*/, double *middle /*out*/,
+                                  double *right /*out*/);
+H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv /*out*/, void **bkg /*out*/);
 /**
  *
  * \ingroup DXPL
@@ -5800,20 +5770,15 @@ H5_DLL size_t H5Pget_buffer(hid_t plist_id, void **tconv/*out*/,
  * \since 1.8.0
  *
  */
-H5_DLL ssize_t H5Pget_data_transform(hid_t plist_id, char* expression /*out*/, size_t size);
+H5_DLL ssize_t   H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size);
 H5_DLL H5Z_EDC_t H5Pget_edc_check(hid_t plist_id);
-H5_DLL herr_t H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size/*out*/);
-H5_DLL int H5Pget_preserve(hid_t plist_id);
-H5_DLL herr_t H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void** operate_data);
-H5_DLL herr_t H5Pget_vlen_mem_manager(hid_t plist_id,
-                                       H5MM_allocate_t *alloc_func,
-                                       void **alloc_info,
-                                       H5MM_free_t *free_func,
-                                       void **free_info);
-H5_DLL herr_t H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
-       double right);
-H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv,
-        void *bkg);
+H5_DLL herr_t    H5Pget_hyper_vector_size(hid_t fapl_id, size_t *size /*out*/);
+H5_DLL int       H5Pget_preserve(hid_t plist_id);
+H5_DLL herr_t    H5Pget_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t *op, void **operate_data);
+H5_DLL herr_t    H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func, void **alloc_info,
+                                         H5MM_free_t *free_func, void **free_info);
+H5_DLL herr_t    H5Pset_btree_ratios(hid_t plist_id, double left, double middle, double right);
+H5_DLL herr_t    H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg);
 /**
  * \ingroup DXPL
  *
@@ -5847,17 +5812,14 @@ H5_DLL herr_t H5Pset_buffer(hid_t plist_id, size_t size, void *tconv,
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pset_data_transform(hid_t plist_id, const char* expression);
+H5_DLL herr_t H5Pset_data_transform(hid_t plist_id, const char *expression);
 H5_DLL herr_t H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check);
-H5_DLL herr_t H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func,
-                                     void* op_data);
+H5_DLL herr_t H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data);
 H5_DLL herr_t H5Pset_hyper_vector_size(hid_t fapl_id, size_t size);
 H5_DLL herr_t H5Pset_preserve(hid_t plist_id, hbool_t status);
-H5_DLL herr_t H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t op, void* operate_data);
-H5_DLL herr_t H5Pset_vlen_mem_manager(hid_t plist_id,
-                                       H5MM_allocate_t alloc_func,
-                                       void *alloc_info, H5MM_free_t free_func,
-                                       void *free_info);
+H5_DLL herr_t H5Pset_type_conv_cb(hid_t dxpl_id, H5T_conv_except_func_t op, void *operate_data);
+H5_DLL herr_t H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func, void *alloc_info,
+                                      H5MM_free_t free_func, void *free_info);
 #ifdef H5_HAVE_PARALLEL
 H5_DLL herr_t H5Pget_mpio_actual_chunk_opt_mode(hid_t                             plist_id,
                                                 H5D_mpio_actual_chunk_opt_mode_t *actual_chunk_opt_mode);
@@ -5918,7 +5880,8 @@ H5_DLL herr_t H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_int
 H5_DLL herr_t H5Pset_create_intermediate_group(hid_t plist_id, unsigned crt_intmd);
 
 /* Group creation property list (GCPL) routines */
-H5_DLL herr_t H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /* out */, unsigned *est_name_len /* out */);
+H5_DLL herr_t H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /* out */,
+                                   unsigned *est_name_len /* out */);
 /**
  * \ingroup GCPL
  *
@@ -5984,7 +5947,8 @@ H5_DLL herr_t H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_fla
  * \since 1.8.0
  *
  */
-H5_DLL herr_t H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned *min_dense /*out*/);
+H5_DLL herr_t H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/,
+                                       unsigned *min_dense /*out*/);
 H5_DLL herr_t H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/);
 H5_DLL herr_t H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name_len);
 /**
@@ -6949,15 +6913,15 @@ H5_DLL herr_t H5Pset_mcdt_search_cb(hid_t plist_id, H5O_mcdt_search_cb_t func, v
 /* Typedefs */
 
 /* Function prototypes */
-H5_DLL herr_t       H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
-                                 H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
-                                 H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
-                                 H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
-H5_DLL herr_t       H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
-                               H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
-                               H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
-                               H5P_prp_close_func_t prp_close);
-H5_DLL herr_t       H5Pencode1(hid_t plist_id, void *buf, size_t *nalloc);
+H5_DLL herr_t H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
+                           H5P_prp_create_func_t prp_create, H5P_prp_set_func_t prp_set,
+                           H5P_prp_get_func_t prp_get, H5P_prp_delete_func_t prp_del,
+                           H5P_prp_copy_func_t prp_copy, H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
+                         H5P_prp_set_func_t prp_set, H5P_prp_get_func_t prp_get,
+                         H5P_prp_delete_func_t prp_delete, H5P_prp_copy_func_t prp_copy,
+                         H5P_prp_close_func_t prp_close);
+H5_DLL herr_t H5Pencode1(hid_t plist_id, void *buf, size_t *nalloc);
 /**
  * \ingroup OCPL
  *
diff --git a/src/H5R.c b/src/H5R.c
index ef5d88b..8d8ecb1 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -585,7 +585,7 @@ H5Ropen_object_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, oapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on object ID")
             HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -747,7 +747,7 @@ H5Ropen_region_async(const char *app_file, const char *app_func, unsigned app_li
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, oapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDEC, H5I_INVALID_HID, "can't decrement count on region ID")
             HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINSERT, H5I_INVALID_HID, "can't insert token into event set")
@@ -916,7 +916,7 @@ H5Ropen_attr_async(const char *app_file, const char *app_func, unsigned app_line
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIu*Rriii", app_file, app_func, app_line, ref_ptr, rapl_id, aapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HGOTO_ERROR(H5E_REFERENCE, H5E_CANTDEC, H5I_INVALID_HID,
                             "can't decrement count on attribute ID")
diff --git a/src/H5Rpublic.h b/src/H5Rpublic.h
index 96db2a7..202b73b 100644
--- a/src/H5Rpublic.h
+++ b/src/H5Rpublic.h
@@ -277,7 +277,7 @@ H5_DLL H5R_type_t H5Rget_type(const H5R_ref_t *ref_ptr);
  *          H5R_ref_t[#H5R_REF_BUF_SIZE];
  *
  */
-H5_DLL htri_t     H5Requal(const H5R_ref_t *ref1_ptr, const H5R_ref_t *ref2_ptr);
+H5_DLL htri_t H5Requal(const H5R_ref_t *ref1_ptr, const H5R_ref_t *ref2_ptr);
 
 /**
  * --------------------------------------------------------------------------
@@ -295,7 +295,7 @@ H5_DLL htri_t     H5Requal(const H5R_ref_t *ref1_ptr, const H5R_ref_t *ref2_ptr)
  *          pointer to the destination reference.
  *
  */
-H5_DLL herr_t     H5Rcopy(const H5R_ref_t *src_ref_ptr, H5R_ref_t *dst_ref_ptr);
+H5_DLL herr_t H5Rcopy(const H5R_ref_t *src_ref_ptr, H5R_ref_t *dst_ref_ptr);
 
 /* Dereference */
 
diff --git a/src/H5Spublic.h b/src/H5Spublic.h
index e4163df..ffd5e60 100644
--- a/src/H5Spublic.h
+++ b/src/H5Spublic.h
@@ -167,9 +167,8 @@ H5_DLL herr_t H5Sclose(hid_t space_id);
  * \since 1.12.0
  *
  */
-H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op,
-    const hsize_t start[], const hsize_t stride[], const hsize_t count[],
-    const hsize_t block[]);
+H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
+                                  const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
 /**
  * \ingroup H5S
  *
@@ -190,7 +189,7 @@ H5_DLL hid_t H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op,
  *
  * \since 1.12.0
  *
-*/
+ */
 H5_DLL hid_t H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id);
 /**
  * \ingroup H5S
@@ -242,7 +241,7 @@ H5_DLL hid_t H5Scopy(hid_t space_id);
  * \since 1.0.0
  *
  */
-H5_DLL hid_t       H5Screate(H5S_class_t type);
+H5_DLL hid_t H5Screate(H5S_class_t type);
 /**
  * \ingroup H5S
  * \brief Creates a new simple dataspace and opens it for access
@@ -391,7 +390,7 @@ H5_DLL herr_t H5Sencode2(hid_t obj_id, void *buf, size_t *nalloc, hid_t fapl);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Sextent_copy(hid_t dst_id,hid_t src_id);
+H5_DLL herr_t H5Sextent_copy(hid_t dst_id, hid_t src_id);
 /**
  * \ingroup H5S
  *
@@ -443,8 +442,8 @@ H5_DLL htri_t H5Sextent_equal(hid_t space1_id, hid_t space2_id);
  * \since 1.10.0
  *
  */
-H5_DLL htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[],
-    hsize_t stride[], hsize_t count[], hsize_t block[]);
+H5_DLL htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[], hsize_t stride[], hsize_t count[],
+                                       hsize_t block[]);
 /**
  * \ingroup H5S
  *
@@ -480,8 +479,7 @@ H5_DLL htri_t H5Sget_regular_hyperslab(hid_t spaceid, hsize_t start[],
  * \since 1.2.0
  *
  */
-H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[],
-    hsize_t end[]);
+H5_DLL herr_t H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[]);
 /**
  * \ingroup H5S
  *
@@ -540,8 +538,8 @@ H5_DLL hssize_t H5Sget_select_elem_npoints(hid_t spaceid);
  * \since 1.2.0
  *
  */
-H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
-    hsize_t numpoints, hsize_t buf[/*numpoints*/]);
+H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoints,
+                                           hsize_t buf[/*numpoints*/]);
 /**
  * \ingroup H5S
  *
@@ -573,8 +571,8 @@ H5_DLL herr_t H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
  * \since 1.2.0
  *
  */
-H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
-    hsize_t numblocks, hsize_t buf[/*numblocks*/]);
+H5_DLL herr_t H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numblocks,
+                                            hsize_t buf[/*numblocks*/]);
 /**
  * \ingroup H5S
  *
@@ -677,8 +675,7 @@ H5_DLL H5S_sel_type H5Sget_select_type(hid_t spaceid);
  * \since 1.0.0
  *
  */
-H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[],
-   hsize_t maxdims[]);
+H5_DLL int H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[], hsize_t maxdims[]);
 /**
  * \ingroup H5S
  *
@@ -795,7 +792,7 @@ H5_DLL htri_t H5Sis_simple(hid_t space_id);
  *
  * \since 1.12.0
  *
-*/
+ */
 H5_DLL herr_t H5Smodify_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id);
 /**
  * \ingroup H5S
@@ -901,8 +898,8 @@ H5_DLL hid_t H5Ssel_iter_create(hid_t spaceid, size_t elmt_size, unsigned flags)
  * \since 1.12.0
  *
  */
-H5_DLL herr_t H5Ssel_iter_get_seq_list(hid_t sel_iter_id, size_t maxseq,
-    size_t maxbytes, size_t *nseq, size_t *nbytes, hsize_t *off, size_t *len);
+H5_DLL herr_t H5Ssel_iter_get_seq_list(hid_t sel_iter_id, size_t maxseq, size_t maxbytes, size_t *nseq,
+                                       size_t *nbytes, hsize_t *off, size_t *len);
 /**
  * \ingroup H5S
  *
@@ -1077,8 +1074,7 @@ H5_DLL herr_t H5Sselect_copy(hid_t dst_id, hid_t src_id);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op,
-    size_t num_elem, const hsize_t *coord);
+H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op, size_t num_elem, const hsize_t *coord);
 /**
  * \ingroup H5S
  *
@@ -1184,9 +1180,8 @@ H5_DLL herr_t H5Sselect_elements(hid_t space_id, H5S_seloper_t op,
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op,
-    const hsize_t start[], const hsize_t stride[], const hsize_t count[],
-    const hsize_t block[]);
+H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
+                                  const hsize_t stride[], const hsize_t count[], const hsize_t block[]);
 /*--------------------------------------------------------------------------*/
 /**\ingroup H5S
  *
@@ -1208,8 +1203,7 @@ H5_DLL herr_t H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op,
  * \since 1.12.0
  *
  */
-H5_DLL htri_t H5Sselect_intersect_block(hid_t space_id, const hsize_t *start,
-    const hsize_t *end);
+H5_DLL htri_t H5Sselect_intersect_block(hid_t space_id, const hsize_t *start, const hsize_t *end);
 /*--------------------------------------------------------------------------*/
 /**\ingroup H5S
  *
@@ -1248,8 +1242,8 @@ H5_DLL herr_t H5Sselect_none(hid_t spaceid);
  * \since 1.12.0
  *
  */
-H5_DLL hid_t H5Sselect_project_intersection(hid_t src_space_id,
-    hid_t dst_space_id, hid_t src_intersect_space_id);
+H5_DLL hid_t H5Sselect_project_intersection(hid_t src_space_id, hid_t dst_space_id,
+                                            hid_t src_intersect_space_id);
 /*--------------------------------------------------------------------------*/
 /**\ingroup H5S
  *
@@ -1341,8 +1335,7 @@ H5_DLL herr_t H5Sset_extent_none(hid_t space_id);
  * \since 1.0.0
  *
  */
-H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank,
-    const hsize_t dims[], const hsize_t max[]);
+H5_DLL herr_t H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[], const hsize_t max[]);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
diff --git a/src/H5TS.c b/src/H5TS.c
index f3b533d..09caf51 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -405,8 +405,7 @@ H5TS__mutex_acquire(H5TS_mutex_t *mutex, unsigned int lock_count, hbool_t *acqui
  *--------------------------------------------------------------------------
  */
 herr_t
-H5TSmutex_acquire(unsigned int lock_count, hbool_t *acquired)
-{
+H5TSmutex_acquire(unsigned int lock_count, hbool_t *acquired){
     FUNC_ENTER_API_NAMECHECK_ONLY
 
         /*NO TRACE*/
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 3eacea3..41191fa 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -222,7 +222,7 @@ H5Tcommit_async(const char *app_file, const char *app_func, unsigned app_line, h
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE10(FUNC, "*s*sIui*siiiii", app_file, app_func, app_line, loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id, es_id)) < 0)
-        /* clang-format on */
+            /* clang-format on */
             HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "can't insert token into event set")
 
 done:
@@ -733,7 +733,7 @@ H5Topen_async(const char *app_file, const char *app_func, unsigned app_line, hid
         /* clang-format off */
         if (H5ES_insert(es_id, vol_obj->connector, token,
                         H5ARG_TRACE7(FUNC, "*s*sIui*sii", app_file, app_func, app_line, loc_id, name, tapl_id, es_id)) < 0) {
-        /* clang-format on */
+            /* clang-format on */
             if (H5I_dec_app_ref_always_close(ret_value) < 0)
                 HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDEC, H5I_INVALID_HID,
                             "can't decrement count on datatype ID")
diff --git a/src/H5Tref.c b/src/H5Tref.c
index 0c17d49..8d7dca2 100644
--- a/src/H5Tref.c
+++ b/src/H5Tref.c
@@ -586,10 +586,10 @@ H5T__ref_mem_write(H5VL_object_t *src_file, const void *src_buf, size_t src_size
                    H5VL_object_t H5_ATTR_UNUSED *dst_file, void *dst_buf, size_t dst_size,
                    void H5_ATTR_UNUSED *bg_buf)
 {
-    H5F_t *         src_f     = NULL;
-    hid_t           file_id   = H5I_INVALID_HID;
-    H5R_ref_priv_t *dst_ref   = (H5R_ref_priv_t *)dst_buf;
-    H5R_ref_priv_t  tmp_ref;             /* Temporary reference to decode into */
+    H5F_t *         src_f   = NULL;
+    hid_t           file_id = H5I_INVALID_HID;
+    H5R_ref_priv_t *dst_ref = (H5R_ref_priv_t *)dst_buf;
+    H5R_ref_priv_t  tmp_ref; /* Temporary reference to decode into */
     herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
diff --git a/test/dsets.c b/test/dsets.c
index e7527a8..4f1cfff 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -7740,9 +7740,9 @@ error:
 static H5_ATTR_CONST long
 gcd(long l0, long r0)
 {
-    long magnitude, remainder;
+    long    magnitude, remainder;
     hbool_t negative = ((l0 < 0) != (r0 < 0));
-    long l = HDlabs(l0), r = HDlabs(r0);
+    long    l = HDlabs(l0), r = HDlabs(r0);
 
     do {
         if (l < r) {
diff --git a/test/links.c b/test/links.c
index 784a8eb..cb01007 100644
--- a/test/links.c
+++ b/test/links.c
@@ -631,7 +631,7 @@ cklinks(hid_t fapl, hbool_t new_format)
     if ((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
         FAIL_STACK_ERROR
 
-//! [H5Otoken_cmp_snip]
+    //! [H5Otoken_cmp_snip]
 
     /* Hard link */
     if (H5Oget_info_by_name3(file, "d1", &oinfo1, H5O_INFO_BASIC, H5P_DEFAULT) < 0)
@@ -644,7 +644,7 @@ cklinks(hid_t fapl, hbool_t new_format)
         TEST_ERROR
     } /* end if */
 
-//! [H5Otoken_cmp_snip]
+    //! [H5Otoken_cmp_snip]
 
     if (H5Otoken_cmp(file, &oinfo1.token, &oinfo2.token, &token_cmp) < 0)
         FAIL_STACK_ERROR
@@ -15799,7 +15799,7 @@ obj_visit(hid_t fapl, hbool_t new_format)
     if ((fid = build_visit_file(fapl)) < 0)
         TEST_ERROR
 
-//! [H5Ovisit3_snip]
+    //! [H5Ovisit3_snip]
 
     /* Visit all the objects reachable from the root group (with file ID) */
     udata.idx  = 0;
@@ -15807,7 +15807,7 @@ obj_visit(hid_t fapl, hbool_t new_format)
     if (H5Ovisit3(fid, H5_INDEX_NAME, H5_ITER_INC, visit_obj_cb, &udata, H5O_INFO_BASIC) < 0)
         FAIL_STACK_ERROR
 
-//! [H5Ovisit3_snip]
+    //! [H5Ovisit3_snip]
 
     /* Visit all the objects reachable from the root group (with group ID) */
     if ((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
@@ -15880,7 +15880,7 @@ obj_visit_by_name(hid_t fapl, hbool_t new_format)
     if ((fid = build_visit_file(fapl)) < 0)
         TEST_ERROR
 
-//! [H5Ovisit_by_name3_snip]
+    //! [H5Ovisit_by_name3_snip]
 
     /* Visit all the objects reachable from the root group (with file ID) */
     udata.idx  = 0;
@@ -15889,7 +15889,7 @@ obj_visit_by_name(hid_t fapl, hbool_t new_format)
                           H5P_DEFAULT) < 0)
         FAIL_STACK_ERROR
 
-//! [H5Ovisit_by_name3_snip]
+    //! [H5Ovisit_by_name3_snip]
 
     /* Visit all the objects reachable from the root group (with group ID) */
     if ((gid = H5Gopen2(fid, "/", H5P_DEFAULT)) < 0)
diff --git a/test/tfile.c b/test/tfile.c
index 9a94a7d..ed071d6 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -5182,11 +5182,11 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F
     group = H5Gcreate2(file, "/G1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
     CHECK(group, FAIL, "H5Gcreate");
 
-//! [H5Oget_native_info_snip]
+    //! [H5Oget_native_info_snip]
 
     ret = H5Oget_native_info(group, &ninfo, H5O_NATIVE_INFO_HDR);
 
-//! [H5Oget_native_info_snip]
+    //! [H5Oget_native_info_snip]
 
     CHECK(ret, FAIL, "H5Oget_native)info");
     VERIFY(ninfo.hdr.version, oh_vers_mod, "H5Oget_native_info");
@@ -5208,14 +5208,14 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F
     ret = H5Gclose(group);
     CHECK(ret, FAIL, "H5Gclose");
 
-//! [H5Oget_native_info_by_name_snip]
+    //! [H5Oget_native_info_by_name_snip]
 
     /*
      * Make sure the root group still has the correct object header version
      */
     ret = H5Oget_native_info_by_name(file, "/", &ninfo, H5O_NATIVE_INFO_HDR, H5P_DEFAULT);
 
-//! [H5Oget_native_info_by_name_snip]
+    //! [H5Oget_native_info_by_name_snip]
 
     CHECK(ret, FAIL, "H5Oget_native_info_by_name");
     VERIFY(ninfo.hdr.version, oh_vers_create, "H5Oget_native_info_by_name");
diff --git a/test/titerate.c b/test/titerate.c
index d0e7ca7..a39757e 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -53,7 +53,7 @@ typedef struct {
 #define CORRUPTED_ATNAMELEN_FILE "memleak_H5O_dtype_decode_helper_H5Odtype.h5"
 #define DSET_NAME                "image"
 typedef struct searched_err_t {
-    char message[256];
+    char    message[256];
     hbool_t found;
 } searched_err_t;
 
@@ -218,13 +218,13 @@ test_iter_group(hid_t fapl, hbool_t new_format)
                                          dataset_name, (size_t)NAMELEN, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Lget_name_by_idx");
 
-//! [H5Oget_info_by_idx3_snip]
+        //! [H5Oget_info_by_idx3_snip]
 
         ret = H5Oget_info_by_idx3(root_group, ".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &oinfo,
                                   H5O_INFO_BASIC, H5P_DEFAULT);
         CHECK(ret, FAIL, "H5Oget_info_by_idx");
 
-//! [H5Oget_info_by_idx3_snip]
+        //! [H5Oget_info_by_idx3_snip]
 
     } /* end for */
 
diff --git a/test/vol.c b/test/vol.c
index 53c760c..49c854f 100644
--- a/test/vol.c
+++ b/test/vol.c
@@ -950,13 +950,13 @@ test_basic_object_operation(void)
     if (H5Oget_info3(fid, &object_info, H5O_INFO_ALL) < 0)
         TEST_ERROR;
 
-//! [H5Oget_info_by_name3_snip]
+    //! [H5Oget_info_by_name3_snip]
 
     /* H5Oget_info_by_name */
     if (H5Oget_info_by_name3(fid, NATIVE_VOL_TEST_GROUP_NAME, &object_info, H5O_INFO_ALL, H5P_DEFAULT) < 0)
         TEST_ERROR;
 
-//! [H5Oget_info_by_name3_snip]
+    //! [H5Oget_info_by_name3_snip]
 
     /* H5Oexists_by_name */
     if (H5Oexists_by_name(fid, NATIVE_VOL_TEST_GROUP_NAME, H5P_DEFAULT) != TRUE)
diff --git a/tools/src/misc/h5delete.c b/tools/src/misc/h5delete.c
index 028c6c0..15a70d3 100644
--- a/tools/src/misc/h5delete.c
+++ b/tools/src/misc/h5delete.c
@@ -32,8 +32,8 @@ int
 main(int argc, const char *argv[])
 {
     hbool_t     quiet = FALSE;
-    const char  *name = NULL;
-    int         ret = 0;
+    const char *name  = NULL;
+    int         ret   = 0;
 
     switch (argc) {
         case 3:
@@ -42,7 +42,7 @@ main(int argc, const char *argv[])
                 return EXIT_FAILURE;
             }
             quiet = TRUE;
-            name = argv[2];
+            name  = argv[2];
             break;
         case 2:
             name = argv[1];
@@ -52,20 +52,22 @@ main(int argc, const char *argv[])
             return EXIT_FAILURE;
     }
 
-    H5E_BEGIN_TRY {
+    H5E_BEGIN_TRY
+    {
         /* Only uses the environment variable at this time */
         ret = (int)H5Fdelete(name, H5P_DEFAULT);
-    } H5E_END_TRY;
+    }
+    H5E_END_TRY;
 
     /* The native VOL connector does not implement the H5Fdelete() call
      * at this time, so try to remove the file via the POSIX remove(3)
      * call on failures.
      */
     if (ret < 0)
-        ret  = HDremove(name);
+        ret = HDremove(name);
 
     if (ret < 0 && !quiet)
-            HDfprintf(stderr, "Unable to delete storage at: %s\n", name);
+        HDfprintf(stderr, "Unable to delete storage at: %s\n", name);
 
     return ret < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 }