diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-06 04:13:24 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-04-06 04:13:24 +0000 |
| commit | 3f56949401549b639cc1db62d7e8d24807d504d7 (patch) | |
| tree | 2667e025377d5a66f22227f4279d60c05e1e0791 | |
| parent | e4d66f4d6edea8ef331d29c17fd90c8d82bc8f7e (diff) | |
| download | ruby-3f56949401549b639cc1db62d7e8d24807d504d7.tar.gz | |
* ext/socket/socket.c (raise_socket_error): never return.
* ext/socket/socket.c (make_hostent): must return value.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6106 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/socket.c | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Tue Apr 6 13:11:48 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * ext/socket/socket.c (raise_socket_error): never return. + + * ext/socket/socket.c (make_hostent): must return value. + Tue Apr 6 00:14:43 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * error.c (Init_Exception): remove Exception#to_str. [Ruby2] diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 72cf058a78..9e1d705521 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -528,6 +528,7 @@ bsock_do_not_rev_lookup_set(self, val) return val; } +NORETURN(static void raise_socket_error _((char *, int))); static void raise_socket_error(reason, error) char *reason; @@ -1143,14 +1144,13 @@ make_hostent(host, addr, ipaddr) struct addrinfo* addr; VALUE (*ipaddr)_((struct sockaddr*, size_t)); { - VALUE ary; struct hostent_arg arg; arg.host = host; arg.addr = addr; arg.ipaddr = ipaddr; - ary = rb_ensure(make_hostent_internal, (VALUE)&arg, - RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr); + return rb_ensure(make_hostent_internal, (VALUE)&arg, + RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr); } VALUE |