[tor-commits] [tor/master] Remove an extraneous parenthesis in IF_BUG_OHNCE__

nickm at torproject.org nickm at torproject.org
Wed Sep 14 14:54:37 UTC 2016


commit b88f918227bf888cf57095aa4c7072491738ac79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 14 10:53:49 2016 -0400

    Remove an extraneous parenthesis in IF_BUG_OHNCE__
    
    Fixes bug 20141; bugfix on 0.2.9.1-alpha.
    
    Patch from Gisle Vanem.
---
 changes/bug20141      | 4 ++++
 src/common/util_bug.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug20141 b/changes/bug20141
new file mode 100644
index 0000000..99ecf0a
--- /dev/null
+++ b/changes/bug20141
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Fix a syntax error in the IF_BUG_ONCE__() macro in non-
+      GCC-compatible compilers. Fixes bug 20141; bugfix on
+      0.2.9.1-alpha. Patch from Gisle Vanem.
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 8b69a47..e027781 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -117,7 +117,7 @@
 #else
 #define IF_BUG_ONCE__(cond,var)                                         \
   static int var = 0;                                                   \
-  if (PREDICT_UNLIKELY(cond)) ?                                         \
+  if (PREDICT_UNLIKELY(cond) ?                                          \
       (var ? 1 :                                                        \
        (var=1,                                                          \
         tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__,             \



More information about the tor-commits mailing list