nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move util_bug into libtor-log

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-22 11:54:38 -04:00
parent 6fc2d53227
commit bcf3e546d1
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/address.h
View File

@ -15,7 +15,7 @@
#include "orconfig.h" #include "orconfig.h"
#include "lib/cc/torint.h" #include "lib/cc/torint.h"
#include "common/compat.h" #include "common/compat.h"
#include "common/util_bug.h" #include "lib/log/util_bug.h"
#ifdef ADDRESS_PRIVATE #ifdef ADDRESS_PRIVATE

2
src/common/include.am
View File

@ -40,7 +40,6 @@ LIBOR_A_SRC = \
src/common/confline.c \ src/common/confline.c \
src/common/memarea.c \ src/common/memarea.c \
src/common/util.c \ src/common/util.c \
src/common/util_bug.c \
src/common/util_format.c \ src/common/util_format.c \
src/common/util_process.c \ src/common/util_process.c \
src/common/sandbox.c \ src/common/sandbox.c \
@ -94,7 +93,6 @@ COMMONHEADERS = \
src/common/timers.h \ src/common/timers.h \
src/common/token_bucket.h \ src/common/token_bucket.h \
src/common/util.h \ src/common/util.h \
src/common/util_bug.h \
src/common/util_format.h \ src/common/util_format.h \
src/common/util_process.h \ src/common/util_process.h \
src/common/workqueue.h src/common/workqueue.h

2
src/common/token_bucket.c
View File

@ -20,7 +20,7 @@
#include "common/token_bucket.h" #include "common/token_bucket.h"
#include "common/compat.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. * Set the <b>rate</b> and <b>burst</b> value in a token_bucket_cfg.

2
src/common/util.h
View File

@ -32,7 +32,7 @@
#include "lib/intmath/muldiv.h" #include "lib/intmath/muldiv.h"
#include "lib/intmath/cmp.h" #include "lib/intmath/cmp.h"
#include "lib/log/ratelim.h" #include "lib/log/ratelim.h"
#include "common/util_bug.h" #include "lib/log/util_bug.h"
#ifndef O_BINARY #ifndef O_BINARY
#define O_BINARY 0 #define O_BINARY 0

2
src/lib/container/.may_include
View File

@ -13,4 +13,4 @@ ht.h
siphash.h siphash.h
# XXX I'd like to remove this. # XXX I'd like to remove this.
common/util_bug.h lib/log/util_bug.h

2
src/lib/container/map.c
View File

@ -17,7 +17,7 @@
#include "lib/string/util_string.h" #include "lib/string/util_string.h"
#include "lib/malloc/util_malloc.h" #include "lib/malloc/util_malloc.h"
#include "common/util_bug.h" #include "lib/log/util_bug.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

2
src/lib/container/order.c
View File

@ -14,7 +14,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "lib/container/order.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 /** Declare a function called <b>funcname</b> that acts as a find_nth_FOO
* function for an array of type <b>elt_t</b>*. * function for an array of type <b>elt_t</b>*.

2
src/lib/container/smartlist.c
View File

@ -21,7 +21,7 @@
#include "lib/string/util_string.h" #include "lib/string/util_string.h"
#include "lib/string/printf.h" #include "lib/string/printf.h"
#include "common/util_bug.h" #include "lib/log/util_bug.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

6
src/lib/log/include.am
View File

@ -7,7 +7,8 @@ endif
src_lib_libtor_log_a_SOURCES = \ src_lib_libtor_log_a_SOURCES = \
src/lib/log/ratelim.c \ 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_testing_a_SOURCES = \
$(src_lib_libtor_log_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 += \ noinst_HEADERS += \
src/lib/log/ratelim.h \ src/lib/log/ratelim.h \
src/lib/log/torlog.h src/lib/log/torlog.h \
src/lib/log/util_bug.h

4
src/common/util_bug.c → src/lib/log/util_bug.c
View File

@ -8,7 +8,7 @@
**/ **/
#include "orconfig.h" #include "orconfig.h"
#include "common/util_bug.h" #include "lib/log/util_bug.h"
#include "lib/log/torlog.h" #include "lib/log/torlog.h"
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
@ -41,7 +41,7 @@ tor_end_capture_bugs_(void)
return; return;
SMARTLIST_FOREACH(bug_messages, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(bug_messages, char *, cp, tor_free(cp));
smartlist_free(bug_messages); smartlist_free(bug_messages);
nn bug_messages = NULL; bug_messages = NULL;
} }
const smartlist_t * const smartlist_t *
tor_get_captured_bug_log_(void) tor_get_captured_bug_log_(void)

0
src/common/util_bug.h → src/lib/log/util_bug.h
View File