[tor-commits] [tor/master] Remove DIR_SPOOL_CACHED_DIR: Nothing uses it.

nickm at torproject.org nickm at torproject.org
Tue Mar 28 17:59:43 UTC 2017


commit 8587f663ee5f8f4af4fbbd5542116eb22ed1814e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 13 08:02:25 2017 -0400

    Remove DIR_SPOOL_CACHED_DIR: Nothing uses it.
---
 src/or/dirserv.c | 2 --
 src/or/or.h      | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index f01668a..74617ff 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -3754,8 +3754,6 @@ connection_dirserv_flushed_some(dir_connection_t *conn)
       return connection_dirserv_add_servers_to_outbuf(conn);
     case DIR_SPOOL_MICRODESC:
       return connection_dirserv_add_microdescs_to_outbuf(conn);
-    case DIR_SPOOL_CACHED_DIR:
-      return connection_dirserv_add_dir_bytes_to_outbuf(conn);
     case DIR_SPOOL_NETWORKSTATUS:
       return connection_dirserv_add_networkstatus_bytes_to_outbuf(conn);
     case DIR_SPOOL_NONE:
diff --git a/src/or/or.h b/src/or/or.h
index 0e2dc24..dee8b85 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1735,7 +1735,7 @@ typedef struct entry_connection_t {
 typedef enum {
     DIR_SPOOL_NONE=0, DIR_SPOOL_SERVER_BY_DIGEST, DIR_SPOOL_SERVER_BY_FP,
     DIR_SPOOL_EXTRA_BY_DIGEST, DIR_SPOOL_EXTRA_BY_FP,
-    DIR_SPOOL_CACHED_DIR, DIR_SPOOL_NETWORKSTATUS,
+    DIR_SPOOL_NETWORKSTATUS,
     DIR_SPOOL_MICRODESC, /* NOTE: if we add another entry, add another bit. */
 } dir_spool_source_t;
 #define dir_spool_source_bitfield_t ENUM_BF(dir_spool_source_t)





More information about the tor-commits mailing list