nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

tor_assert(), not assert()

Browse Source 
svn:r1777
This commit is contained in:
Nick Mathewson 2004-05-02 20:27:48 +00:00
parent 3dd1ef8783
commit e6f3bf2a68
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/fakepoll.c
View File

@ -26,7 +26,6 @@
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#include <winsock.h> #include <winsock.h>
#endif #endif
#include <assert.h>
/* by default, windows handles only 64 fd's */ /* by default, windows handles only 64 fd's */
#if defined(MS_WINDOWS) && !defined(FD_SETSIZE) #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) { for (idx = 0; idx < nfds; ++idx) {
ufds[idx].revents = 0; ufds[idx].revents = 0;
fd = ufds[idx].fd; fd = ufds[idx].fd;
assert (fd >= 0); tor_assert(fd >= 0);
if (fd > maxfd) { if (fd > maxfd) {
maxfd = fd; maxfd = fd;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS

4
src/common/util.c
View File

@ -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, /* 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 * 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 #ifdef MS_WINDOWS
int tor_socket_errno(int sock) int tor_socket_errno(int sock)

2
src/common/util.h
View File

@ -256,7 +256,7 @@ const char *tor_socket_strerror(int e);
#define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS) #define ERRNO_IS_EINPROGRESS(e) ((e) == EINPROGRESS)
#define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS) #define ERRNO_IS_CONN_EINPROGRESS(e) ((e) == EINPROGRESS)
#define tor_socket_errno(sock) (errno) #define tor_socket_errno(sock) (errno)
#define tor_socket_strerror(e) strerror(e) #define tor_socket_strerror(e) strerror(e)
#endif #endif
#endif #endif