[or-cvs] Remove last vestiges of old logging interface.

Nick Mathewson nickm at seul.org
Tue Oct 25 18:01:04 UTC 2005


Update of /home/or/cvsroot/tor/src/or
In directory moria:/tmp/cvs-serv4883/src/or

Modified Files:
	buffers.c circuitbuild.c circuitlist.c circuituse.c command.c 
	config.c connection.c connection_edge.c connection_or.c 
	control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c 
	main.c onion.c or.h relay.c rendclient.c rendcommon.c 
	rendmid.c rendservice.c rephist.c router.c routerlist.c 
	routerparse.c test.c 
Log Message:
Remove last vestiges of old logging interface.

Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- buffers.c	24 Oct 2005 19:39:45 -0000	1.176
+++ buffers.c	25 Oct 2005 18:01:01 -0000	1.177
@@ -12,7 +12,6 @@
  * memory, file descriptors, or TLS connections.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 #define SENTINELS

Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- circuitbuild.c	25 Oct 2005 07:00:03 -0000	1.155
+++ circuitbuild.c	25 Oct 2005 18:01:01 -0000	1.156
@@ -10,7 +10,6 @@
  * \brief The actual details of building circuits.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /********* START VARIABLES **********/

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitlist.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- circuitlist.c	25 Oct 2005 15:31:25 -0000	1.66
+++ circuitlist.c	25 Oct 2005 18:01:01 -0000	1.67
@@ -10,7 +10,6 @@
  * \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.

Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- circuituse.c	25 Oct 2005 07:04:36 -0000	1.86
+++ circuituse.c	25 Oct 2005 18:01:01 -0000	1.87
@@ -10,7 +10,6 @@
  * \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 */

Index: command.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/command.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- command.c	25 Oct 2005 07:04:36 -0000	1.97
+++ command.c	25 Oct 2005 18:01:01 -0000	1.98
@@ -16,7 +16,6 @@
  *   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. */

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/config.c,v
retrieving revision 1.441
retrieving revision 1.442
diff -u -d -r1.441 -r1.442
--- config.c	25 Oct 2005 07:05:03 -0000	1.441
+++ config.c	25 Oct 2005 18:01:01 -0000	1.442
@@ -10,7 +10,6 @@
  * \brief Code to parse and interpret configuration files.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #ifdef MS_WINDOWS
 #include <shlobj.h>

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -d -r1.413 -r1.414
--- connection.c	25 Oct 2005 07:04:36 -0000	1.413
+++ connection.c	25 Oct 2005 18:01:01 -0000	1.414
@@ -11,7 +11,6 @@
  * on connections.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static connection_t *connection_create_listener(const char *listenaddress,

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- connection_edge.c	25 Oct 2005 08:20:10 -0000	1.358
+++ connection_edge.c	25 Oct 2005 18:01:01 -0000	1.359
@@ -10,7 +10,6 @@
  * \brief Handle edge streams.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "tree.h"
 

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -d -r1.194 -r1.195
--- connection_or.c	25 Oct 2005 07:05:03 -0000	1.194
+++ connection_or.c	25 Oct 2005 18:01:01 -0000	1.195
@@ -11,7 +11,6 @@
  * cells on the network.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /** How much clock skew do we tolerate when checking certificates for

Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- control.c	25 Oct 2005 07:02:13 -0000	1.145
+++ control.c	25 Oct 2005 18:01:01 -0000	1.146
@@ -8,7 +8,6 @@
  * \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 ||       \

Index: cpuworker.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/cpuworker.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- cpuworker.c	25 Oct 2005 08:20:10 -0000	1.89
+++ cpuworker.c	25 Oct 2005 18:01:01 -0000	1.90
@@ -13,7 +13,6 @@
  * 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. */

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/directory.c,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- directory.c	25 Oct 2005 08:20:10 -0000	1.314
+++ directory.c	25 Oct 2005 18:01:01 -0000	1.315
@@ -4,7 +4,6 @@
 /* $Id$ */
 const char directory_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -d -r1.259 -r1.260
--- dirserv.c	25 Oct 2005 17:52:14 -0000	1.259
+++ dirserv.c	25 Oct 2005 18:01:01 -0000	1.260
@@ -4,7 +4,6 @@
 /* $Id$ */
 const char dirserv_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**

Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -d -r1.171 -r1.172
--- dns.c	25 Oct 2005 17:52:14 -0000	1.171
+++ dns.c	25 Oct 2005 18:01:01 -0000	1.172
@@ -17,7 +17,6 @@
  * them becomes more commonly available.
  */
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "tree.h"
 

Index: hibernate.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/hibernate.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- hibernate.c	25 Oct 2005 17:52:14 -0000	1.61
+++ hibernate.c	25 Oct 2005 18:01:01 -0000	1.62
@@ -22,7 +22,6 @@
   - close all OR/AP/exit conns)
 */
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 #define HIBERNATE_STATE_LIVE 1

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.583
retrieving revision 1.584
diff -u -d -r1.583 -r1.584
--- main.c	25 Oct 2005 08:20:10 -0000	1.583
+++ main.c	25 Oct 2005 18:01:01 -0000	1.584
@@ -11,7 +11,6 @@
  * connections, implements main loop, and drives scheduled events.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #ifdef USE_DMALLOC
 #include <dmalloc.h>

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/onion.c,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- onion.c	24 Oct 2005 19:39:45 -0000	1.188
+++ onion.c	25 Oct 2005 18:01:01 -0000	1.189
@@ -11,7 +11,6 @@
  * 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

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/or.h,v
retrieving revision 1.725
retrieving revision 1.726
diff -u -d -r1.725 -r1.726
--- or.h	25 Oct 2005 07:05:03 -0000	1.725
+++ or.h	25 Oct 2005 18:01:01 -0000	1.726
@@ -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"

Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- relay.c	25 Oct 2005 15:30:02 -0000	1.86
+++ relay.c	25 Oct 2005 18:01:01 -0000	1.87
@@ -11,7 +11,6 @@
  * receiving from circuits.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,

Index: rendclient.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rendclient.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- rendclient.c	24 Oct 2005 19:39:45 -0000	1.96
+++ rendclient.c	25 Oct 2005 18:01:01 -0000	1.97
@@ -8,7 +8,6 @@
  * \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:

Index: rendcommon.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rendcommon.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- rendcommon.c	24 Oct 2005 19:39:45 -0000	1.59
+++ rendcommon.c	25 Oct 2005 18:01:01 -0000	1.60
@@ -9,7 +9,6 @@
  * 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 */

Index: rendmid.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rendmid.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- rendmid.c	24 Oct 2005 19:39:45 -0000	1.43
+++ rendmid.c	25 Oct 2005 18:01:01 -0000	1.44
@@ -8,7 +8,6 @@
  * \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

Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rendservice.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- rendservice.c	24 Oct 2005 19:39:45 -0000	1.145
+++ rendservice.c	25 Oct 2005 18:01:01 -0000	1.146
@@ -8,7 +8,6 @@
  * \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);

Index: rephist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/rephist.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- rephist.c	18 Oct 2005 22:56:40 -0000	1.69
+++ rephist.c	25 Oct 2005 18:01:01 -0000	1.70
@@ -10,7 +10,6 @@
  *    been using, which ports we tend to want, and so on.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 static void bw_arrays_init(void);

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -d -r1.226 -r1.227
--- router.c	25 Oct 2005 07:04:36 -0000	1.226
+++ router.c	25 Oct 2005 18:01:01 -0000	1.227
@@ -5,7 +5,6 @@
 /* $Id$ */
 const char router_c_id[] = "$Id$";
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /**

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerlist.c,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -d -r1.351 -r1.352
--- routerlist.c	24 Oct 2005 19:39:45 -0000	1.351
+++ routerlist.c	25 Oct 2005 18:01:01 -0000	1.352
@@ -12,7 +12,6 @@
  * servers.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /****************************************************************************/

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/routerparse.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- routerparse.c	25 Oct 2005 07:05:03 -0000	1.156
+++ routerparse.c	25 Oct 2005 18:01:01 -0000	1.157
@@ -10,7 +10,6 @@
  * \brief Code to parse and validate router descriptors and directories.
  **/
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 
 /****************************************************************************/

Index: test.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/test.c,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -d -r1.209 -r1.210
--- test.c	25 Oct 2005 07:04:36 -0000	1.209
+++ test.c	25 Oct 2005 18:01:01 -0000	1.210
@@ -22,7 +22,6 @@
 #include <dirent.h>
 #endif
 
-#define NEW_LOG_INTERFACE
 #include "or.h"
 #include "../common/test.h"
 #include "../common/torgzip.h"



More information about the tor-commits mailing list