Commit f6b8c7da authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Move buffers.c out of lib/containers to resolve a circularity.

parent c9f9c9bc

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -155,6 +155,8 @@ uptime-*.json 


# /src/lib

/src/lib/libcurve25519_donna.a

/src/lib/libtor-buf.a

/src/lib/libtor-buf-testing.a

/src/lib/libtor-compress.a

/src/lib/libtor-compress-testing.a

/src/lib/libtor-container.a

Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ endif 
TOR_UTIL_LIBS = \

        src/lib/libtor-geoip.a \

	src/lib/libtor-process.a \

        src/lib/libtor-buf.a \

	src/lib/libtor-time.a \

	src/lib/libtor-fs.a \

	src/lib/libtor-encoding.a \
@@ -72,6 +73,7 @@ if UNITTESTS_ENABLED 
TOR_UTIL_TESTING_LIBS = \

        src/lib/libtor-geoip-testing.a \

	src/lib/libtor-process-testing.a \

        src/lib/libtor-buf-testing.a \

	src/lib/libtor-time-testing.a \

	src/lib/libtor-fs-testing.a \

	src/lib/libtor-encoding-testing.a \

src/app/main/main.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

#include "lib/compress/compress.h"

#include "lib/container/buffers.h"

#include "lib/buf/buffers.h"

#include "lib/crypt_ops/crypto_rand.h"

#include "lib/crypt_ops/crypto_s2k.h"

#include "lib/geoip/geoip.h"

src/core/mainloop/connection.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define CONNECTION_PRIVATE

#include "core/or/or.h"

#include "feature/client/bridges.h"

#include "lib/container/buffers.h"

#include "lib/buf/buffers.h"

#include "lib/tls/buffers_tls.h"

#include "lib/err/backtrace.h"

src/core/mainloop/mainloop.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

#include "lib/container/buffers.h"

#include "lib/buf/buffers.h"

#include "lib/crypt_ops/crypto_rand.h"

#include "lib/err/backtrace.h"

#include "lib/tls/buffers_tls.h"