aboutsummaryrefslogtreecommitdiffstats
path: root/socket.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2004-09-16 17:22:31 +0000
committerWayne Davison <wayned@samba.org>2004-09-16 17:22:31 +0000
commiteb8ffa904005dace3611528f66cc42cbad624d7d (patch)
tree6d03ded43aeded2e7eb7cbcb1854be36aee3f101 /socket.c
parenta7a1cc2c75512623fa105c09570954afc4ef0b7f (diff)
downloadandroid_external_rsync-eb8ffa904005dace3611528f66cc42cbad624d7d.tar.gz
android_external_rsync-eb8ffa904005dace3611528f66cc42cbad624d7d.tar.bz2
android_external_rsync-eb8ffa904005dace3611528f66cc42cbad624d7d.zip
Actually, since the close calls shouldn't fail (now that listener
is properly set to -1 on close), we don't really need to play the save-errno game after all.
Diffstat (limited to 'socket.c')
-rw-r--r--socket.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/socket.c b/socket.c
index 8d21735e..5810c48b 100644
--- a/socket.c
+++ b/socket.c
@@ -687,7 +687,7 @@ static int socketpair_tcp(int fd[2])
struct sockaddr_in sock;
struct sockaddr_in sock2;
socklen_t socklen = sizeof sock;
- int errno_save, connect_done = 0;
+ int connect_done = 0;
fd[0] = fd[1] = listener = -1;
@@ -741,14 +741,12 @@ static int socketpair_tcp(int fd[2])
return 0;
failed:
- errno_save = errno;
if (fd[0] != -1)
close(fd[0]);
if (fd[1] != -1)
close(fd[1]);
if (listener != -1)
close(listener);
- errno = errno_save;
return -1;
}