[or-cvs] fix a 32bit/64bit sprintf mixup that weasel pointed out

Roger Dingledine arma at seul.org
Tue Mar 22 23:27:31 UTC 2005


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

Modified Files:
	main.c 
Log Message:
fix a 32bit/64bit sprintf mixup that weasel pointed out


Index: main.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/main.c,v
retrieving revision 1.467
retrieving revision 1.468
diff -u -d -r1.467 -r1.468
--- main.c	22 Mar 2005 20:25:51 -0000	1.467
+++ main.c	22 Mar 2005 23:27:29 -0000	1.468
@@ -697,9 +697,9 @@
     } else if (
          now >= conn->timestamp_lastempty + options->KeepalivePeriod*10 &&
          now >= conn->timestamp_lastwritten + options->KeepalivePeriod*10) {
-      log_fn(LOG_NOTICE,"Expiring stuck connection to %d (%s:%d). (%ul bytes to flush; %d seconds since last write)",
+      log_fn(LOG_NOTICE,"Expiring stuck connection to %d (%s:%d). (%d bytes to flush; %d seconds since last write)",
              i, conn->address, conn->port,
-             (unsigned long)buf_datalen(conn->outbuf),
+             (int)buf_datalen(conn->outbuf),
              (int)(now-conn->timestamp_lastwritten));
       connection_mark_for_close(conn);
     } else {



More information about the tor-commits mailing list