From dff42b0ea0e6ef368ebbe0a666ff9be8d708c6df Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 9 Dec 2015 01:01:17 +0000
Subject: * 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
---
 ext/socket/ifaddr.c    | 2 --
 ext/socket/raddrinfo.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'ext/socket')

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 = {
-- 
cgit v1.2.3