mirror of https://github.com/moparisthebest/curl
Curl_unix2addr: avoid using the variable name 'sun'
I suspect this causes compile failures on Solaris: Bug: http://curl.haxx.se/mail/lib-2014-12/0081.html
This commit is contained in:
parent
0da4524a22
commit
1cc5194337
|
@ -488,7 +488,7 @@ Curl_addrinfo *Curl_str2addr(char *address, int port)
|
||||||
Curl_addrinfo *Curl_unix2addr(const char *path)
|
Curl_addrinfo *Curl_unix2addr(const char *path)
|
||||||
{
|
{
|
||||||
Curl_addrinfo *ai;
|
Curl_addrinfo *ai;
|
||||||
struct sockaddr_un *sun;
|
struct sockaddr_un *sa_un;
|
||||||
size_t path_len;
|
size_t path_len;
|
||||||
|
|
||||||
ai = calloc(1, sizeof(Curl_addrinfo));
|
ai = calloc(1, sizeof(Curl_addrinfo));
|
||||||
|
@ -500,7 +500,7 @@ Curl_addrinfo *Curl_unix2addr(const char *path)
|
||||||
}
|
}
|
||||||
/* sun_path must be able to store the NUL-terminated path */
|
/* sun_path must be able to store the NUL-terminated path */
|
||||||
path_len = strlen(path);
|
path_len = strlen(path);
|
||||||
if(path_len >= sizeof(sun->sun_path)) {
|
if(path_len >= sizeof(sa_un->sun_path)) {
|
||||||
free(ai->ai_addr);
|
free(ai->ai_addr);
|
||||||
free(ai);
|
free(ai);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -509,9 +509,9 @@ Curl_addrinfo *Curl_unix2addr(const char *path)
|
||||||
ai->ai_family = AF_UNIX;
|
ai->ai_family = AF_UNIX;
|
||||||
ai->ai_socktype = SOCK_STREAM; /* assume reliable transport for HTTP */
|
ai->ai_socktype = SOCK_STREAM; /* assume reliable transport for HTTP */
|
||||||
ai->ai_addrlen = (curl_socklen_t) sizeof(struct sockaddr_un);
|
ai->ai_addrlen = (curl_socklen_t) sizeof(struct sockaddr_un);
|
||||||
sun = (void *) ai->ai_addr;
|
sa_un = (void *) ai->ai_addr;
|
||||||
sun->sun_family = AF_UNIX;
|
sa_un->sun_family = AF_UNIX;
|
||||||
memcpy(sun->sun_path, path, path_len + 1); /* copy NUL byte */
|
memcpy(sa_un->sun_path, path, path_len + 1); /* copy NUL byte */
|
||||||
return ai;
|
return ai;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue