use 0 for rb_data_type_t::reserved instead of NULL, since its type
may be changed in the future and possibly not a pointer type.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48662 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-01 06:38:04 +00:00
Родитель 06bdfd0dfb
Коммит e580a631be
47 изменённых файлов: 59 добавлений и 59 удалений

4
cont.c
Просмотреть файл

@ -413,7 +413,7 @@ cont_save_machine_stack(rb_thread_t *th, rb_context_t *cont)
static const rb_data_type_t cont_data_type = {
"continuation",
{cont_mark, cont_free, cont_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static inline void
@ -1143,7 +1143,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval)
static const rb_data_type_t fiber_data_type = {
"fiber",
{fiber_mark, fiber_free, fiber_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

2
dir.c
Просмотреть файл

@ -379,7 +379,7 @@ dir_memsize(const void *ptr)
static const rb_data_type_t dir_data_type = {
"dir",
{dir_mark, dir_free, dir_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE dir_close(VALUE);

Просмотреть файл

@ -72,7 +72,7 @@ static int load_encoding(const char *name);
static const rb_data_type_t encoding_data_type = {
"encoding",
{0, 0, 0,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type)

Просмотреть файл

@ -167,7 +167,7 @@ static const rb_data_type_t enumerator_data_type = {
enumerator_free,
enumerator_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static struct enumerator *
@ -1078,7 +1078,7 @@ static const rb_data_type_t yielder_data_type = {
yielder_free,
yielder_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static struct yielder *
@ -1185,7 +1185,7 @@ static const rb_data_type_t generator_data_type = {
generator_free,
generator_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static struct generator *

Просмотреть файл

@ -1116,7 +1116,7 @@ static const rb_data_type_t name_err_mesg_data_type = {
name_err_mesg_free,
name_err_mesg_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
/* :nodoc: */

Просмотреть файл

@ -9,7 +9,7 @@ usr_size(const void *ptr)
static const rb_data_type_t usrmarshal_type = {
"UsrMarshal",
{0, RUBY_DEFAULT_FREE, usr_size,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
};

Просмотреть файл

@ -16,7 +16,7 @@ numhash_memsize(const void *ptr)
static const rb_data_type_t numhash_type = {
"numhash",
{0, numhash_free, numhash_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
};

Просмотреть файл

@ -162,7 +162,7 @@ static const rb_data_type_t BigDecimal_data_type = {
"BigDecimal",
{ 0, BigDecimal_delete, BigDecimal_memsize, },
#ifdef RUBY_TYPED_FREE_IMMEDIATELY
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
#endif
};

Просмотреть файл

@ -2947,7 +2947,7 @@ d_lite_memsize(const void *ptr)
static const rb_data_type_t d_lite_type = {
"Date",
{d_lite_gc_mark, RUBY_TYPED_DEFAULT_FREE, d_lite_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED,
};

Просмотреть файл

@ -81,7 +81,7 @@ memsize_dbm(const void *ptr)
static const rb_data_type_t dbm_type = {
"dbm",
{0, free_dbm, memsize_dbm,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -540,7 +540,7 @@ get_digest_base_metadata(VALUE klass)
static const rb_data_type_t digest_type = {
"digest",
{0, RUBY_TYPED_DEFAULT_FREE, 0,},
NULL, NULL,
0, 0,
(RUBY_TYPED_FREE_IMMEDIATELY|RUBY_TYPED_WB_PROTECTED),
};

Просмотреть файл

@ -136,7 +136,7 @@ memsize_dbm(const void *ptr)
static const rb_data_type_t dbm_type = {
"gdbm",
{0, free_dbm, memsize_dbm,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -518,7 +518,7 @@ static size_t State_memsize(const void *ptr)
static const rb_data_type_t JSON_Generator_State_type = {
"JSON/Generator/State",
{NULL, State_free, State_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -2126,7 +2126,7 @@ static size_t JSON_memsize(const void *ptr)
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -849,7 +849,7 @@ static size_t JSON_memsize(const void *ptr)
static const rb_data_type_t JSON_Parser_type = {
"JSON/Parser",
{JSON_mark, JSON_free, JSON_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -518,7 +518,7 @@ iow_size(const void *ptr)
static const rb_data_type_t iow_data_type = {
"ObjectSpace::InternalObjectWrapper",
{iow_mark, 0, iow_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE rb_mInternalObjectWrapper;

Просмотреть файл

@ -45,7 +45,7 @@ ossl_bn_size(const void *ptr)
static const rb_data_type_t ossl_bn_type = {
"OpenSSL/BN",
{0, ossl_bn_free, ossl_bn_size,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -43,7 +43,7 @@ static size_t ossl_cipher_memsize(const void *ptr);
static const rb_data_type_t ossl_cipher_type = {
"OpenSSL/Cipher",
{0, ossl_cipher_free, ossl_cipher_memsize,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -41,7 +41,7 @@ static size_t memsize(const void *ptr)
static const rb_data_type_t psych_emitter_type = {
"Psych/emitter",
{0, dealloc, 0,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -61,7 +61,7 @@ static size_t memsize(const void *ptr)
static const rb_data_type_t psych_parser_type = {
"Psych/parser",
{0, dealloc, 0,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -112,7 +112,7 @@ memsize_dbm(const void *ptr)
static const rb_data_type_t sdbm_type = {
"sdbm",
{0, free_sdbm, memsize_dbm,},
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY,
};

Просмотреть файл

@ -78,7 +78,7 @@ static const rb_data_type_t strio_data_type = {
strio_free,
strio_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#define check_strio(self) ((struct StringIO*)rb_check_typeddata((self), &strio_data_type))

Просмотреть файл

@ -191,7 +191,7 @@ strscan_memsize(const void *ptr)
static const rb_data_type_t strscanner_type = {
"StringScanner",
{strscan_mark, strscan_free, strscan_memsize},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

Просмотреть файл

@ -110,7 +110,7 @@ static long evs_length(void);
static const rb_data_type_t oleevent_datatype = {
"win32ole_event",
{NULL, oleevent_free, oleevent_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
STDMETHODIMP EVENTSINK_Invoke(

Просмотреть файл

@ -45,7 +45,7 @@ static VALUE folemethod_inspect(VALUE self);
static const rb_data_type_t olemethod_datatype = {
"win32ole_method",
{NULL, olemethod_free, olemethod_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static void

Просмотреть файл

@ -31,7 +31,7 @@ static VALUE foleparam_inspect(VALUE self);
static const rb_data_type_t oleparam_datatype = {
"win32ole_param",
{NULL, oleparam_free, oleparam_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static void

Просмотреть файл

@ -23,7 +23,7 @@ static VALUE folerecord_inspect(VALUE self);
static const rb_data_type_t olerecord_datatype = {
"win32ole_record",
{NULL, olerecord_free, olerecord_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static HRESULT

Просмотреть файл

@ -50,7 +50,7 @@ static VALUE foletype_inspect(VALUE self);
static const rb_data_type_t oletype_datatype = {
"win32ole_type",
{NULL, oletype_free, oletype_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
/*

Просмотреть файл

@ -34,7 +34,7 @@ static VALUE foletypelib_inspect(VALUE self);
static const rb_data_type_t oletypelib_datatype = {
"win32ole_typelib",
{NULL, oletypelib_free, oletypelib_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

Просмотреть файл

@ -25,7 +25,7 @@ static VALUE folevariable_inspect(VALUE self);
static const rb_data_type_t olevariable_datatype = {
"win32ole_variable",
{NULL, olevariable_free, olevariable_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static void

Просмотреть файл

@ -26,7 +26,7 @@ static VALUE folevariant_set_value(VALUE self, VALUE val);
static const rb_data_type_t olevariant_datatype = {
"win32ole_variant",
{NULL, olevariant_free, olevariant_size,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static void

2
file.c
Просмотреть файл

@ -367,7 +367,7 @@ stat_memsize(const void *p)
static const rb_data_type_t stat_data_type = {
"stat",
{NULL, RUBY_TYPED_DEFAULT_FREE, stat_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

2
gc.c
Просмотреть файл

@ -7602,7 +7602,7 @@ static const rb_data_type_t weakmap_type = {
wmap_free,
wmap_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

2
io.c
Просмотреть файл

@ -7758,7 +7758,7 @@ argf_memsize(const void *ptr)
static const rb_data_type_t argf_type = {
"ARGF",
{argf_mark, argf_free, argf_memsize},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static inline void

2
iseq.c
Просмотреть файл

@ -179,7 +179,7 @@ static const rb_data_type_t iseq_data_type = {
iseq_free,
iseq_memsize,
}, /* functions */
NULL, NULL,
0, 0,
RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED
};

Просмотреть файл

@ -203,7 +203,7 @@ memsize_dump_arg(const void *ptr)
static const rb_data_type_t dump_arg_data = {
"dump_arg",
{mark_dump_arg, free_dump_arg, memsize_dump_arg,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE
@ -1084,7 +1084,7 @@ memsize_load_arg(const void *ptr)
static const rb_data_type_t load_arg_data = {
"load_arg",
{mark_load_arg, free_load_arg, memsize_load_arg,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#define r_entry(v, arg) r_entry0((v), (arg)->data->num_entries, (arg))

Просмотреть файл

@ -10539,7 +10539,7 @@ static const rb_data_type_t parser_data_type = {
parser_free,
parser_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#ifndef RIPPER

6
proc.c
Просмотреть файл

@ -67,7 +67,7 @@ static const rb_data_type_t proc_data_type = {
RUBY_TYPED_DEFAULT_FREE,
proc_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
VALUE
@ -265,7 +265,7 @@ const rb_data_type_t ruby_binding_data_type = {
binding_free,
binding_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
VALUE
@ -1117,7 +1117,7 @@ static const rb_data_type_t method_data_type = {
bm_free,
bm_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
VALUE

Просмотреть файл

@ -1376,7 +1376,7 @@ memsize_exec_arg(const void *ptr)
static const rb_data_type_t exec_arg_data_type = {
"exec_arg",
{mark_exec_arg, RUBY_TYPED_DEFAULT_FREE, memsize_exec_arg},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#ifdef _WIN32

Просмотреть файл

@ -334,7 +334,7 @@ static const rb_data_type_t random_data_type = {
random_free,
random_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static rb_random_t *

Просмотреть файл

@ -3912,7 +3912,7 @@ thgroup_memsize(const void *ptr)
static const rb_data_type_t thgroup_data_type = {
"thgroup",
{NULL, RUBY_TYPED_DEFAULT_FREE, thgroup_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
/*
@ -4134,7 +4134,7 @@ mutex_memsize(const void *ptr)
static const rb_data_type_t mutex_data_type = {
"mutex",
{mutex_mark, mutex_free, mutex_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
VALUE
@ -4584,7 +4584,7 @@ thread_shield_mark(void *ptr)
static const rb_data_type_t thread_shield_data_type = {
"thread_shield",
{thread_shield_mark, 0, 0,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

2
time.c
Просмотреть файл

@ -1796,7 +1796,7 @@ time_memsize(const void *tobj)
static const rb_data_type_t time_data_type = {
"time",
{time_mark, RUBY_TYPED_DEFAULT_FREE, time_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

Просмотреть файл

@ -2920,7 +2920,7 @@ econv_memsize(const void *ptr)
static const rb_data_type_t econv_data_type = {
"econv",
{NULL, econv_free, econv_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE

Просмотреть файл

@ -1563,7 +1563,7 @@ autoload_memsize(const void *ptr)
static const rb_data_type_t autoload_data_type = {
"autoload",
{autoload_mark, autoload_free, autoload_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#define check_autoload_table(av) \
@ -1607,7 +1607,7 @@ autoload_i_memsize(const void *ptr)
static const rb_data_type_t autoload_data_i_type = {
"autoload_i",
{autoload_i_mark, RUBY_TYPED_DEFAULT_FREE, autoload_i_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
#define check_autoload_data(av) \

6
vm.c
Просмотреть файл

@ -383,7 +383,7 @@ env_memsize(const void *ptr)
static const rb_data_type_t env_data_type = {
"VM/env",
{env_mark, RUBY_TYPED_DEFAULT_FREE, env_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE check_env_value(VALUE envval);
@ -1879,7 +1879,7 @@ vm_memsize(const void *ptr)
static const rb_data_type_t vm_data_type = {
"VM",
{NULL, NULL, vm_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
@ -2146,7 +2146,7 @@ const rb_data_type_t ruby_threadptr_data_type = {
thread_free,
thread_memsize,
},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
VALUE

Просмотреть файл

@ -106,7 +106,7 @@ location_memsize(const void *ptr)
static const rb_data_type_t location_data_type = {
"frame_info",
{location_mark, RUBY_TYPED_DEFAULT_FREE, location_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static inline rb_backtrace_location_t *
@ -404,7 +404,7 @@ backtrace_memsize(const void *ptr)
static const rb_data_type_t backtrace_data_type = {
"backtrace",
{backtrace_mark, backtrace_free, backtrace_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
int

Просмотреть файл

@ -667,7 +667,7 @@ tp_memsize(const void *ptr)
static const rb_data_type_t tp_data_type = {
"tracepoint",
{tp_mark, RUBY_TYPED_NEVER_FREE, tp_memsize,},
NULL, NULL, RUBY_TYPED_FREE_IMMEDIATELY
0, 0, RUBY_TYPED_FREE_IMMEDIATELY
};
static VALUE