tor_assert(), not assert()

svn:r1777

diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c
index 3051486b3a7c9a076a840ff1aa020ffb8482c934..e99065bfc81d68fb537d6eb061fd672bebf36fe1 100644 (file)
--- a/src/common/fakepoll.c
+++ b/src/common/fakepoll.c
@@ -26,7 +26,6 @@
 #elif defined(_MSC_VER)
 #include <winsock.h>
 #endif
-#include <assert.h>
 
 /* by default, windows handles only 64 fd's */
 #if defined(MS_WINDOWS) && !defined(FD_SETSIZE)
@@ -61,7 +60,7 @@ tor_poll(struct pollfd *ufds, unsigned int nfds, int timeout)
         for (idx = 0; idx < nfds; ++idx) {
                 ufds[idx].revents = 0;
                 fd = ufds[idx].fd;
-                assert (fd >= 0);
+                tor_assert(fd >= 0);
                 if (fd > maxfd) {
                   maxfd = fd;
 #ifdef MS_WINDOWS

diff --git a/src/common/util.c b/src/common/util.c
index eb02ee6ece0ce39636ecfb664c3d9a488f46c293..617c4c77aa76d51e162b7e052c578985436d20de 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -1094,7 +1094,9 @@ tor_socketpair(int family, int type, int protocol, int fd[2])
 
 /* On Windows, WSAEWOULDBLOCK is not always correct: when you see it,
  * you need to ask the socket for its actual errno.  Also, you need to
- * get your errors from WSAGetLastError, not errno.
+ * get your errors from WSAGetLastError, not errno.  (If you supply a
+ * socket of -1, we check WSAGetLastError, but don't correct
+ * WSAEWOULDBLOCKs.)
  */
 #ifdef MS_WINDOWS
 int tor_socket_errno(int sock)

diff --git a/src/common/util.h b/src/common/util.h
index 1976e6ad54eea55f2e8ec08a4f2e2120602172e3..465078aacbe162b8ab49e46d8acb09038f988af2 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -256,7 +256,7 @@ const char *tor_socket_strerror(int e);
 #define ERRNO_IS_EINPROGRESS(e)      ((e) == EINPROGRESS)
 #define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS)
 #define tor_socket_errno(sock)       (errno)
-#define tor_socket_strerror(e)              strerror(e)
+#define tor_socket_strerror(e)       strerror(e)
 #endif
 
 #endif