mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
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
This commit is contained in:
parent
19f035ccee
commit
328205c56e
2 changed files with 7 additions and 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>
|
Thu Dec 10 05:53:18 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* tool/mkconfig.rb: rbconfig must not be fronzen-string-literal to
|
* tool/mkconfig.rb: rbconfig must not be fronzen-string-literal to
|
||||||
|
|
|
@ -207,7 +207,7 @@ free_dump_arg(void *ptr)
|
||||||
static size_t
|
static size_t
|
||||||
memsize_dump_arg(const void *ptr)
|
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 = {
|
static const rb_data_type_t dump_arg_data = {
|
||||||
|
@ -1091,7 +1091,7 @@ free_load_arg(void *ptr)
|
||||||
static size_t
|
static size_t
|
||||||
memsize_load_arg(const void *ptr)
|
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 = {
|
static const rb_data_type_t load_arg_data = {
|
||||||
|
|
Loading…
Add table
Reference in a new issue