From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 8 Aug 2017 19:10:32 +0000 (-0400)
Subject: Move buffers.c and buffers_tls.c into src/common
X-Git-Tag: tor-0.3.2.1-alpha~107^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=336aa21e37b6c5bd4f1215ceba27c21f6c43dce7;p=thirdparty%2Ftor.git

Move buffers.c and buffers_tls.c into src/common

These are no longer tor-specific, so they can be part of the
infrastructure.
---

diff --git a/src/or/buffers.c b/src/common/buffers.c
similarity index 100%
rename from src/or/buffers.c
rename to src/common/buffers.c
diff --git a/src/or/buffers.h b/src/common/buffers.h
similarity index 100%
rename from src/or/buffers.h
rename to src/common/buffers.h
diff --git a/src/or/buffers_tls.c b/src/common/buffers_tls.c
similarity index 100%
rename from src/or/buffers_tls.c
rename to src/common/buffers_tls.c
diff --git a/src/or/buffers_tls.h b/src/common/buffers_tls.h
similarity index 100%
rename from src/or/buffers_tls.h
rename to src/common/buffers_tls.h
diff --git a/src/common/include.am b/src/common/include.am
index 1253888815..cd5eea3404 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -81,6 +81,7 @@ src_common_libor_ctime_testing_a_CFLAGS = @CFLAGS_CONSTTIME@ $(TEST_CFLAGS)
 LIBOR_A_SRC = \
   src/common/address.c					\
   src/common/backtrace.c				\
+  src/common/buffers.c					\
   src/common/compat.c					\
   src/common/compat_threads.c				\
   src/common/compat_time.c				\
@@ -110,6 +111,7 @@ src/common/src_common_libor_testing_a-log.$(OBJEXT) \
 
 LIBOR_CRYPTO_A_SRC = \
   src/common/aes.c		\
+  src/common/buffers_tls.c	\
   src/common/compress.c	\
   src/common/compress_lzma.c	\
   src/common/compress_none.c	\
@@ -147,6 +149,8 @@ src_common_libor_event_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
 COMMONHEADERS = \
   src/common/address.h				\
   src/common/backtrace.h			\
+  src/common/buffers.h				\
+  src/common/buffers_tls.h			\
   src/common/aes.h				\
   src/common/ciphers.inc			\
   src/common/compat.h				\
diff --git a/src/or/include.am b/src/or/include.am
index 6dc43749b7..021f5f9d5d 100644
--- a/src/or/include.am
+++ b/src/or/include.am
@@ -20,8 +20,6 @@ EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake
 LIBTOR_A_SOURCES = \
 	src/or/addressmap.c				\
 	src/or/bridges.c				\
-	src/or/buffers.c				\
-	src/or/buffers_tls.c				\
 	src/or/channel.c				\
 	src/or/channelpadding.c				\
 	src/or/channeltls.c				\
@@ -156,8 +154,6 @@ endif
 ORHEADERS = \
 	src/or/addressmap.h				\
 	src/or/bridges.h				\
-	src/or/buffers.h				\
-	src/or/buffers_tls.h				\
 	src/or/channel.h				\
 	src/or/channelpadding.h				\
 	src/or/channeltls.h				\