[or-cvs] get rid of those pesky tabs
Roger Dingledine
arma at seul.org
Fri Mar 12 13:00:36 UTC 2004
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
connection.c main.c
Log Message:
get rid of those pesky tabs
Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- connection.c 11 Mar 2004 06:22:53 -0000 1.180
+++ connection.c 12 Mar 2004 13:00:33 -0000 1.181
@@ -144,7 +144,7 @@
}
/* Close the underlying socket for conn, so we don't try to flush it.
- * Must be used in conjunction with connection_mark_for_close
+ * Must be used in conjunction with (right before) connection_mark_for_close
*/
void connection_close_immediate(connection_t *conn)
{
@@ -227,7 +227,7 @@
assert(conn->marked_for_close);
if (now - conn->timestamp_lastwritten >= 15) {
log_fn(LOG_WARN,"Giving up on marked_for_close conn that's been flushing for 15s (fd %d, type %s, state %d).",
- conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state);
+ conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state);
conn->hold_open_until_flushed = 0;
}
}
@@ -419,8 +419,8 @@
if(options.ORPort) {
listener_close_if_present(CONN_TYPE_OR_LISTENER);
- if(connection_create_listener(options.ORBindAddress,
- (uint16_t) options.ORPort,
+ if(connection_create_listener(options.ORBindAddress,
+ (uint16_t) options.ORPort,
CONN_TYPE_OR_LISTENER) < 0)
return -1;
}
@@ -428,7 +428,7 @@
if(options.DirPort) {
listener_close_if_present(CONN_TYPE_DIR_LISTENER);
if(connection_create_listener(options.DirBindAddress,
- (uint16_t) options.DirPort,
+ (uint16_t) options.DirPort,
CONN_TYPE_DIR_LISTENER) < 0)
return -1;
}
@@ -436,7 +436,7 @@
if(options.SocksPort) {
listener_close_if_present(CONN_TYPE_AP_LISTENER);
if(connection_create_listener(options.SocksBindAddress,
- (uint16_t) options.SocksPort,
+ (uint16_t) options.SocksPort,
CONN_TYPE_AP_LISTENER) < 0)
return -1;
}
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- main.c 12 Mar 2004 08:16:48 -0000 1.200
+++ main.c 12 Mar 2004 13:00:34 -0000 1.201
@@ -70,7 +70,7 @@
nfds++;
log(LOG_INFO,"connection_add(): new conn type %s, socket %d, nfds %d.",
- CONN_TYPE_TO_STRING(conn->type), conn->s, nfds);
+ CONN_TYPE_TO_STRING(conn->type), conn->s, nfds);
return 0;
}
@@ -90,7 +90,7 @@
assert(nfds>0);
log_fn(LOG_INFO,"removing socket %d (type %s), nfds now %d",
- conn->s, CONN_TYPE_TO_STRING(conn->type), nfds-1);
+ conn->s, CONN_TYPE_TO_STRING(conn->type), nfds-1);
/* if it's an edge conn, remove it from the list
* of conn's on this circuit. If it's not on an edge,
* flush and send destroys for all circuits on this conn
@@ -711,8 +711,8 @@
int r;
r = WSAStartup(0x101,&WSAData);
if (r) {
- log_fn(LOG_WARN,"Error initializing windows network layer: code was %d",r);
- return -1;
+ log_fn(LOG_WARN,"Error initializing windows network layer: code was %d",r);
+ return -1;
}
/* XXXX We should call WSACleanup on exit, I think. */
#endif
@@ -733,8 +733,8 @@
log_fn(LOG_WARN,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION);
if (network_init()<0) {
- log_fn(LOG_ERR,"Error initializing network; exiting.");
- return 1;
+ log_fn(LOG_ERR,"Error initializing network; exiting.");
+ return 1;
}
atexit(exit_function);
More information about the tor-commits
mailing list