diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-03-15 22:47:21 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-03-15 22:47:21 +0000 |
| commit | d3746163017e8a727e55ca74c9fdb50ddcdf161c (patch) | |
| tree | c560435de5950d32ba31c6d17c03539f0cd0182a | |
| parent | c901e2c927e494b0e969d5020d5253c471dec8c4 (diff) | |
| download | tor-d3746163017e8a727e55ca74c9fdb50ddcdf161c.tar.gz tor-d3746163017e8a727e55ca74c9fdb50ddcdf161c.zip | |
clean up some minor typos and log confusions
svn:r9832
| -rw-r--r-- | src/common/compat.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/common/compat.c b/src/common/compat.c index ce7e00babc..a60d45a92d 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -486,7 +486,7 @@ set_socket_nonblocking(int socket) * type,protocol,fd), but works on systems that don't have * socketpair.) * - * Currently, only (AF_UNIX, SOCK_STREAM, 0 ) sockets are supported. + * Currently, only (AF_UNIX, SOCK_STREAM, 0) sockets are supported. * * Note that on systems without socketpair, this call will fail if * localhost is inaccessible (for example, if the networking @@ -507,7 +507,7 @@ tor_socketpair(int family, int type, int protocol, int fd[2]) r = socketpair(family, type, protocol, fd); return r < 0 ? -errno : r; #elif defined(USE_BSOCKETS) - return bsockepair(family, type, protocol, fd); + return bsocketpair(family, type, protocol, fd); #else /* This socketpair does not work when localhost is down. So * it's really not the same thing at all. But it's close enough diff --git a/src/or/main.c b/src/or/main.c index a2eaeb809a..314f2bf5b2 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -538,7 +538,7 @@ conn_close_if_marked(int i) /* XXXX Maybe allow this to happen a certain amount per hour; it usually * is meaningless. */ log_fn(severity, LD_NET, "We stalled too much while trying to write %d " - "bytes to addr %s. If this happens a lot, either " + "bytes to address %s. If this happens a lot, either " "something is wrong with your network connection, or " "something is wrong with theirs. " "(fd %d, type %s, state %d, marked at %s:%d).", |