[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] fix a 32bit/64bit sprintf mixup that weasel pointed out
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] fix a 32bit/64bit sprintf mixup that weasel pointed out
- From: arma@xxxxxxxx (Roger Dingledine)
- Date: Tue, 22 Mar 2005 18:27:31 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 22 Mar 2005 18:27:53 -0500
- Reply-to: or-dev@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
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 {