torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

make code more readable; arrbitrarily change a -1 to a 0.

Browse Source 
svn:r1151
This commit is contained in:
Nick Mathewson
2004-02-28 04:34:27 +00:00
parent 98e796f38c
commit 5c838bb5b5
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/directory.c
+1 -1
View File
@@ -122,7 +122,7 @@ int connection_dir_process_inbuf(connection_t *conn) {
log_fn(LOG_INFO,"Empty directory. Ignoring.");
free(directory);
connection_mark_for_close(conn,0);
return -1;
return 0;
}
if(router_set_routerlist_from_directory(directory, conn->identity_pkey) < 0){
log_fn(LOG_INFO,"...but parsing failed. Ignoring.");
trunk/src/or/main.c
+15 -12
View File
@@ -176,13 +176,14 @@ static void conn_read(int i) {
#ifdef MS_WINDOWS
(poll_array[i].revents & POLLERR) ||
#endif
(connection_handle_read(conn) < 0 && !conn->marked_for_close))
{
/* this connection is broken. remove it */
/* XXX This shouldn't ever happen anymore. */
log_fn(LOG_ERR,"Unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string[conn->type], conn->s);
connection_mark_for_close(conn,0);
connection_handle_read(conn) < 0) {
if (!conn->marked_for_close) {
/* this connection is broken. remove it */
/* XXX This shouldn't ever happen anymore. */
log_fn(LOG_ERR,"Unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string[conn->type], conn->s);
connection_mark_for_close(conn,0);
}
}
assert_connection_ok(conn, time(NULL));
}
@@ -200,11 +201,13 @@ static void conn_write(int i) {
assert_connection_ok(conn, time(NULL));
if(connection_handle_write(conn) < 0 && !conn->marked_for_close) {
/* this connection is broken. remove it. */
log_fn(LOG_ERR,"Unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string[conn->type], conn->s);
connection_mark_for_close(conn,0);
if (connection_handle_write(conn) < 0) {
if (!conn->marked_for_close) {
/* this connection is broken. remove it. */
log_fn(LOG_ERR,"Unhandled error on read for %s connection (fd %d); removing",
conn_type_to_string[conn->type], conn->s);
connection_mark_for_close(conn,0);
}
}
assert_connection_ok(conn, time(NULL));
}