From 328205c56ec6e622a03d16fac1e5d00ff84c221a Mon Sep 17 00:00:00 2001 From: normal Date: Wed, 9 Dec 2015 21:34:01 +0000 Subject: [PATCH] marshal.c: remove NULL checks for *_memsize This follows r52986, NULL checks in rb_data_type_t.function.dsize callbacks are unnecessary. * marshal.c (memsize_dump_arg): remove NULL check (memsize_load_arg): ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53018 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 24dcb1134e..6293fa5395 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 10 06:33:39 2015 Eric Wong + + * marshal.c (memsize_dump_arg): remove NULL check + (memsize_load_arg): ditto + Thu Dec 10 05:53:18 2015 Nobuyoshi Nakada * tool/mkconfig.rb: rbconfig must not be fronzen-string-literal to diff --git a/marshal.c b/marshal.c index 8bc80194c0..d67ce87145 100644 --- a/marshal.c +++ b/marshal.c @@ -207,7 +207,7 @@ free_dump_arg(void *ptr) static size_t memsize_dump_arg(const void *ptr) { - return ptr ? sizeof(struct dump_arg) : 0; + return sizeof(struct dump_arg); } static const rb_data_type_t dump_arg_data = { @@ -1091,7 +1091,7 @@ free_load_arg(void *ptr) static size_t memsize_load_arg(const void *ptr) { - return ptr ? sizeof(struct load_arg) : 0; + return sizeof(struct load_arg); } static const rb_data_type_t load_arg_data = {