Commit 3da737ac authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

r7303@Kushana: nickm | 2006-08-10 01:52:19 -0700

 whitespace fixes


svn:r7011
parent 74df271e
...@@ -91,7 +91,7 @@ for $fn (@ARGV) { ...@@ -91,7 +91,7 @@ for $fn (@ARGV) {
## Warn about functions not declared at start of line. ## Warn about functions not declared at start of line.
if ($in_func_head || if ($in_func_head ||
($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ && ($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ &&
! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ && ! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ &&
! /= *\{$/ && ! /;$/)) { ! /= *\{$/ && ! /;$/)) {
if (/.\{$/){ if (/.\{$/){
print "fn() {:$fn:$.\n"; print "fn() {:$fn:$.\n";
......
...@@ -3577,7 +3577,8 @@ init_libevent(void) ...@@ -3577,7 +3577,8 @@ init_libevent(void)
#ifdef HAVE_EVENT_GET_VERSION #ifdef HAVE_EVENT_GET_VERSION
ver = event_get_version(); ver = event_get_version();
#endif #endif
tor_assert(ver); /* If we're 1.1b or later, we'd better have get_version()*/ /* If we're 1.1b or later, we'd better have get_version() */
tor_assert(ver);
log(LOG_NOTICE, LD_GENERAL, "Enabling experimental OS X kqueue support " log(LOG_NOTICE, LD_GENERAL, "Enabling experimental OS X kqueue support "
"with libevent %s. If this turns out to not work, " "with libevent %s. If this turns out to not work, "
"set the environment variable EVENT_NOKQUEUE, and tell the Tor " "set the environment variable EVENT_NOKQUEUE, and tell the Tor "
......
...@@ -1314,7 +1314,7 @@ connection_ap_get_original_destination(edge_connection_t *conn, ...@@ -1314,7 +1314,7 @@ connection_ap_get_original_destination(edge_connection_t *conn,
pnl.sport = htons(conn->_base.port); pnl.sport = htons(conn->_base.port);
pnl.daddr.v4.s_addr = proxy_addr.sin_addr.s_addr; pnl.daddr.v4.s_addr = proxy_addr.sin_addr.s_addr;
pnl.dport = proxy_addr.sin_port; pnl.dport = proxy_addr.sin_port;
pf = get_pf_socket(); pf = get_pf_socket();
if (pf<0) if (pf<0)
return -1; return -1;
......
...@@ -2721,7 +2721,7 @@ control_event_stream_status(edge_connection_t *conn, stream_status_event_t tp) ...@@ -2721,7 +2721,7 @@ control_event_stream_status(edge_connection_t *conn, stream_status_event_t tp)
"650 STREAM %lu %s %lu %s\r\n", "650 STREAM %lu %s %lu %s\r\n",
(unsigned long)conn->global_identifier, status, (unsigned long)conn->global_identifier, status,
origin_circ? origin_circ?
(unsigned long)origin_circ->global_identifier : 0ul, (unsigned long)origin_circ->global_identifier : 0ul,
buf); buf);
/* XXX need to specify its intended exit, etc? */ /* XXX need to specify its intended exit, etc? */
} }
......
...@@ -272,8 +272,8 @@ purge_expired_resolves(uint32_t now) ...@@ -272,8 +272,8 @@ purge_expired_resolves(uint32_t now)
if (resolve->state == CACHE_STATE_PENDING) { if (resolve->state == CACHE_STATE_PENDING) {
log_debug(LD_EXIT, log_debug(LD_EXIT,
"Expiring a dns resolve %s that's still pending. Forgot to cull" "Expiring a dns resolve %s that's still pending. Forgot to "
" it? DNS resolve didn't tell us about the timeout?", "cull it? DNS resolve didn't tell us about the timeout?",
escaped_safe_str(resolve->address)); escaped_safe_str(resolve->address));
} else if (resolve->state == CACHE_STATE_CACHED_VALID || } else if (resolve->state == CACHE_STATE_CACHED_VALID ||
resolve->state == CACHE_STATE_CACHED_FAILED) { resolve->state == CACHE_STATE_CACHED_FAILED) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment