From fdeaae678d4ce5152045fd034f32a29da9f6c5ff Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 5 Oct 2001 06:05:56 +0000
Subject: [PATCH] SM's patch applied, we should not use arguments or variables
that have the same name as common functions...
---
lib/connect.c | 16 +++++++++-------
lib/connect.h | 4 ++--
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/lib/connect.c b/lib/connect.c
index 6e2019e17..206a43edc 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -308,8 +308,9 @@ static CURLcode bindlocal(struct connectdata *conn,
return CURLE_HTTP_PORT_FAILED;
}
-#endif /* end of ipv4-specific section */
+#else /* end of ipv4-specific section */
+/* we only use socketerror() on IPv6-enabled machines */
static
int socketerror(int sockfd)
{
@@ -322,6 +323,7 @@ int socketerror(int sockfd)
return err;
}
+#endif
/*
* TCP connect to the given host with timeout, proxy or remote doesn't matter.
@@ -331,9 +333,9 @@ int socketerror(int sockfd)
CURLcode Curl_connecthost(struct connectdata *conn, /* context */
Curl_addrinfo *remotehost, /* use one in here */
- int port, /* connect to this */
- int *socket, /* the connected socket */
- Curl_ipconnect **addr) /* the one we used */
+ int port, /* connect to this */
+ int *sockconn, /* the connected socket */
+ Curl_ipconnect **addr) /* the one we used */
{
struct SessionHandle *data = conn->data;
int rc;
@@ -531,7 +533,7 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
if(-1 == rc) {
/* no good connect was made */
sclose(sockfd);
- *socket = -1;
+ *sockconn = -1;
return CURLE_COULDNT_CONNECT;
}
@@ -544,8 +546,8 @@ CURLcode Curl_connecthost(struct connectdata *conn, /* context */
#endif
/* allow NULL-pointers to get passed in */
- if(socket)
- *socket = sockfd; /* the socket descriptor we've connected */
+ if(sockconn)
+ *sockconn = sockfd; /* the socket descriptor we've connected */
return CURLE_OK;
}
diff --git a/lib/connect.h b/lib/connect.h
index 1b7319d1e..8c5fac508 100644
--- a/lib/connect.h
+++ b/lib/connect.h
@@ -25,8 +25,8 @@
CURLcode Curl_connecthost(struct connectdata *conn,
Curl_addrinfo *host, /* connect to this */
- long port, /* connect to this port number */
- int *socket, /* not set if error is returned */
+ long port, /* connect to this port number */
+ int *sockconn, /* not set if error is returned */
Curl_ipconnect **addr /* the one we used */
); /* index we used */
#endif