aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-08-14 17:51:36 +0000
committerNick Mathewson <nickm@torproject.org>2003-08-14 17:51:36 +0000
commit1777487f4ea898f6919334f8a8cbdba7724f2abd (patch)
treecaf5727bf91d810255b323aeea8a86a1515960ee /src/common/util.c
parentadbc0577728dbf09d5c35efb2c36c0cc11fc5f59 (diff)
downloadtor-1777487f4ea898f6919334f8a8cbdba7724f2abd.tar.gz
tor-1777487f4ea898f6919334f8a8cbdba7724f2abd.zip
Tor now builds on win32.
svn:r400
Diffstat (limited to 'src/common/util.c')
-rw-r--r--src/common/util.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/util.c b/src/common/util.c
index dea4b33719..3a80b94da7 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -116,6 +116,7 @@ int spawn_func(int (*func)(void *), void *data)
/* Child */
func(data);
assert(0); /* Should never reach here. */
+ return 0; /* suppress "control-reaches-end-of-non-void" warning. */
} else {
/* Parent */
return 0;
@@ -236,7 +237,7 @@ tor_socketpair(int family, int type, int protocol, int fd[2])
#ifdef MS_WINDOWS
int correct_socket_errno(int s)
{
- int r, optval, optvallen=sizeof(optval);
+ int optval, optvallen=sizeof(optval);
assert(errno == WSAEWOULDBLOCK);
if (getsockopt(s, SOL_SOCKET, SO_ERROR, (void*)&optval, &optvallen))
return errno;