[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] clean whitespace and tabs
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
dirserv.c main.c relay.c routerlist.c
Log Message:
clean whitespace and tabs
Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dirserv.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- dirserv.c 22 Jul 2004 22:15:36 -0000 1.68
+++ dirserv.c 22 Jul 2004 23:21:12 -0000 1.69
@@ -603,7 +603,7 @@
log_fn(LOG_WARN,"couldn't base64-encode signature");
return -1;
}
-
+
if (strlcat(s, "-----END SIGNATURE-----\n", maxlen) >= maxlen)
goto truncated;
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- main.c 22 Jul 2004 22:15:36 -0000 1.306
+++ main.c 22 Jul 2004 23:21:12 -0000 1.307
@@ -1081,7 +1081,7 @@
fclose(f);
service_status.dwServiceType = SERVICE_WIN32;
service_status.dwCurrentState = SERVICE_START_PENDING;
- service_status.dwControlsAccepted =
+ service_status.dwControlsAccepted =
SERVICE_ACCEPT_STOP |
SERVICE_ACCEPT_SHUTDOWN;
service_status.dwWin32ExitCode = 0;
Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/src/or/relay.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- relay.c 17 Jun 2004 18:13:09 -0000 1.4
+++ relay.c 22 Jul 2004 23:21:12 -0000 1.5
@@ -225,7 +225,7 @@
relay_header_t rh;
tor_assert(circ && cell && recognized);
- tor_assert(cell_direction == CELL_DIRECTION_IN || cell_direction == CELL_DIRECTION_OUT);
+ tor_assert(cell_direction == CELL_DIRECTION_IN || cell_direction == CELL_DIRECTION_OUT);
if(cell_direction == CELL_DIRECTION_IN) {
if(CIRCUIT_IS_ORIGIN(circ)) { /* We're at the beginning of the circuit.
@@ -287,7 +287,7 @@
circuit_package_relay_cell(cell_t *cell, circuit_t *circ,
int cell_direction,
crypt_path_t *layer_hint)
-{
+{
connection_t *conn; /* where to send the cell */
crypt_path_t *thishop; /* counter for repeated crypts */
@@ -575,9 +575,9 @@
return 0;
}
connection_ap_handshake_socks_resolved(conn,
- cell->payload[RELAY_HEADER_SIZE], /*answer_type*/
- cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/
- cell->payload+RELAY_HEADER_SIZE+2); /* answer */
+ cell->payload[RELAY_HEADER_SIZE], /*answer_type*/
+ cell->payload[RELAY_HEADER_SIZE+1], /*answer_len*/
+ cell->payload+RELAY_HEADER_SIZE+2); /* answer */
conn->socks_request->has_finished = 1;
connection_mark_for_close(conn);
return 0;
@@ -767,14 +767,14 @@
case RELAY_COMMAND_RESOLVE:
if (layer_hint) {
log_fn(LOG_WARN,"resolve request unsupported at AP; dropping.");
- return 0;
+ return 0;
} else if (conn) {
- log_fn(LOG_WARN, "resolve request for known stream; dropping.");
- return 0;
+ log_fn(LOG_WARN, "resolve request for known stream; dropping.");
+ return 0;
} else if (circ->purpose != CIRCUIT_PURPOSE_OR) {
- log_fn(LOG_WARN, "resolve request on circ with purpose %d; dropping",
- circ->purpose);
- return 0;
+ log_fn(LOG_WARN, "resolve request on circ with purpose %d; dropping",
+ circ->purpose);
+ return 0;
}
connection_exit_begin_resolve(cell, circ);
return 0;
Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- routerlist.c 22 Jul 2004 21:36:03 -0000 1.110
+++ routerlist.c 22 Jul 2004 23:21:12 -0000 1.111
@@ -851,7 +851,7 @@
strlcat(cp, name, n);
strlcat(cp, " ", n);
}
- log_fn(LOG_DEBUG, "Updating status of %s from list \"%s\"",
+ log_fn(LOG_DEBUG, "Updating status of %s from list \"%s\"",
router->nickname, cp);
tor_free(cp);
#endif