Commit 04bf4b0f authored by Nick Mathewson's avatar Nick Mathewson 🎨
Browse files

r7327@Kushana: nickm | 2006-08-11 00:00:36 -0700

 Fix a pedantic warning


svn:r7023
parent ffab3b48
...@@ -312,8 +312,8 @@ purge_expired_resolves(time_t now) ...@@ -312,8 +312,8 @@ purge_expired_resolves(time_t now)
if (removed != resolve) { if (removed != resolve) {
log_err(LD_BUG, "The expired resolve we purged didn't match any in" 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).", " the cache. Tried to purge %s (%p); instead got %s (%p).",
resolve->address, resolve, resolve->address, (void*)resolve,
removed ? removed->address : "NULL", remove); removed ? removed->address : "NULL", (void*)remove);
} }
tor_assert(removed == resolve); tor_assert(removed == resolve);
resolve->magic = 0xF0BBF0BB; resolve->magic = 0xF0BBF0BB;
...@@ -362,6 +362,7 @@ send_resolved_cell(edge_connection_t *conn, uint8_t answer_type) ...@@ -362,6 +362,7 @@ send_resolved_cell(edge_connection_t *conn, uint8_t answer_type)
} }
default: default:
tor_assert(0); tor_assert(0);
return;
} }
connection_edge_send_command(conn, circuit_get_by_edge_conn(conn), connection_edge_send_command(conn, circuit_get_by_edge_conn(conn),
RELAY_COMMAND_RESOLVED, buf, buflen, RELAY_COMMAND_RESOLVED, buf, buflen,
...@@ -619,8 +620,8 @@ dns_cancel_pending_resolve(char *address) ...@@ -619,8 +620,8 @@ dns_cancel_pending_resolve(char *address)
if (tmp != resolve) { if (tmp != resolve) {
log_err(LD_BUG, "The cancelled resolve we purged didn't match any in" 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).", " the cache. Tried to purge %s (%p); instead got %s (%p).",
resolve->address, resolve, resolve->address, (void*)resolve,
tmp ? tmp->address : "NULL", tmp); tmp ? tmp->address : "NULL", (void*)tmp);
} }
tor_assert(tmp == resolve); tor_assert(tmp == resolve);
resolve->magic = 0xABABABAB; resolve->magic = 0xABABABAB;
...@@ -749,8 +750,8 @@ dns_found_answer(const char *address, uint32_t addr, char outcome, ...@@ -749,8 +750,8 @@ dns_found_answer(const char *address, uint32_t addr, char outcome,
if (removed != resolve) { if (removed != resolve) {
log_err(LD_BUG, "The pending resolve we found wasn't removable from" log_err(LD_BUG, "The pending resolve we found wasn't removable from"
" the cache. Tried to purge %s (%p); instead got %s (%p).", " the cache. Tried to purge %s (%p); instead got %s (%p).",
resolve->address, resolve, resolve->address, (void*)resolve,
removed ? removed->address : "NULL", removed); removed ? removed->address : "NULL", (void*)removed);
} }
assert_resolve_ok(resolve); assert_resolve_ok(resolve);
assert_cache_ok(); assert_cache_ok();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment