Remove last vestiges of old logging interface.

svn:r5317

28 files changed, 0 insertions, 30 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 2a470ce440..30212e33d5 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -12,7 +12,6 @@ const char buffers_c_id[] = "$Id$";
  * memory, file descriptors, or TLS connections.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 #define SENTINELS
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 3ea2bdc23e..92b2ee7e6a 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -10,7 +10,6 @@ const char circuitbuild_c_id[] = "$Id$";
  * \brief The actual details of building circuits.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /********* START VARIABLES **********/
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 1996cccced..abe083d313 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -10,7 +10,6 @@ const char circuitlist_c_id[] = "$Id$";
  * \brief Manage the global circuit list.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /* Define RB_AUGMENT to avoid warnings about if statements with emtpy bodies.
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 8c98d7e302..cff944a94a 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -10,7 +10,6 @@ const char circuituse_c_id[] = "$Id$";
  * \brief Launch the right sort of circuits and attach streams to them.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Longest time to wait for a circuit before closing an AP connection */
diff --git a/src/or/command.c b/src/or/command.c
index 63d067ae65..2c971734c0 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -16,7 +16,6 @@ const char command_c_id[] = "$Id$";
  *   connection_or_process_cells_from_inbuf() in connection_or.c
  */
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Keep statistics about how many of each type of cell we've received. */
diff --git a/src/or/config.c b/src/or/config.c
index 878fcac4a8..78c3a9cb67 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -10,7 +10,6 @@ const char config_c_id[] = "$Id$";
  * \brief Code to parse and interpret configuration files.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #ifdef MS_WINDOWS
 #include <shlobj.h>
diff --git a/src/or/connection.c b/src/or/connection.c
index 257efbbb12..893a9c7609 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -11,7 +11,6 @@ const char connection_c_id[] = "$Id$";
  * on connections.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static connection_t *connection_create_listener(const char *listenaddress,
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index b0620205d1..4da992d68c 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -10,7 +10,6 @@ const char connection_edge_c_id[] = "$Id$";
  * \brief Handle edge streams.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "tree.h"
 
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 7e3f8e8e02..ba813c4343 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -11,7 +11,6 @@ const char connection_or_c_id[] = "$Id$";
  * cells on the network.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** How much clock skew do we tolerate when checking certificates for
diff --git a/src/or/control.c b/src/or/control.c
index a2d8079d9a..e1cd8afcd6 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -8,7 +8,6 @@ const char control_c_id[] = "$Id$";
  * \brief Implementation for Tor's control-socket interface.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 #define STATE_IS_OPEN(s) ((s) == CONTROL_CONN_STATE_OPEN_V0 ||       \
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index a6bb9d9322..cfd578e492 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -13,7 +13,6 @@ const char cpuworker_c_id[] = "$Id$";
  * Right now, we only use this for processing onionskins.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** The maximum number of cpuworker processes we will keep around. */
diff --git a/src/or/directory.c b/src/or/directory.c
index 198b95f0cf..2a45b5f163 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -4,7 +4,6 @@
 /* $Id$ */
 const char directory_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 5a13b151c7..15244a8f0c 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -4,7 +4,6 @@
 /* $Id$ */
 const char dirserv_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**
diff --git a/src/or/dns.c b/src/or/dns.c
index 2cd64acc70..da51ec57be 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -17,7 +17,6 @@ const char dns_c_id[] = "$Id$";
  * them becomes more commonly available.
  */
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "tree.h"
 
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 337b16b9db..77e198d158 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -22,7 +22,6 @@ hibernating, phase 2:
   - close all OR/AP/exit conns)
 */
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 #define HIBERNATE_STATE_LIVE 1
diff --git a/src/or/main.c b/src/or/main.c
index 9966a825af..7e155d145f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -11,7 +11,6 @@ const char main_c_id[] = "$Id$";
  * connections, implements main loop, and drives scheduled events.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #ifdef USE_DMALLOC
 #include <dmalloc.h>
diff --git a/src/or/onion.c b/src/or/onion.c
index 05f3df5431..cb65b93598 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -11,7 +11,6 @@ const char onion_c_id[] = "$Id$";
  * parsing and creation.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Type for a linked list of circuits that are waiting for a free CPU worker
diff --git a/src/or/or.h b/src/or/or.h
index 9472b109f3..dfe43ecb1d 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -133,9 +133,6 @@
 
 #include "../common/crypto.h"
 #include "../common/tortls.h"
-#ifndef NEW_LOG_INTERFACE
-#define OLD_LOG_INTERFACE
-#endif
 #include "../common/log.h"
 #include "../common/compat.h"
 #include "../common/container.h"
diff --git a/src/or/relay.c b/src/or/relay.c
index b03262c13a..c838d7dd53 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -11,7 +11,6 @@ const char relay_c_id[] = "$Id$";
  * receiving from circuits.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 8f29f73788..fd1af57aa4 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -8,7 +8,6 @@ const char rendclient_c_id[] = "$Id$";
  * \brief Client code to access location-hidden services.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Called when we've established a circuit to an introduction point:
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index 3703e5c975..784a56a3dd 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -9,7 +9,6 @@ const char rendcommon_c_id[] = "$Id$";
  * introducers, services, clients, and rendezvous points.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Return 0 if one and two are the same service ids, else -1 or 1 */
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index fdd70bdc45..cc4ca60d25 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -8,7 +8,6 @@ const char rendmid_c_id[] = "$Id$";
  * \brief Implement introductions points and rendezvous points.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** Respond to an ESTABLISH_INTRO cell by checking the signed data and
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index d5d6e1aef6..5982c18e8d 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -8,7 +8,6 @@ const char rendservice_c_id[] = "$Id$";
  * \brief The hidden-service side of rendezvous functionality.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static circuit_t *find_intro_circuit(routerinfo_t *router, const char *pk_digest);
diff --git a/src/or/rephist.c b/src/or/rephist.c
index 18de290a2f..b7a193b290 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -10,7 +10,6 @@ const char rephist_c_id[] = "$Id$";
  *    been using, which ports we tend to want, and so on.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static void bw_arrays_init(void);
diff --git a/src/or/router.c b/src/or/router.c
index 3531d9024f..da741a2cf9 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -5,7 +5,6 @@
 /* $Id$ */
 const char router_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 3cd9bcd4e3..9d4fd88747 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -12,7 +12,6 @@ const char routerlist_c_id[] = "$Id$";
  * servers.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /****************************************************************************/
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index fe4ec89f12..4321f67436 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -10,7 +10,6 @@ const char routerparse_c_id[] = "$Id$";
  * \brief Code to parse and validate router descriptors and directories.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /****************************************************************************/
diff --git a/src/or/test.c b/src/or/test.c
index d9018e7fc6..918278b9cf 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -22,7 +22,6 @@ const char test_c_id[] = "$Id$";
 #include <dirent.h>
 #endif
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "../common/test.h"
 #include "../common/torgzip.h"