[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [tor/master] Expunge container.h
commit c2a558a346cf1f4db8751eb5c6dfecaab760a652
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date: Thu Jun 21 17:03:45 2018 -0400
Expunge container.h
---
src/common/address.h | 1 -
src/common/compat_time.c | 1 -
src/common/compat_winthreads.c | 1 -
src/common/memarea.c | 1 -
src/lib/container/container.h | 9 ---------
src/lib/container/include.am | 1 -
src/lib/container/map.c | 2 +-
src/lib/crypt_ops/crypto.c | 1 -
src/lib/crypt_ops/crypto_curve25519.c | 1 -
src/or/hs_client.c | 1 -
src/or/hs_descriptor.h | 1 -
src/test/test_bridges.c | 1 -
src/test/test_dir_common.c | 1 -
src/test/test_guardfraction.c | 1 -
src/test/test_routerlist.c | 1 -
15 files changed, 1 insertion(+), 23 deletions(-)
diff --git a/src/common/address.h b/src/common/address.h
index 87f29fc28..8abff072c 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -15,7 +15,6 @@
#include "orconfig.h"
#include "lib/cc/torint.h"
#include "common/compat.h"
-#include "lib/container/container.h"
#include "common/util_bug.h"
#ifdef ADDRESS_PRIVATE
diff --git a/src/common/compat_time.c b/src/common/compat_time.c
index 032c4e43a..4bb64f1e8 100644
--- a/src/common/compat_time.c
+++ b/src/common/compat_time.c
@@ -37,7 +37,6 @@
#include "lib/err/torerr.h"
#include "common/torlog.h"
#include "common/util.h"
-#include "lib/container/container.h"
#ifndef HAVE_GETTIMEOFDAY
#ifdef HAVE_FTIME
diff --git a/src/common/compat_winthreads.c b/src/common/compat_winthreads.c
index eeb0b9751..807c7b4ae 100644
--- a/src/common/compat_winthreads.c
+++ b/src/common/compat_winthreads.c
@@ -16,7 +16,6 @@
#include <windows.h>
#include <process.h>
#include "common/util.h"
-#include "lib/container/container.h"
#include "common/torlog.h"
/* This value is more or less total cargo-cult */
diff --git a/src/common/memarea.c b/src/common/memarea.c
index ef6b78ecc..ec10f0222 100644
--- a/src/common/memarea.c
+++ b/src/common/memarea.c
@@ -13,7 +13,6 @@
#include "common/util.h"
#include "common/compat.h"
#include "common/torlog.h"
-#include "lib/container/container.h"
#ifndef DISABLE_MEMORY_SENTINELS
diff --git a/src/lib/container/container.h b/src/lib/container/container.h
deleted file mode 100644
index 3dc70e635..000000000
--- a/src/lib/container/container.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Copyright (c) 2003-2004, Roger Dingledine
- * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
- * Copyright (c) 2007-2018, The Tor Project, Inc. */
-/* See LICENSE for licensing information */
-
-#ifndef TOR_CONTAINER_H
-#define TOR_CONTAINER_H
-
-#endif /* !defined(TOR_CONTAINER_H) */
diff --git a/src/lib/container/include.am b/src/lib/container/include.am
index e2994674a..0e7acdff9 100644
--- a/src/lib/container/include.am
+++ b/src/lib/container/include.am
@@ -19,7 +19,6 @@ src_lib_libtor_container_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS)
noinst_HEADERS += \
src/lib/container/bitarray.h \
src/lib/container/bloomfilt.h \
- src/lib/container/container.h \
src/lib/container/map.h \
src/lib/container/order.h \
src/lib/container/smartlist.h
diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index 508680e4a..f6b0f73c1 100644
--- a/src/lib/container/map.c
+++ b/src/lib/container/map.c
@@ -158,7 +158,7 @@ digest256map_assign_key(digest256map_entry_t *ent, const uint8_t *key)
/**
* Macro: implement all the functions for a map that are declared in
- * container.h by the DECLARE_MAP_FNS() macro. You must additionally define a
+ * map.h by the DECLARE_MAP_FNS() macro. You must additionally define a
* prefix_entry_free_() function to free entries (and their keys), a
* prefix_assign_tmp_key() function to temporarily set a stack-allocated
* entry to hold a key, and a prefix_assign_key() function to set a
diff --git a/src/lib/crypt_ops/crypto.c b/src/lib/crypt_ops/crypto.c
index 9b1c38041..46026b6ac 100644
--- a/src/lib/crypt_ops/crypto.c
+++ b/src/lib/crypt_ops/crypto.c
@@ -66,7 +66,6 @@ ENABLE_GCC_WARNING(redundant-decls)
#include "lib/cc/torint.h"
#include "lib/crypt_ops/aes.h"
#include "common/util.h"
-#include "lib/container/container.h"
#include "common/compat.h"
#include "common/sandbox.h"
#include "common/util_format.h"
diff --git a/src/lib/crypt_ops/crypto_curve25519.c b/src/lib/crypt_ops/crypto_curve25519.c
index 1e7a45625..03225f1c1 100644
--- a/src/lib/crypt_ops/crypto_curve25519.c
+++ b/src/lib/crypt_ops/crypto_curve25519.c
@@ -20,7 +20,6 @@
#ifdef HAVE_SYS_STAT_H
#include <sys/stat.h>
#endif
-#include "lib/container/container.h"
#include "lib/crypt_ops/crypto_curve25519.h"
#include "lib/crypt_ops/crypto_digest.h"
#include "lib/crypt_ops/crypto_format.h"
diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index a977fa44f..faccfae50 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -16,7 +16,6 @@
#include "or/config.h"
#include "or/connection.h"
#include "or/connection_edge.h"
-#include "lib/container/container.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "or/directory.h"
diff --git a/src/or/hs_descriptor.h b/src/or/hs_descriptor.h
index 640136f48..219b93444 100644
--- a/src/or/hs_descriptor.h
+++ b/src/or/hs_descriptor.h
@@ -13,7 +13,6 @@
#include "or/or.h"
#include "common/address.h"
-#include "lib/container/container.h"
#include "lib/crypt_ops/crypto.h"
#include "lib/crypt_ops/crypto_ed25519.h"
#include "trunnel/ed25519_cert.h" /* needed for trunnel */
diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c
index 127b58762..747984140 100644
--- a/src/test/test_bridges.c
+++ b/src/test/test_bridges.c
@@ -15,7 +15,6 @@
#include "common/address.h"
#include "or/bridges.h"
#include "or/config.h"
-#include "lib/container/container.h"
#include "or/transports.h"
#include "common/util.h"
diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 5212810b7..a758421cd 100644
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -6,7 +6,6 @@
#include "orconfig.h"
#define DIRVOTE_PRIVATE
#include "test/test.h"
-#include "lib/container/container.h"
#include "or/or.h"
#include "or/dirauth/dirvote.h"
#include "or/nodelist.h"
diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c
index 12e64d0e7..b7737cafa 100644
--- a/src/test/test_guardfraction.c
+++ b/src/test/test_guardfraction.c
@@ -9,7 +9,6 @@
#include "or/or.h"
#include "or/config.h"
#include "or/dirserv.h"
-#include "lib/container/container.h"
#include "or/entrynodes.h"
#include "common/util.h"
#include "or/routerparse.h"
diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c
index 5011e2285..5da42c133 100644
--- a/src/test/test_routerlist.c
+++ b/src/test/test_routerlist.c
@@ -16,7 +16,6 @@
#include "or/or.h"
#include "or/config.h"
#include "or/connection.h"
-#include "lib/container/container.h"
#include "or/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "or/directory.h"
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits