[or-cvs] r7064: Fix eventdns version of dns.c. Man, we need to get rid of th (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-08-15 00:50:17 -0400 (Tue, 15 Aug 2006)
New Revision: 7064

Modified:
   tor/trunk/
   tor/trunk/src/or/dns.c
Log:
 r7397 at Kushana:  nickm | 2006-08-15 00:46:18 -0400
 Fix eventdns version of dns.c. Man, we need to get rid of this eventdns/dnsworker split.



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8290
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7386
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7315
c95137ef-5f19-0410-b913-86e773d04f59:/tor/trunk:7393
   + 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8290
1f724f9b-111a-0410-b636-93f1a77c1813:/local/or/tor/trunk:8207
96637b51-b116-0410-a10e-9941ebb49b64:/tor/branches/spec:7005
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/eventdns:7397
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/mmap:7030
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/oo-connections:6950
c95137ef-5f19-0410-b913-86e773d04f59:/tor/branches/trans-ap:7315
c95137ef-5f19-0410-b913-86e773d04f59:/tor/trunk:7393

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2006-08-15 03:54:13 UTC (rev 7063)
+++ tor/trunk/src/or/dns.c	2006-08-15 04:50:17 UTC (rev 7064)
@@ -107,8 +107,8 @@
 #else
 static int configure_nameservers(void);
 #endif
+#ifdef DEBUG_DNS_CACHE
 static void _assert_cache_ok(void);
-#ifdef DEBUG_DNS_CACHE
 #define assert_cache_ok() _assert_cache_ok()
 #else
 #define assert_cache_ok() do {} while(0)
@@ -1186,7 +1186,7 @@
 {
   or_options_t *options;
   if (nameservers_configured)
-    return;
+    return 0;
   options = get_options();
   eventdns_set_log_fn(eventdns_log_cb);
   if (options->Nameservers && smartlist_len(options->Nameservers)) {
@@ -1230,6 +1230,7 @@
 #endif
   }
   nameservers_configured = 1;
+  return 0;
 }
 static void
 eventdns_callback(int result, char type, int count, int ttl, void *addresses,
@@ -1311,6 +1312,7 @@
   }
 }
 
+#ifdef DEBUG_DNS_CACHE
 static void
 _assert_cache_ok(void)
 {
@@ -1331,4 +1333,4 @@
   smartlist_pqueue_assert_ok(cached_resolve_pqueue,
                              _compare_cached_resolves_by_expiry);
 }
-
+#endif