mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-17 14:59:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

exported symbols must use lowercase "curl_", and I also fixed two compiler

Browse Source 
warnings, one C99 thing and the bad pointer sent to the callback
This commit is contained in:
Daniel Stenberg 2007-10-03 08:58:40 +00:00
parent 1abde9009a
commit 4bf28cb904
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/curl/curl.h
View File

@ -246,7 +246,7 @@ typedef int (*curl_sockopt_callback)(void *clientp,
curl_socket_t curlfd,
curlsocktype purpose);
struct Curl_sockaddr {
struct curl_sockaddr {
int family;
int socktype;
int protocol;
@ -255,9 +255,9 @@ struct Curl_sockaddr {
};
typedef curl_socket_t
(*curl_opensocket_callback)(void* clentp,
(*curl_opensocket_callback)(void *clientp,
curlsocktype purpose,
struct Curl_sockaddr* address);
struct curl_sockaddr *address);
#ifndef CURL_NO_OLDIES
/* not used since 7.10.8, will be removed in a future release */

9
lib/connect.c
View File

@ -682,10 +682,11 @@ singleipconnect(struct connectdata *conn,
* for a largest possible struct sockaddr only. We should add some space for
* the other fields we are using. Hence the addr_storage size math.
*/
char addr_storage[sizeof(struct Curl_sockaddr)-
char addr_storage[sizeof(struct curl_sockaddr)-
sizeof(struct sockaddr)+
sizeof(struct Curl_sockaddr_storage)];
struct Curl_sockaddr* addr=(struct Curl_sockaddr*)&addr_storage;
struct curl_sockaddr *addr=(struct curl_sockaddr*)&addr_storage;
const void *iptoprint;
addr->family=ai->ai_family;
addr->socktype=conn->socktype;
@ -697,7 +698,7 @@ singleipconnect(struct connectdata *conn,
/* optionally use callback to get the socket */
sockfd = (data->set.fopensocket)?
data->set.fopensocket(data->set.opensocket_client, CURLSOCKTYPE_IPCXN,
&addr):
addr):
socket(addr->family, addr->socktype, addr->protocol);
if (sockfd == CURL_SOCKET_BAD)
return CURL_SOCKET_BAD;
@ -706,7 +707,7 @@ singleipconnect(struct connectdata *conn,
/* FIXME: do we have Curl_printable_address-like with struct sockaddr* as
argument? */
const void *iptoprint = &((const struct sockaddr_in*)(&addr->addr))->sin_addr;
iptoprint = &((const struct sockaddr_in*)(&addr->addr))->sin_addr;
#ifdef ENABLE_IPV6
if(addr->family==AF_INET6)
iptoprint= &((const struct sockaddr_in6*)(&addr->addr))->sin6_addr;