[or-cvs] r7023: Fix a pedantic warning (in tor/trunk: . src/or)

[nickm@xxxxxxxx]

Author: nickm
Date: 2006-08-11 03:09:45 -0400 (Fri, 11 Aug 2006)
New Revision: 7023

Modified:
   tor/trunk/
   tor/trunk/src/or/dns.c
Log:
 r7327@Kushana:  nickm | 2006-08-11 00:00:36 -0700
 Fix a pedantic warning



Property changes on: tor/trunk
___________________________________________________________________
Name: svk:merge
   - 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
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:7014
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:7326
   + 17f730b7-d419-0410-b50f-85ee4b70197a:/local/or/tor/trunk:8245
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:7014
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:7327

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2006-08-11 07:09:35 UTC (rev 7022)
+++ tor/trunk/src/or/dns.c	2006-08-11 07:09:45 UTC (rev 7023)
@@ -312,8 +312,8 @@
       if (removed != resolve) {
         log_err(LD_BUG, "The expired resolve we purged didn't match any in"
                 " the cache. Tried to purge %s (%p); instead got %s (%p).",
-                resolve->address, resolve,
-                removed ? removed->address : "NULL", remove);
+                resolve->address, (void*)resolve,
+                removed ? removed->address : "NULL", (void*)remove);
       }
       tor_assert(removed == resolve);
       resolve->magic = 0xF0BBF0BB;
@@ -362,6 +362,7 @@
       }
     default:
       tor_assert(0);
+      return;
     }
   connection_edge_send_command(conn, circuit_get_by_edge_conn(conn),
                                RELAY_COMMAND_RESOLVED, buf, buflen,
@@ -619,8 +620,8 @@
   if (tmp != resolve) {
     log_err(LD_BUG, "The cancelled resolve we purged didn't match any in"
             " the cache. Tried to purge %s (%p); instead got %s (%p).",
-            resolve->address, resolve,
-            tmp ? tmp->address : "NULL", tmp);
+            resolve->address, (void*)resolve,
+            tmp ? tmp->address : "NULL", (void*)tmp);
   }
   tor_assert(tmp == resolve);
   resolve->magic = 0xABABABAB;
@@ -749,8 +750,8 @@
   if (removed != resolve) {
     log_err(LD_BUG, "The pending resolve we found wasn't removable from"
             " the cache. Tried to purge %s (%p); instead got %s (%p).",
-            resolve->address, resolve,
-            removed ? removed->address : "NULL", removed);
+            resolve->address, (void*)resolve,
+            removed ? removed->address : "NULL", (void*)removed);
   }
   assert_resolve_ok(resolve);
   assert_cache_ok();