Move util_bug into libtor-log

diff --git a/src/common/address.h b/src/common/address.h
index 8abff072c0a7b11cb0c215a97117ab81f2d5f971..b95ee364ab904b84032172e9bd212491c1079565 100644 (file)
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -15,7 +15,7 @@
 #include "orconfig.h"
 #include "lib/cc/torint.h"
 #include "common/compat.h"
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 #ifdef ADDRESS_PRIVATE
 

diff --git a/src/common/include.am b/src/common/include.am
index d4404fb1b7115345332e8dbb7693a4c0580c2f04..4927f574259748fb0b01e61f30b7ed38d394b0d9 100644 (file)
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -40,7 +40,6 @@ LIBOR_A_SRC = \
   src/common/confline.c                                        \
   src/common/memarea.c                                 \
   src/common/util.c                                    \
-  src/common/util_bug.c                                        \
   src/common/util_format.c                             \
   src/common/util_process.c                            \
   src/common/sandbox.c                                 \
@@ -94,7 +93,6 @@ COMMONHEADERS = \
   src/common/timers.h                          \
   src/common/token_bucket.h                    \
   src/common/util.h                            \
-  src/common/util_bug.h                                \
   src/common/util_format.h                     \
   src/common/util_process.h                    \
   src/common/workqueue.h

diff --git a/src/common/token_bucket.c b/src/common/token_bucket.c
index 502e8eac56bff0ee22463d226b96fb44f29f26e1..3a16720d7f1df4209e65c7352e2f95d472c7b552 100644 (file)
--- a/src/common/token_bucket.c
+++ b/src/common/token_bucket.c
@@ -20,7 +20,7 @@
 
 #include "common/token_bucket.h"
 #include "common/compat.h"
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 /**
  * Set the <b>rate</b> and <b>burst</b> value in a token_bucket_cfg.

diff --git a/src/common/util.h b/src/common/util.h
index 3f6476d753fd98669f4f90324fc811d53fe1f400..d1b4e8fe9e1e81acc2c36172e1b226ad26eb6aa5 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -32,7 +32,7 @@
 #include "lib/intmath/muldiv.h"
 #include "lib/intmath/cmp.h"
 #include "lib/log/ratelim.h"
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0

diff --git a/src/lib/container/.may_include b/src/lib/container/.may_include
index 42458b29536b525d57eaf917ff00ca8e9ed991c7..1114ad84539c23c16718d958d33346252bac1fd4 100644 (file)
--- a/src/lib/container/.may_include
+++ b/src/lib/container/.may_include
@@ -13,4 +13,4 @@ ht.h
 siphash.h
 
 # XXX I'd like to remove this.
-common/util_bug.h
+lib/log/util_bug.h

diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index ba59e37d6fb8d06e690f76ec9f43915a78cff362..5f280b3169b048fdc036d6fafadd7ea40bf0a9f1 100644 (file)
--- a/src/lib/container/map.c
+++ b/src/lib/container/map.c
@@ -17,7 +17,7 @@
 #include "lib/string/util_string.h"
 #include "lib/malloc/util_malloc.h"
 
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/lib/container/order.c b/src/lib/container/order.c
index 599f8330072fbae6288d327e0ade44242d219f7c..4fdd51d996967777ec913085acd2959933bedd9c 100644 (file)
--- a/src/lib/container/order.c
+++ b/src/lib/container/order.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 
 #include "lib/container/order.h"
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 /** Declare a function called <b>funcname</b> that acts as a find_nth_FOO
  * function for an array of type <b>elt_t</b>*.

diff --git a/src/lib/container/smartlist.c b/src/lib/container/smartlist.c
index 9d405085be6b6d6aa128173b0667105a4b0994d7..852a32810d2d3ae09b853bcde9cf5bdd83249997 100644 (file)
--- a/src/lib/container/smartlist.c
+++ b/src/lib/container/smartlist.c
@@ -21,7 +21,7 @@
 #include "lib/string/util_string.h"
 #include "lib/string/printf.h"
 
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/lib/log/include.am b/src/lib/log/include.am
index f9f327e2d7e5212559941e25d8fa2202394b3548..e3041ed78d441941dc50b54d32dbbd64b27ce8ea 100644 (file)
--- a/src/lib/log/include.am
+++ b/src/lib/log/include.am
@@ -7,7 +7,8 @@ endif
 
 src_lib_libtor_log_a_SOURCES =                 \
        src/lib/log/ratelim.c                   \
-       src/lib/log/torlog.c
+       src/lib/log/torlog.c                    \
+       src/lib/log/util_bug.c
 
 src_lib_libtor_log_testing_a_SOURCES = \
        $(src_lib_libtor_log_a_SOURCES)
@@ -16,4 +17,5 @@ src_lib_libtor_log_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 
 noinst_HEADERS +=                                      \
        src/lib/log/ratelim.h                           \
-       src/lib/log/torlog.h
+       src/lib/log/torlog.h                            \
+       src/lib/log/util_bug.h

diff --git a/src/common/util_bug.c b/src/lib/log/util_bug.c
similarity index 98%
rename from src/common/util_bug.c
rename to src/lib/log/util_bug.c
index c68519b7467582bcaca2c3662ad513a5b822d739..cdd86242992356eef7218a6522d48491c41290b0 100644 (file)
--- a/src/common/util_bug.c
+++ b/src/lib/log/util_bug.c
@@ -8,7 +8,7 @@
  **/
 
 #include "orconfig.h"
-#include "common/util_bug.h"
+#include "lib/log/util_bug.h"
 #include "lib/log/torlog.h"
 #include "lib/err/backtrace.h"
 #ifdef TOR_UNIT_TESTS
@@ -41,7 +41,7 @@ tor_end_capture_bugs_(void)
     return;
   SMARTLIST_FOREACH(bug_messages, char *, cp, tor_free(cp));
   smartlist_free(bug_messages);
-nn  bug_messages = NULL;
+  bug_messages = NULL;
 }
 const smartlist_t *
 tor_get_captured_bug_log_(void)

diff --git a/src/common/util_bug.h b/src/lib/log/util_bug.h
similarity index 100%
rename from src/common/util_bug.h
rename to src/lib/log/util_bug.h