From 4fea1bcccd283a407fe0936c56e56cc40a019b3c Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@lbl.gov>
Date: Thu, 26 Nov 2020 11:11:35 -0600
Subject: Minor cleanups (#132)

---
 src/H5.c        | 10 +++++-----
 src/H5Apublic.h | 42 +++++++++++++++++++++---------------------
 src/H5F.c       |  2 +-
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/H5.c b/src/H5.c
index 68ee335..03a8714 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -101,12 +101,12 @@ DESCRIPTION
 herr_t
 H5__init_package(void)
 {
-    herr_t          ret_value = SUCCEED; /* Return value */
+    herr_t ret_value = SUCCEED; /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT
 
     /* Run the library initialization routine, if it hasn't already ran */
-    if (!H5_INIT_GLOBAL && !H5_TERM_GLOBAL) {                                                                \
+    if (!H5_INIT_GLOBAL && !H5_TERM_GLOBAL) {
         if (H5_init_library() < 0)
             HGOTO_ERROR(H5E_LIB, H5E_CANTINIT, FAIL, "unable to initialize library")
     } /* end if */
@@ -137,7 +137,7 @@ H5_init_library(void)
     /* Set the 'library initialized' flag as early as possible, to avoid
      * possible re-entrancy.
      */
-    H5_INIT_GLOBAL = TRUE;                                                                               \
+    H5_INIT_GLOBAL = TRUE;
 
     FUNC_ENTER_NOAPI(FAIL)
 
@@ -404,7 +404,7 @@ H5_term_library(void)
             HDfprintf(stderr, "      %s\n", loop);
 #ifndef NDEBUG
             HDabort();
-#endif    /* NDEBUG */
+#endif /* NDEBUG */
         } /* end if */
     }     /* end if */
 
@@ -1117,7 +1117,7 @@ H5is_library_threadsafe(hbool_t *is_ts)
     /* At this time, it is impossible for this to fail. */
 #ifdef H5_HAVE_THREADSAFE
     *is_ts = TRUE;
-#else  /* H5_HAVE_THREADSAFE */
+#else /* H5_HAVE_THREADSAFE */
     *is_ts = FALSE;
 #endif /* H5_HAVE_THREADSAFE */
 
diff --git a/src/H5Apublic.h b/src/H5Apublic.h
index 3b836e7..c3442b8 100644
--- a/src/H5Apublic.h
+++ b/src/H5Apublic.h
@@ -45,27 +45,6 @@ typedef herr_t (*H5A_operator2_t)(hid_t location_id /*in*/, const char *attr_nam
 extern "C" {
 #endif
 
-/*-------------------------------------------------------------------------*/
-/**
- * \ingroup H5A
- *
- * \brief Closes the specified attribute
- *
- * \attr_id
- *
- * \return \herr_t
- *
- * \details H5Aclose() terminates access to the attribute specified by
- *          \p attr_id by releasing the identifier.
- *
- * \attention Further use of a released attribute identifier is illegal; a
- *            function using such an identifier will generate an error.
- *
- * \since 1.0.0
- *
- * \see H5Acreate(), H5Aopen()
- */
-H5_DLL herr_t  H5Aclose(hid_t attr_id);
 /* --------------------------------------------------------------------------*/
 /**
  * \ingroup H5A
@@ -372,6 +351,27 @@ H5_DLL herr_t H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t id
                                hsize_t n, hid_t lapl_id);
 H5_DLL htri_t H5Aexists(hid_t obj_id, const char *attr_name);
 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
+ *
+ * \brief Closes the specified attribute
+ *
+ * \attr_id
+ *
+ * \return \herr_t
+ *
+ * \details H5Aclose() terminates access to the attribute specified by
+ *          \p attr_id by releasing the identifier.
+ *
+ * \attention Further use of a released attribute identifier is illegal; a
+ *            function using such an identifier will generate an error.
+ *
+ * \since 1.0.0
+ *
+ * \see H5Acreate(), H5Aopen()
+ */
+H5_DLL herr_t H5Aclose(hid_t attr_id);
 
 /* Symbols defined for compatibility with previous versions of the HDF5 API.
  *
diff --git a/src/H5F.c b/src/H5F.c
index cfad9a2..000d74b 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -1051,7 +1051,7 @@ H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config /*out*/)
 
     /* Check args */
     if ((NULL == config) || (config->version != H5AC__CURR_CACHE_CONFIG_VERSION))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad configptr")
+        HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Bad config ptr")
 
     /* Get the file object */
     if (NULL == (vol_obj = (H5VL_object_t *)H5I_object(file_id)))
-- 
cgit v0.12