From 708b846815c758645cf19f905513c67f7a024491 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 30 Jan 2011 18:54:28 +1030
Subject: [PATCH] net: remove noerr dependency.

It's cool, but making it standalone is slightly simpler and means license is
pure MIT.
---
 ccan/net/_info      | 1 -
 ccan/net/net.c      | 7 ++++---
 ccan/net/test/run.c | 1 +
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ccan/net/_info b/ccan/net/_info
index 845458c0..a9c57206 100644
--- a/ccan/net/_info
+++ b/ccan/net/_info
@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
 		return 1;
 
 	if (strcmp(argv[1], "depends") == 0) {
-		printf("ccan/noerr\n");
 		return 0;
 	}
 
diff --git a/ccan/net/net.c b/ccan/net/net.c
index 82d6c4e5..8bcaa937 100644
--- a/ccan/net/net.c
+++ b/ccan/net/net.c
@@ -1,5 +1,4 @@
 #include <ccan/net/net.h>
-#include <ccan/noerr/noerr.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <poll.h>
@@ -64,7 +63,7 @@ static void remove_fd(struct pollfd pfd[],
 
 int net_connect(const struct addrinfo *addrinfo)
 {
-	int sockfd = -1;
+	int sockfd = -1, saved_errno;
 	unsigned int i, num;
 	const struct addrinfo *ipv4 = NULL, *ipv6 = NULL;
 	const struct addrinfo *addr[MAX_PROTOS];
@@ -142,8 +141,10 @@ got_one:
 		sockfd = pfd[i].fd;
 
 out:
+	saved_errno = errno;
 	for (i = 0; i < num; i++)
 		if (pfd[i].fd != sockfd)
-			close_noerr(pfd[i].fd);
+			close(pfd[i].fd);
+	errno = saved_errno;
 	return sockfd;
 }
diff --git a/ccan/net/test/run.c b/ccan/net/test/run.c
index 2e241cbb..57fc9855 100644
--- a/ccan/net/test/run.c
+++ b/ccan/net/test/run.c
@@ -3,6 +3,7 @@
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
 #include <sys/wait.h>
+#include <stdio.h>
 #include <err.h>
 
 static unsigned int server(int protocol, int type)
-- 
2.39.2