diff options
author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 21:34:01 +0000 |
---|---|---|
committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-12-09 21:34:01 +0000 |
commit | 328205c56ec6e622a03d16fac1e5d00ff84c221a (patch) | |
tree | 94661d2a89a648a2cc4190953d76400de46df581 | |
parent | 19f035ccee65846678357f3b2e145191dabb6424 (diff) |
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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Dec 10 06:33:39 2015 Eric Wong <e@80x24.org> + + * marshal.c (memsize_dump_arg): remove NULL check + (memsize_load_arg): ditto + Thu Dec 10 05:53:18 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/mkconfig.rb: rbconfig must not be fronzen-string-literal to @@ -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 = { |