[or-cvs] r12995: Fix windows compile error (in tor/trunk: . src/or)

nickm at seul.org nickm at seul.org
Thu Dec 27 05:18:37 UTC 2007


Author: nickm
Date: 2007-12-27 00:18:36 -0500 (Thu, 27 Dec 2007)
New Revision: 12995

Modified:
   tor/trunk/
   tor/trunk/src/or/buffers.c
Log:
 r17407 at catbus:  nickm | 2007-12-27 00:18:31 -0500
 Fix windows compile error



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17407] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/src/or/buffers.c
===================================================================
--- tor/trunk/src/or/buffers.c	2007-12-27 05:08:02 UTC (rev 12994)
+++ tor/trunk/src/or/buffers.c	2007-12-27 05:18:36 UTC (rev 12995)
@@ -506,7 +506,7 @@
   tor_assert(CHUNK_REMAINING_CAPACITY(chunk) >= at_most);
   read_result = tor_socket_recv(fd, CHUNK_WRITE_PTR(chunk), at_most, 0);
   if (read_result < 0) {
-    int e = tor_socket_errno(s);
+    int e = tor_socket_errno(fd);
     if (!ERRNO_IS_EAGAIN(e)) { /* it's a real error */
 #ifdef MS_WINDOWS
       if (e == WSAENOBUFS)



More information about the tor-commits mailing list