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 12538888159cc2dcf09e5c7d52e0da054d46e62a..cd5eea34043f5ab65c85c3f50113c3c6f0132228 100644 (file)
--- 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 6dc43749b7e52b2271b922c6065aa4844ed08bec..021f5f9d5d311eab9b381a09c4dc46b54e9cf2c5 100644 (file)
--- 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                             \