From d56a65c497fe8ca856a8e5842660ec720204e728 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 30 Nov 2005 06:38:41 +0000
Subject: [PATCH] Fix some verbose warnings and remove an unneeded include.

svn:r5472
---
 src/common/log.c         | 4 ++++
 src/or/connection_edge.c | 1 -
 src/or/or.h              | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common/log.c b/src/common/log.c
index 6f6c403f53..93fd854f4e 100644
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -67,7 +67,9 @@ static int syslog_count = 0;
 
 static void delete_log(logfile_t *victim);
 static void close_log(logfile_t *victim);
+#if 0
 static int reset_log(logfile_t *lf);
+#endif
 
 /** Helper: Write the standard prefix for log lines to a
  * <b>buf_len</b> character buffer in <b>buf</b>.
@@ -382,6 +384,7 @@ close_log(logfile_t *victim)
   }
 }
 
+#if 0
 /** Helper: reset a single logfile_t.  For a file log, this involves
  * closing and reopening the log, and maybe writing the version.  For
  * other log types, do nothing. */
@@ -399,6 +402,7 @@ reset_log(logfile_t *lf)
   }
   return 0;
 }
+#endif
 
 /** Add a log handler to send all messages of severity <b>loglevel</b>
  * or higher to <b>stream</b>. */
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index b33db0915f..c66ec9c668 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -11,7 +11,6 @@ const char connection_edge_c_id[] = "$Id$";
  **/
 
 #include "or.h"
-#include "tree.h"
 
 static addr_policy_t *socks_policy = NULL;
 /* List of exit_redirect_t */
diff --git a/src/or/or.h b/src/or/or.h
index 7212a65305..1a9312ece5 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1747,6 +1747,8 @@ int control_event_or_authdir_new_descriptor(const char *action, const char *desc
 
 int init_cookie_authentication(int enabled);
 int decode_hashed_password(char *buf, const char *hashed);
+void disable_control_logging(void);
+void enable_control_logging(void);
 
 /********************************* cpuworker.c *****************************/