diff options
| -rwxr-xr-x | contrib/checkSpace.pl | 2 | ||||
| -rw-r--r-- | src/or/config.c | 3 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/control.c | 2 | ||||
| -rw-r--r-- | src/or/dns.c | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl index ae88e464f7..aff96861a9 100755 --- a/contrib/checkSpace.pl +++ b/contrib/checkSpace.pl @@ -91,7 +91,7 @@ for $fn (@ARGV) { ## Warn about functions not declared at start of line. if ($in_func_head || ($fn !~ /\.h$/ && /^[a-zA-Z0-9_]/ && - ! /^(?:static )?(?:typedef|struct|union)[^\(]*$/ && + ! /^(?:const |static )*(?:typedef|struct|union)[^\(]*$/ && ! /= *\{$/ && ! /;$/)) { if (/.\{$/){ print "fn() {:$fn:$.\n"; diff --git a/src/or/config.c b/src/or/config.c index 268bb18724..16efa9bd23 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3577,7 +3577,8 @@ init_libevent(void) #ifdef HAVE_EVENT_GET_VERSION ver = event_get_version(); #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 " "with libevent %s. If this turns out to not work, " "set the environment variable EVENT_NOKQUEUE, and tell the Tor " diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 12ffb3fa2c..840aee2a47 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1314,7 +1314,7 @@ connection_ap_get_original_destination(edge_connection_t *conn, pnl.sport = htons(conn->_base.port); pnl.daddr.v4.s_addr = proxy_addr.sin_addr.s_addr; pnl.dport = proxy_addr.sin_port; - + pf = get_pf_socket(); if (pf<0) return -1; diff --git a/src/or/control.c b/src/or/control.c index 28b87c21af..1487d7dc72 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -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", (unsigned long)conn->global_identifier, status, origin_circ? - (unsigned long)origin_circ->global_identifier : 0ul, + (unsigned long)origin_circ->global_identifier : 0ul, buf); /* XXX need to specify its intended exit, etc? */ } diff --git a/src/or/dns.c b/src/or/dns.c index ccd60f8a10..dc54626b8b 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -272,8 +272,8 @@ purge_expired_resolves(uint32_t now) if (resolve->state == CACHE_STATE_PENDING) { log_debug(LD_EXIT, - "Expiring a dns resolve %s that's still pending. Forgot to cull" - " it? DNS resolve didn't tell us about the timeout?", + "Expiring a dns resolve %s that's still pending. Forgot to " + "cull it? DNS resolve didn't tell us about the timeout?", escaped_safe_str(resolve->address)); } else if (resolve->state == CACHE_STATE_CACHED_VALID || resolve->state == CACHE_STATE_CACHED_FAILED) { |