cleanup

finger.c

@@ -48,4 +48,4 @@ static void *finger_download(const Selector *sel, URL *url, char **mime, Parser
 }
 
 
-const Protocol finger = {"finger", "79", tcp_read, tcp_peek, socket_error, socket_close, finger_download};
+const Protocol finger = {"finger", "79", tcp_read, tcp_peek, socket_error, tcp_close, finger_download};

gopher.c

@@ -142,4 +142,4 @@ static void *gopher_download(const Selector *sel, URL *url, char **mime, Parser
 }
 
 
-const Protocol gopher = {"gopher", "70", tcp_read, tcp_peek, socket_error, socket_close, gopher_download};
+const Protocol gopher = {"gopher", "70", tcp_read, tcp_peek, socket_error, tcp_close, gopher_download};

socket.c

@@ -26,8 +26,3 @@ static int socket_error(const URL *url, void *c, int err) {
 	else error(0, "failed to download `%s`: %s", url->url, strerror(errno));
 	return 1;
 }
-
-
-static void socket_close(void *c) {
-	close((int)(intptr_t)c);
-}

spartan.c

@@ -110,4 +110,4 @@ static void *spartan_download(const Selector *sel, URL *url, char **mime, Parser
 }
 
 
-const Protocol spartan = {"spartan", "300", tcp_read, tcp_peek, socket_error, socket_close, spartan_download};
+const Protocol spartan = {"spartan", "300", tcp_read, tcp_peek, socket_error, tcp_close, spartan_download};

tcp.c

@@ -29,6 +29,11 @@ static int tcp_peek(void *c, void *buffer, int length) {
 }
 
 
+static void tcp_close(void *c) {
+	close((int)(intptr_t)c);
+}
+
+
 static ssize_t sendall(int sockfd, const void *buf, size_t len, int flags) {
 	ssize_t sent = 0, total;
 	for (total = 0; total < (ssize_t)len && (sent = send(sockfd, (char *)buf + total, len - total, flags)) > 0; total += sent);