diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-02 14:13:58 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-10-02 14:13:58 +0000 |
| commit | 71c41cf5a5a72e2f7f1f7b7ac1a14213f1fb52cc (patch) | |
| tree | 8ecc76cc309c3201a4501b047be7223bf3b2a587 /ext/socket/getaddrinfo.c | |
| parent | ab6b4786152b663215f05841f7d131d1a7f43db7 (diff) | |
* io.c (rb_io_wait_readable): handle retryable errors.
* io.c (rb_io_wait_writable): ditto.
* ext/socket/socket.c (bsock_send): ditto.
* ext/socket/socket.c (s_recvfrom): ditto.
* ext/socket/socket.c (s_accept): ditto.
* ext/socket/socket.c (udp_send): ditto.
* ext/socket/getaddrinfo.c (afdl): made private structures constant.
* rubyio.h: prototype; rb_io_wait_readable(), rb_io_wait_writable().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2921 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket/getaddrinfo.c')
| -rw-r--r-- | ext/socket/getaddrinfo.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/socket/getaddrinfo.c b/ext/socket/getaddrinfo.c index 0a6af3111f..06daa7cca2 100644 --- a/ext/socket/getaddrinfo.c +++ b/ext/socket/getaddrinfo.c @@ -105,7 +105,7 @@ struct sockinet { u_short si_port; }; -static struct afd { +static const struct afd { int a_af; int a_addrlen; int a_socklen; @@ -136,14 +136,14 @@ static struct afd { #define PTON_MAX 4 #endif -static int get_name __P((const char *, struct afd *, +static int get_name __P((const char *, const struct afd *, struct addrinfo **, char *, struct addrinfo *, int)); static int get_addr __P((const char *, int, struct addrinfo **, struct addrinfo *, int)); static int str_isnumber __P((const char *)); -static const char *ai_errlist[] = { +static const char *const ai_errlist[] = { "success.", "address family for hostname not supported.", /* EAI_ADDRFAMILY */ "temporary failure in name resolution.", /* EAI_AGAIN */ @@ -418,7 +418,7 @@ getaddrinfo(hostname, servname, hints, res) * non-passive socket -> localhost (127.0.0.1 or ::1) */ if (hostname == NULL) { - struct afd *afd; + const struct afd *afd; int s; for (afd = &afdl[0]; afd->a_af; afd++) { @@ -533,7 +533,7 @@ getaddrinfo(hostname, servname, hints, res) static int get_name(addr, afd, res, numaddr, pai, port0) const char *addr; - struct afd *afd; + const struct afd *afd; struct addrinfo **res; char *numaddr; struct addrinfo *pai; @@ -588,7 +588,7 @@ get_addr(hostname, af, res, pai, port0) struct addrinfo sentinel; struct hostent *hp; struct addrinfo *top, *cur; - struct afd *afd; + const struct afd *afd; int i, error = 0, h_error; char *ap; |