summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 09:40:42 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-22 09:40:42 +0000
commitec7cc4bef1b69b00a0eb77944fd00fae7ac72345 (patch)
tree8ff4e387cf85e7b33e958796613a567b80adf18f /ext
parentb1b91390a1de8184e4ecfbd9f08587840f6f1e69 (diff)
downloadruby-ec7cc4bef1b69b00a0eb77944fd00fae7ac72345.tar.gz
ruby-ec7cc4bef1b69b00a0eb77944fd00fae7ac72345.tar.xz
ruby-ec7cc4bef1b69b00a0eb77944fd00fae7ac72345.zip
* ext/socket/option.c (inspect_errno): new function.
(sockopt_inspect): use inspect_errno for SO_ERROR. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/option.c18
1 files changed, 17 insertions, 1 deletions
diff --git a/ext/socket/option.c b/ext/socket/option.c
index caac0abb2..a18806141 100644
--- a/ext/socket/option.c
+++ b/ext/socket/option.c
@@ -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)
static int
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;
# endif
# 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
# if defined(SO_TYPE) /* POSIX */
case SO_TYPE: inspected = inspect_socktype(level, optname, data, ret); break;