[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8443: Trivial whitespace cleanups. (in tor/trunk: . src/common src/or)
Author: nickm
Date: 2006-09-21 17:48:55 -0400 (Thu, 21 Sep 2006)
New Revision: 8443
Modified:
tor/trunk/
tor/trunk/src/common/util.c
tor/trunk/src/or/config.c
tor/trunk/src/or/dns.c
tor/trunk/src/or/main.c
Log:
r8878@Kushana: nickm | 2006-09-21 17:15:47 -0400
Trivial whitespace cleanups.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/branches/eventdns [r8878] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/src/common/util.c
===================================================================
--- tor/trunk/src/common/util.c 2006-09-21 21:48:42 UTC (rev 8442)
+++ tor/trunk/src/common/util.c 2006-09-21 21:48:55 UTC (rev 8443)
@@ -207,7 +207,8 @@
/** Helper for places that need to take a function pointer to the right
* spelling of "free()". */
void
-_tor_free(void *mem) {
+_tor_free(void *mem)
+{
tor_free(mem);
}
Modified: tor/trunk/src/or/config.c
===================================================================
--- tor/trunk/src/or/config.c 2006-09-21 21:48:42 UTC (rev 8442)
+++ tor/trunk/src/or/config.c 2006-09-21 21:48:55 UTC (rev 8443)
@@ -2448,7 +2448,7 @@
#ifndef USE_EVENTDNS
if (options->ServerDNSResolvConfFile)
log(LOG_WARN, LD_CONFIG,
- "ServerDNSResolvConfFile only works when eventdns support is enabled.");
+ "ServerDNSResolvConfFile only works when eventdns support is enabled.");
#endif
if (check_nickname_list(options->ExitNodes, "ExitNodes", msg))
Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c 2006-09-21 21:48:42 UTC (rev 8442)
+++ tor/trunk/src/or/dns.c 2006-09-21 21:48:55 UTC (rev 8443)
@@ -1522,7 +1522,8 @@
char *addr = tor_strdup(exitconn->_base.address);
struct in_addr in;
int r;
- int options = get_options()->ServerDNSSearchDomains ? 0 : DNS_QUERY_NO_SEARCH;
+ int options = get_options()->ServerDNSSearchDomains ? 0
+ : DNS_QUERY_NO_SEARCH;
/* What? Nameservers not configured? Sounds like a bug. */
if (!nameservers_configured) {
log_warn(LD_EXIT, "Harmless bug: nameservers not configured, but resolve "
Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c 2006-09-21 21:48:42 UTC (rev 8442)
+++ tor/trunk/src/or/main.c 2006-09-21 21:48:55 UTC (rev 8443)
@@ -936,8 +936,6 @@
crypto_rand_int(12*3600);
}
}
-
-
}
static struct event *timeout_event = NULL;