diff --git a/.clang-format b/.clang-format
index 0b6225579c0..1014e23802a 100644
--- a/.clang-format
+++ b/.clang-format
@@ -68,12 +68,14 @@ StatementMacros:
   - CATCH
   - END_MEMBERS
   - FUNC_ENTER_API
+  - FUNC_ENTER_API_NAMECHECK_ONLY
   - FUNC_ENTER_NOAPI
   - FUNC_ENTER_NOAPI_NOERR
   - FUNC_ENTER_NOAPI_NOINIT
   - FUNC_ENTER_NOAPI_NOINIT_NOERR
   - FUNC_ENTER_PACKAGE
   - FUNC_LEAVE_API
+  - FUNC_LEAVE_API_NAMECHECK_ONLY
   - FUNC_LEAVE_NOAPI
   - FUNC_LEAVE_NOAPI_NOFS
   - H5E_END_TRY
diff --git a/src/H5TS.c b/src/H5TS.c
index 8aadd904c34..30862401f6c 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -414,10 +414,12 @@ H5TS__mutex_acquire(H5TS_mutex_t *mutex, unsigned int lock_count, bool *acquired
  *--------------------------------------------------------------------------
  */
 herr_t
-H5TSmutex_acquire(unsigned int lock_count, bool *acquired){
+H5TSmutex_acquire(unsigned int lock_count, bool *acquired)
+{
     FUNC_ENTER_API_NAMECHECK_ONLY
 
-        FUNC_LEAVE_API_NAMECHECK_ONLY(H5TS__mutex_acquire(&H5_g.init_lock, lock_count, acquired))}
+    FUNC_LEAVE_API_NAMECHECK_ONLY(H5TS__mutex_acquire(&H5_g.init_lock, lock_count, acquired))
+}
 /* end H5TSmutex_acquire() */
 
 /*--------------------------------------------------------------------------
@@ -440,7 +442,8 @@ H5TSmutex_acquire(unsigned int lock_count, bool *acquired){
  *
  *--------------------------------------------------------------------------
  */
-herr_t H5TS_mutex_lock(H5TS_mutex_t *mutex)
+herr_t
+H5TS_mutex_lock(H5TS_mutex_t *mutex)
 {
     herr_t ret_value = SUCCEED;