From eac05994c71a98a302674ab425a43758ecac9fd8 Mon Sep 17 00:00:00 2001
From: Dana Robinson <43805+derobins@users.noreply.github.com>
Date: Wed, 3 Feb 2021 06:19:58 -0800
Subject: [PATCH] Fixes bin/trace so it doesn't dirty the repo when autogen
 runs (#295)

* Fixes bin/trace so it doesn't dirty the repo when autogen runs

* Put the trace max back to 110 and comment off H5O.c line
---
 bin/trace  | 2 +-
 src/H5O.c  | 5 +++--
 src/H5TS.c | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/bin/trace b/bin/trace
index 824c90dd417..f8c26a65480 100755
--- a/bin/trace
+++ b/bin/trace
@@ -470,7 +470,7 @@ for $file (@ARGV) {
   $file_args = 0;
 
   # Ignore some files that do not need tracing macros
-  unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c") {
+  unless ($file eq "H5FDmulti.c" or $file eq "src/H5FDmulti.c" or $file eq "H5FDstdio.c" or $file eq "src/H5FDstdio.c" or $file eq "src/H5TS.c") {
 
     # Snarf up the entire file
     open SOURCE, $file or die "$file: $!\n";
diff --git a/src/H5O.c b/src/H5O.c
index 2cdb37d39f6..7be332b5dfd 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -1188,8 +1188,9 @@ 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);
+    /* clang-format off */
+    H5TRACE9("e", "*s*sIui*sxIuii", app_file, app_func, app_line, loc_id, name, oinfo, fields, lapl_id, es_id);
+    /* clang-format on */
 
     /* Set up request token pointer for asynchronous operation */
     if (H5ES_NONE != es_id)
diff --git a/src/H5TS.c b/src/H5TS.c
index 6c4bb6387d9..c5b2660f9c7 100644
--- a/src/H5TS.c
+++ b/src/H5TS.c
@@ -408,8 +408,6 @@ herr_t
 H5TSmutex_acquire(unsigned int lock_count, hbool_t *acquired){
     FUNC_ENTER_API_NAMECHECK_ONLY
 
-        /*NO TRACE*/
-
         FUNC_LEAVE_API_NAMECHECK_ONLY(H5TS__mutex_acquire(&H5_g.init_lock, lock_count, acquired))}
 /* end H5TSmutex_acquire() */
 
@@ -606,7 +604,6 @@ H5TSmutex_get_attempt_count(unsigned int *count)
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API_NAMECHECK_ONLY
-    /*NO TRACE*/
 
 #ifdef H5_HAVE_WIN_THREADS
     /* Add Win32 equivalent here when async is supported */
@@ -644,7 +641,6 @@ H5TSmutex_release(unsigned int *lock_count)
     herr_t ret_value = SUCCEED;
 
     FUNC_ENTER_API_NAMECHECK_ONLY
-    /*NO TRACE*/
 
     *lock_count = 0;
     if (0 != H5TS__mutex_unlock(&H5_g.init_lock, lock_count))