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/fiddle/closure.c  | 11 +++++------
 ext/fiddle/function.c |  7 +++----
 ext/fiddle/handle.c   |  2 +-
 ext/fiddle/pointer.c  |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'ext/fiddle')

diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c
index 2263b410e8..f19091b29b 100644
--- a/ext/fiddle/closure.c
+++ b/ext/fiddle/closure.c
@@ -41,14 +41,13 @@ closure_memsize(const void * ptr)
     fiddle_closure * cls = (fiddle_closure *)ptr;
     size_t size = 0;
 
-    if (ptr) {
-	size += sizeof(*cls);
+    size += sizeof(*cls);
 #if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-	size += ffi_raw_size(&cls->cif);
+    size += ffi_raw_size(&cls->cif);
 #endif
-	size += sizeof(*cls->argv);
-	size += sizeof(ffi_closure);
-    }
+    size += sizeof(*cls->argv);
+    size += sizeof(ffi_closure);
+
     return size;
 }
 
diff --git a/ext/fiddle/function.c b/ext/fiddle/function.c
index 164e5f3df6..f657d29fe2 100644
--- a/ext/fiddle/function.c
+++ b/ext/fiddle/function.c
@@ -38,12 +38,11 @@ function_memsize(const void *p)
     /* const */ffi_cif *ptr = (ffi_cif *)p;
     size_t size = 0;
 
-    if (ptr) {
-	size += sizeof(*ptr);
+    size += sizeof(*ptr);
 #if !defined(FFI_NO_RAW_API) || !FFI_NO_RAW_API
-	size += ffi_raw_size(ptr);
+    size += ffi_raw_size(ptr);
 #endif
-    }
+
     return size;
 }
 
diff --git a/ext/fiddle/handle.c b/ext/fiddle/handle.c
index 2f93f2346b..410442160c 100644
--- a/ext/fiddle/handle.c
+++ b/ext/fiddle/handle.c
@@ -46,7 +46,7 @@ fiddle_handle_free(void *ptr)
 static size_t
 fiddle_handle_memsize(const void *ptr)
 {
-    return ptr ? sizeof(struct dl_handle) : 0;
+    return sizeof(struct dl_handle);
 }
 
 static const rb_data_type_t fiddle_handle_data_type = {
diff --git a/ext/fiddle/pointer.c b/ext/fiddle/pointer.c
index a09daf77ea..932bc576c5 100644
--- a/ext/fiddle/pointer.c
+++ b/ext/fiddle/pointer.c
@@ -72,7 +72,7 @@ static size_t
 fiddle_ptr_memsize(const void *ptr)
 {
     const struct ptr_data *data = ptr;
-    return data ? sizeof(*data) + data->size : 0;
+    return sizeof(*data) + data->size;
 }
 
 static const rb_data_type_t fiddle_ptr_data_type = {
-- 
cgit v1.2.3