aboutsummaryrefslogtreecommitdiffstats
path: root/ext/socket
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-09 01:01:17 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-12-09 01:01:17 +0000
commitf0b726be62a364f1c4088bec9617a5bd3b889aa1 (patch)
tree747bdfdc049be6d4290cf28a1a7675fe7a8efcfa /ext/socket
parentab92677972f3b7cc39e6bfdb54930e66c490d322 (diff)
downloadruby-f0b726be62a364f1c4088bec9617a5bd3b889aa1.tar.gz
* ext/**/*.c (*_memsize): same as r52986 for extensions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52988 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r--ext/socket/ifaddr.c2
-rw-r--r--ext/socket/raddrinfo.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/ext/socket/ifaddr.c b/ext/socket/ifaddr.c
index 37edcaffb1..be2cb65602 100644
--- a/ext/socket/ifaddr.c
+++ b/ext/socket/ifaddr.c
@@ -62,8 +62,6 @@ ifaddr_memsize(const void *ptr)
{
const rb_ifaddr_t *ifaddr;
const rb_ifaddr_root_t *root;
- if (ptr == NULL)
- return 0;
ifaddr = ptr;
root = get_root(ifaddr);
return sizeof(rb_ifaddr_root_t) + (root->numifaddrs - 1) * sizeof(rb_ifaddr_t);
diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c
index 237055df8f..92556fc9d2 100644
--- a/ext/socket/raddrinfo.c
+++ b/ext/socket/raddrinfo.c
@@ -725,7 +725,7 @@ addrinfo_mark(void *ptr)
static size_t
addrinfo_memsize(const void *ptr)
{
- return ptr ? sizeof(rb_addrinfo_t) : 0;
+ return sizeof(rb_addrinfo_t);
}
static const rb_data_type_t addrinfo_type = {