Refactor the assertion-failure code into a function

src/common/util.c

@@ -93,6 +93,20 @@
 #include <sys/wait.h>
 #endif
 
+/* =====
+ * Assertion helper.
+ * ===== */
+/** Helper for tor_assert: report the assertion failure. */
+void
+tor_assertion_failed_(const char *fname, unsigned int line,
+                      const char *func, const char *expr)
+{
+  log_err(LD_BUG, "%s:%u: %s: Assertion %s failed; aborting.",
+          fname, line, func, expr);
+  fprintf(stderr,"%s:%u: %s: Assertion %s failed; aborting.\n",
+          fname, line, func, expr);
+}
+
 /* =====
  * Memory management
  * ===== */
@@ -5057,4 +5071,3 @@ tor_weak_random_range(tor_weak_rng_t *rng, int32_t top)
   } while (result >= top);
   return result;
 }
-

src/common/util.h

@@ -48,13 +48,13 @@
 /** Like assert(3), but send assertion failures to the log as well as to
  * stderr. */
 #define tor_assert(expr) STMT_BEGIN                                     \
-    if (PREDICT_UNLIKELY(!(expr))) {                                    \
+  if (PREDICT_UNLIKELY(!(expr))) {                                      \
-      log_err(LD_BUG, "%s:%d: %s: Assertion %s failed; aborting.",      \
+    tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr);     \
-          SHORT_FILE__, __LINE__, __func__, #expr);                     \
+    abort();                                                            \
-      fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n",      \
+  } STMT_END
-              SHORT_FILE__, __LINE__, __func__, #expr);                 \
+
-      abort();                                                          \
+void tor_assertion_failed_(const char *fname, unsigned int line,
-    } STMT_END
+                           const char *func, const char *expr);
 
 /* If we're building with dmalloc, we want all of our memory allocation
  * functions to take an extra file/line pair of arguments.  If not, not.