diff options
| author | Mike Chiussi <chiussi@gmail.com> | 2006-09-07 04:02:52 +0000 |
|---|---|---|
| committer | Mike Chiussi <chiussi@gmail.com> | 2006-09-07 04:02:52 +0000 |
| commit | c40acb86f4b34fab25108acea3bf82ec24bf7d08 (patch) | |
| tree | 76609884e7b5a2bcc5ffa1a48a3a559e2b4c352e | |
| parent | 3c85780e69befe3246331a9a9752a6506307dde3 (diff) | |
| download | tor-c40acb86f4b34fab25108acea3bf82ec24bf7d08.tar tor-c40acb86f4b34fab25108acea3bf82ec24bf7d08.tar.gz | |
- got rid of tabs
svn:r8344
| -rw-r--r-- | src/or/dns.c | 4 | ||||
| -rw-r--r-- | src/or/eventdns.c | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index 122e60d1b..da6b76838 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1292,9 +1292,9 @@ configure_nameservers(int force) eventdns_clear_nameservers_and_suspend(); } if (eventdns_config_windows_nameservers()) { - log_warn(LD_EXIT,"Could not config nameservers."); + log_warn(LD_EXIT,"Could not config nameservers."); return -1; - } + } if (eventdns_count_nameservers() == 0) { log_warn(LD_EXIT, "Unable to find any platform nameservers in " "your Windows configuration. Perhaps you should list a " diff --git a/src/or/eventdns.c b/src/or/eventdns.c index 0b030e610..6b8544ed8 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1507,7 +1507,7 @@ out2: CLOSE_SOCKET(ns->socket); out1: free(ns); - log(EVENTDNS_LOG_WARN, "Unable to add nameserver %s: error %d", + log(EVENTDNS_LOG_WARN, "Unable to add nameserver %s: error %d", debug_ntoa(address), err); return err; } @@ -2062,10 +2062,10 @@ load_nameservers_with_getnetworkparams(void) IP_ADDR_STRING *ns; DWORD (WINAPI *fn)(FIXED_INFO*, DWORD*); - if (!(handle = LoadLibrary("iphlpapi.dll"))) + if (!(handle = LoadLibrary("iphlpapi.dll"))) goto done; - - if (!(fn = + + if (!(fn = (DWORD (WINAPI*)(FIXED_INFO*,DWORD*)) GetProcAddress(handle, "GetNetworkParams"))) { goto done; @@ -2154,19 +2154,18 @@ load_nameservers_from_registry(void) HKEY nt_key = 0, interfaces_key = 0; if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, WIN_NS_NT_KEY, 0, - KEY_READ, &nt_key) != ERROR_SUCCESS){ + KEY_READ, &nt_key) != ERROR_SUCCESS){ log(EVENTDNS_LOG_DEBUG,"Couldn't open nt key, %d",(int)GetLastError()); return -1; + } - } r = RegOpenKeyEx(nt_key, "Interfaces", 0, KEY_QUERY_VALUE|KEY_ENUMERATE_SUB_KEYS, &interfaces_key); if (r != ERROR_SUCCESS ) { - log(EVENTDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError()); + log(EVENTDNS_LOG_DEBUG,"Couldn't open interfaces key, %d",(int)GetLastError()); return -1; - } TRY(nt_key, "NameServer"); |