зеркало из https://github.com/github/ruby.git
Initialize errno variables and fix maybe-uninitialized warnings
This commit is contained in:
Родитель
4099b04c09
Коммит
0f417d640d
|
@ -481,7 +481,7 @@ rb_getaddrinfo(const char *hostp, const char *portp, const struct addrinfo *hint
|
||||||
{
|
{
|
||||||
int retry;
|
int retry;
|
||||||
struct getaddrinfo_arg *arg;
|
struct getaddrinfo_arg *arg;
|
||||||
int err, gai_errno;
|
int err, gai_errno = 0;
|
||||||
|
|
||||||
start:
|
start:
|
||||||
retry = 0;
|
retry = 0;
|
||||||
|
@ -531,7 +531,7 @@ start:
|
||||||
/* Because errno is threadlocal, the errno value we got from the call to getaddrinfo() in the thread
|
/* Because errno is threadlocal, the errno value we got from the call to getaddrinfo() in the thread
|
||||||
* (in case of EAI_SYSTEM return value) is not propagated to the caller of _this_ function. Set errno
|
* (in case of EAI_SYSTEM return value) is not propagated to the caller of _this_ function. Set errno
|
||||||
* explicitly, as round-tripped through struct getaddrinfo_arg, to deal with that */
|
* explicitly, as round-tripped through struct getaddrinfo_arg, to deal with that */
|
||||||
errno = gai_errno;
|
if (gai_errno) errno = gai_errno;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -700,7 +700,7 @@ rb_getnameinfo(const struct sockaddr *sa, socklen_t salen,
|
||||||
{
|
{
|
||||||
int retry;
|
int retry;
|
||||||
struct getnameinfo_arg *arg;
|
struct getnameinfo_arg *arg;
|
||||||
int err, gni_errno;
|
int err, gni_errno = 0;
|
||||||
|
|
||||||
start:
|
start:
|
||||||
retry = 0;
|
retry = 0;
|
||||||
|
@ -750,7 +750,7 @@ start:
|
||||||
|
|
||||||
/* Make sure we copy the thread-local errno value from the getnameinfo thread back to this thread, so
|
/* Make sure we copy the thread-local errno value from the getnameinfo thread back to this thread, so
|
||||||
* calling code sees the correct errno */
|
* calling code sees the correct errno */
|
||||||
errno = gni_errno;
|
if (gni_errno) errno = gni_errno;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче