diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/-test-/st/numhash/numhash.c | 2 | ||||
| -rw-r--r-- | ext/bigdecimal/bigdecimal.c | 2 | ||||
| -rw-r--r-- | ext/fiddle/closure.c | 11 | ||||
| -rw-r--r-- | ext/fiddle/function.c | 7 | ||||
| -rw-r--r-- | ext/fiddle/handle.c | 2 | ||||
| -rw-r--r-- | ext/fiddle/pointer.c | 2 | ||||
| -rw-r--r-- | ext/openssl/ossl_cipher.c | 2 | ||||
| -rw-r--r-- | ext/socket/ifaddr.c | 2 | ||||
| -rw-r--r-- | ext/socket/raddrinfo.c | 2 | ||||
| -rw-r--r-- | ext/stringio/stringio.c | 1 | ||||
| -rw-r--r-- | ext/strscan/strscan.c | 6 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 2 |
13 files changed, 20 insertions, 25 deletions
@@ -1,3 +1,7 @@ +Wed Dec 9 09:58:09 2015 Koichi Sasada <ko1@atdot.net> + + * ext/**/*.c (*_memsize): same as r52986 for extensions. + Wed Dec 9 09:46:19 2015 SHIBATA Hiroshi <hsbt@ruby-lang.org> * .gitignore: ignored ISeq binary format. diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c index e033886f9d..fc35f476cd 100644 --- a/ext/-test-/st/numhash/numhash.c +++ b/ext/-test-/st/numhash/numhash.c @@ -10,7 +10,7 @@ numhash_free(void *ptr) static size_t numhash_memsize(const void *ptr) { - return ptr ? st_memsize(ptr) : 0; + return st_memsize(ptr); } static const rb_data_type_t numhash_type = { diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 85ae0be985..32fbe684b2 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -172,7 +172,7 @@ static size_t BigDecimal_memsize(const void *ptr) { const Real *pv = ptr; - return pv ? (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT)) : 0; + return (sizeof(*pv) + pv->MaxPrec * sizeof(BDIGIT)); } static const rb_data_type_t BigDecimal_data_type = { 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 = { diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 1318378c26..09b021d987 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -91,7 +91,7 @@ static size_t ossl_cipher_memsize(const void *ptr) { const EVP_CIPHER_CTX *ctx = ptr; - return ctx ? sizeof(*ctx) : 0; + return sizeof(*ctx); } static VALUE 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 = { diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index 9c23daf0bb..4fbc36bffc 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -67,7 +67,6 @@ static size_t strio_memsize(const void *p) { const struct StringIO *ptr = p; - if (!ptr) return 0; return sizeof(struct StringIO); } diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index a0a015bed5..f7592c9249 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -181,11 +181,7 @@ static size_t strscan_memsize(const void *ptr) { const struct strscanner *p = ptr; - size_t size = 0; - if (p) { - size = sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs); - } - return size; + return sizeof(*p) - sizeof(p->regs) + onig_region_memsize(&p->regs); } static const rb_data_type_t strscanner_type = { diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index a76d3fc184..14147ab7bc 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -3872,7 +3872,7 @@ static size_t com_hash_size(const void *ptr) { const st_table *tbl = ptr; - return tbl ? st_memsize(tbl) : 0; + return st_memsize(tbl); } void |