[or-cvs] Renormalize whitespace
Nick Mathewson
nickm at seul.org
Mon Mar 14 03:18:39 UTC 2005
Update of /home/or/cvsroot/tor/src/or
In directory moria.mit.edu:/tmp/cvs-serv8145/src/or
Modified Files:
buffers.c circuitbuild.c circuituse.c connection.c
connection_edge.c connection_or.c control.c dns.c main.c
Log Message:
Renormalize whitespace
Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- buffers.c 10 Mar 2005 18:45:42 -0000 1.129
+++ buffers.c 14 Mar 2005 03:18:34 -0000 1.130
@@ -645,7 +645,6 @@
}
}
-
#define CONTROL_CMD_FRAGMENTHEADER 0x0010
#define CONTROL_CMD_FRAGMENT 0x0011
/** If there is a complete control message waiting on buf, then store
@@ -759,4 +758,3 @@
tor_assert(buf->mem);
tor_assert(buf->datalen <= buf->len);
}
-
Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- circuitbuild.c 27 Feb 2005 09:47:00 -0000 1.84
+++ circuitbuild.c 14 Mar 2005 03:18:34 -0000 1.85
@@ -1355,4 +1355,3 @@
*router_out = choice;
return 0;
}
-
Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/circuituse.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- circuituse.c 12 Mar 2005 04:22:00 -0000 1.52
+++ circuituse.c 14 Mar 2005 03:18:34 -0000 1.53
@@ -548,7 +548,7 @@
/* For now, we only use testing circuits to see if our ORPort is
reachable. So, if this circuit ends at us, remember that. */
routerinfo_t *exit = router_get_by_digest(circ->build_state->chosen_exit_digest);
- if(exit && router_is_me(exit)) {
+ if (exit && router_is_me(exit)) {
log_fn(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent.");
router_orport_found_reachable();
}
@@ -1009,7 +1009,6 @@
return 1;
}
-
/** Try to find a safe live circuit for CONN_TYPE_AP connection conn. If
* we don't find one: if conn cannot be handled by any known nodes,
* warn and return -1 (conn needs to die);
@@ -1133,4 +1132,3 @@
return 0;
}
}
-
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection.c,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -d -r1.336 -r1.337
--- connection.c 12 Mar 2005 04:22:01 -0000 1.336
+++ connection.c 14 Mar 2005 03:18:35 -0000 1.337
@@ -1243,7 +1243,6 @@
return best;
}
-
/** Return the connection with id <b>id</b> if it is not already
* marked for close.
*/
@@ -1266,7 +1265,6 @@
return NULL;
}
-
/** Return a connection of type <b>type</b> that is not marked for
* close.
*/
@@ -1675,4 +1673,3 @@
tor_assert(0);
}
}
-
Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -d -r1.297 -r1.298
--- connection_edge.c 14 Mar 2005 03:12:59 -0000 1.297
+++ connection_edge.c 14 Mar 2005 03:18:35 -0000 1.298
@@ -172,7 +172,6 @@
return connection_edge_end(conn, reason, cpath_layer);
}
-
/** Connection <b>conn</b> has finished writing and has no bytes left on
* its outbuf.
*
@@ -358,7 +357,6 @@
}
}
-
/** A client-side struct to remember requests to rewrite addresses
* to new addresses. These structs make up a tree, with addressmap
* below as its root.
Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- connection_or.c 24 Feb 2005 10:56:55 -0000 1.160
+++ connection_or.c 14 Mar 2005 03:18:35 -0000 1.161
@@ -107,7 +107,7 @@
tor_assert(conn);
tor_assert(conn->type == CONN_TYPE_OR);
- switch(conn->state) {
+ switch (conn->state) {
case OR_CONN_STATE_PROXY_READING:
return connection_or_read_proxy_response(conn);
case OR_CONN_STATE_OPEN:
@@ -131,7 +131,7 @@
assert_connection_ok(conn,0);
- switch(conn->state) {
+ switch (conn->state) {
case OR_CONN_STATE_PROXY_FLUSHING:
log_fn(LOG_DEBUG,"finished sending CONNECT to proxy.");
conn->state = OR_CONN_STATE_PROXY_READING;
Index: control.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/control.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- control.c 12 Mar 2005 04:22:01 -0000 1.55
+++ control.c 14 Mar 2005 03:18:35 -0000 1.56
@@ -669,7 +669,6 @@
return 0;
}
-
if (!(circ = circuit_get_by_global_id(circ_id))) {
send_control_error(conn, ERR_NO_CIRC, "No circuit found with given ID");
return 0;
Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/dns.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- dns.c 1 Mar 2005 22:42:31 -0000 1.137
+++ dns.c 14 Mar 2005 03:18:35 -0000 1.138
@@ -101,7 +101,7 @@
static void
_free_cached_resolve(struct cached_resolve *r) {
- while(r->pending_connections) {
+ while (r->pending_connections) {
struct pending_connection_t *victim = r->pending_connections;
r->pending_connections = victim->next;
tor_free(victim);
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -d -r1.457 -r1.458
--- main.c 11 Mar 2005 21:39:39 -0000 1.457
+++ main.c 14 Mar 2005 03:18:35 -0000 1.458
@@ -1074,7 +1074,7 @@
/** Write all statistics to the log, with log level 'severity'. Called
* in response to a SIGUSR1. */
-static void
+static void
dumpstats(int severity) {
int i;
connection_t *conn;
@@ -1597,7 +1597,7 @@
return -1;
switch (get_options()->command) {
case CMD_RUN_TOR:
-#ifdef MS_WINDOWS_SERVICE
+#ifdef MS_WINDOWS_SERVICE
service_status.dwCurrentState = SERVICE_RUNNING;
#endif
do_main_loop();
More information about the tor-commits
mailing list