[or-cvs] if we insist on printing pointer values, at least make it s...

arma at seul.org arma at seul.org
Sun Jun 4 06:17:34 UTC 2006


Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	eventdns.c 
Log Message:
if we insist on printing pointer values, at least make it stop
complaining on (my particular) 64 bit platform.


Index: eventdns.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/eventdns.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -d -r1.3 -r1.4
--- eventdns.c	4 Jun 2006 06:16:20 -0000	1.3
+++ eventdns.c	4 Jun 2006 06:17:32 -0000	1.4
@@ -477,7 +477,7 @@ request_finished(struct request *const r
 		}
 	}
 
-	log("Removing timeout for %x\n", (unsigned) req);
+	log("Removing timeout for %lx\n", (unsigned long) req);
 	evtimer_del(&req->timeout_event);
 
 	search_request_finished(req);
@@ -933,7 +933,7 @@ static void
 eventdns_request_timeout_callback(int fd, short events, void *arg) {
 	struct request *const req = (struct request *) arg;
 	
-	log("Request %x timed out\n", (unsigned) arg);
+	log("Request %lx timed out\n", (unsigned long) arg);
 
 	req->ns->timedout++;
 	if (req->ns->timedout > global_max_nameserver_timeout) {
@@ -1005,7 +1005,7 @@ eventdns_request_transmit(struct request
 		// fall through
 	default:
 		// all ok
-		log("Setting timeout for %x\n", (unsigned) req);
+		log("Setting timeout for %lx\n", (unsigned long) req);
 		evtimer_set(&req->timeout_event, eventdns_request_timeout_callback, req);
 		evtimer_add(&req->timeout_event, &global_timeout);
 		req->tx_count++;



More information about the tor-commits mailing list