1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/option.c (inspect_errno): new function.

Browse Source 
(sockopt_inspect): use inspect_errno for SO_ERROR.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-22 09:40:42 +00:00
parent af7d8584c5
commit c160c6e59e
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Feb 22 18:40:04 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/option.c (inspect_errno): new function.
(sockopt_inspect): use inspect_errno for SO_ERROR.
Sun Feb 22 15:11:51 2009 Tanaka Akira <akr@fsij.org> Sun Feb 22 15:11:51 2009 Tanaka Akira <akr@fsij.org>
* re.c (Init_Regexp): define Regexp::FIXEDENCODING. [ruby-dev:38066] * re.c (Init_Regexp): define Regexp::FIXEDENCODING. [ruby-dev:38066]

18
ext/socket/option.c
View File

@ -233,6 +233,22 @@ inspect_int(int level, int optname, VALUE data, VALUE ret)
} }
} }
static int
inspect_errno(int level, int optname, VALUE data, VALUE ret)
{
if (RSTRING_LEN(data) == sizeof(int)) {
int i;
char *err;
memcpy((char*)&i, RSTRING_PTR(data), sizeof(int));
err = strerror(i);
rb_str_catf(ret, " %s (%d)", err, i);
return 1;
}
else {
return 0;
}
}
#if defined(IPV6_MULTICAST_IF) || defined(IPV6_MULTICAST_LOOP) #if defined(IPV6_MULTICAST_IF) || defined(IPV6_MULTICAST_LOOP)
static int static int
inspect_uint(int level, int optname, VALUE data, VALUE ret) inspect_uint(int level, int optname, VALUE data, VALUE ret)
@ -429,7 +445,7 @@ sockopt_inspect(VALUE self)
case SO_DEBUG: inspected = inspect_int(level, optname, data, ret); break; case SO_DEBUG: inspected = inspect_int(level, optname, data, ret); break;
# endif # endif
# if defined(SO_ERROR) /* POSIX */ # if defined(SO_ERROR) /* POSIX */
case SO_ERROR: inspected = inspect_int(level, optname, data, ret); break; case SO_ERROR: inspected = inspect_errno(level, optname, data, ret); break;
# endif # endif
# if defined(SO_TYPE) /* POSIX */ # if defined(SO_TYPE) /* POSIX */
case SO_TYPE: inspected = inspect_socktype(level, optname, data, ret); break; case SO_TYPE: inspected = inspect_socktype(level, optname, data, ret); break;