From e580a631be59d4c7b8d415f4fba907746a72a0b5 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 1 Dec 2014 06:38:04 +0000 Subject: use 0 for reserved 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 --- ext/-test-/marshal/usr/usrmarshal.c | 2 +- ext/-test-/st/numhash/numhash.c | 2 +- ext/bigdecimal/bigdecimal.c | 2 +- ext/date/date_core.c | 2 +- ext/dbm/dbm.c | 2 +- ext/digest/digest.c | 2 +- ext/gdbm/gdbm.c | 2 +- ext/json/generator/generator.c | 2 +- ext/json/parser/parser.c | 2 +- ext/json/parser/parser.rl | 2 +- ext/objspace/objspace.c | 2 +- ext/openssl/ossl_bn.c | 2 +- ext/openssl/ossl_cipher.c | 2 +- ext/psych/psych_emitter.c | 2 +- ext/psych/psych_parser.c | 2 +- ext/sdbm/init.c | 2 +- ext/stringio/stringio.c | 2 +- ext/strscan/strscan.c | 2 +- ext/win32ole/win32ole_event.c | 2 +- ext/win32ole/win32ole_method.c | 2 +- ext/win32ole/win32ole_param.c | 2 +- ext/win32ole/win32ole_record.c | 2 +- ext/win32ole/win32ole_type.c | 2 +- ext/win32ole/win32ole_typelib.c | 2 +- ext/win32ole/win32ole_variable.c | 2 +- ext/win32ole/win32ole_variant.c | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) (limited to 'ext') diff --git a/ext/-test-/marshal/usr/usrmarshal.c b/ext/-test-/marshal/usr/usrmarshal.c index 056f0326c0..0c9e079af2 100644 --- a/ext/-test-/marshal/usr/usrmarshal.c +++ b/ext/-test-/marshal/usr/usrmarshal.c @@ -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, }; diff --git a/ext/-test-/st/numhash/numhash.c b/ext/-test-/st/numhash/numhash.c index a903edd541..e033886f9d 100644 --- a/ext/-test-/st/numhash/numhash.c +++ b/ext/-test-/st/numhash/numhash.c @@ -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, }; diff --git a/ext/bigdecimal/bigdecimal.c b/ext/bigdecimal/bigdecimal.c index 08febb5585..79dffa4108 100644 --- a/ext/bigdecimal/bigdecimal.c +++ b/ext/bigdecimal/bigdecimal.c @@ -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 }; diff --git a/ext/date/date_core.c b/ext/date/date_core.c index 9ef5160b19..07b65a7ed4 100644 --- a/ext/date/date_core.c +++ b/ext/date/date_core.c @@ -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, }; diff --git a/ext/dbm/dbm.c b/ext/dbm/dbm.c index 6f64d13690..c90fe71fce 100644 --- a/ext/dbm/dbm.c +++ b/ext/dbm/dbm.c @@ -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, }; diff --git a/ext/digest/digest.c b/ext/digest/digest.c index b177881cd0..ed96c2f274 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -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), }; diff --git a/ext/gdbm/gdbm.c b/ext/gdbm/gdbm.c index a8f75b27d1..eb802a7563 100644 --- a/ext/gdbm/gdbm.c +++ b/ext/gdbm/gdbm.c @@ -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, }; diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c index 906e902593..f56ac09cd2 100644 --- a/ext/json/generator/generator.c +++ b/ext/json/generator/generator.c @@ -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, }; diff --git a/ext/json/parser/parser.c b/ext/json/parser/parser.c index ada5596b8e..560aa8977f 100644 --- a/ext/json/parser/parser.c +++ b/ext/json/parser/parser.c @@ -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, }; diff --git a/ext/json/parser/parser.rl b/ext/json/parser/parser.rl index dab4bb324b..34e30f4868 100644 --- a/ext/json/parser/parser.rl +++ b/ext/json/parser/parser.rl @@ -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, }; diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c index c423723fa2..bc02e579cd 100644 --- a/ext/objspace/objspace.c +++ b/ext/objspace/objspace.c @@ -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; diff --git a/ext/openssl/ossl_bn.c b/ext/openssl/ossl_bn.c index 0af7d63944..58796fe2a4 100644 --- a/ext/openssl/ossl_bn.c +++ b/ext/openssl/ossl_bn.c @@ -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, }; diff --git a/ext/openssl/ossl_cipher.c b/ext/openssl/ossl_cipher.c index 0efadd1925..fb7ec54dcd 100644 --- a/ext/openssl/ossl_cipher.c +++ b/ext/openssl/ossl_cipher.c @@ -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, }; diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c index 9b5204fd5f..3fc8170f6a 100644 --- a/ext/psych/psych_emitter.c +++ b/ext/psych/psych_emitter.c @@ -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, }; diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c index 7aad9213c4..6b72195625 100644 --- a/ext/psych/psych_parser.c +++ b/ext/psych/psych_parser.c @@ -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, }; diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c index 821918cff0..901824c2a7 100644 --- a/ext/sdbm/init.c +++ b/ext/sdbm/init.c @@ -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, }; diff --git a/ext/stringio/stringio.c b/ext/stringio/stringio.c index ae3843041e..cca408fcb5 100644 --- a/ext/stringio/stringio.c +++ b/ext/stringio/stringio.c @@ -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)) diff --git a/ext/strscan/strscan.c b/ext/strscan/strscan.c index c11eebb947..acb7c61230 100644 --- a/ext/strscan/strscan.c +++ b/ext/strscan/strscan.c @@ -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 diff --git a/ext/win32ole/win32ole_event.c b/ext/win32ole/win32ole_event.c index fdd2c46e99..4443585239 100644 --- a/ext/win32ole/win32ole_event.c +++ b/ext/win32ole/win32ole_event.c @@ -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( diff --git a/ext/win32ole/win32ole_method.c b/ext/win32ole/win32ole_method.c index ebddf54876..ba8cf78015 100644 --- a/ext/win32ole/win32ole_method.c +++ b/ext/win32ole/win32ole_method.c @@ -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 diff --git a/ext/win32ole/win32ole_param.c b/ext/win32ole/win32ole_param.c index d9432ccd20..31cf853b04 100644 --- a/ext/win32ole/win32ole_param.c +++ b/ext/win32ole/win32ole_param.c @@ -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 diff --git a/ext/win32ole/win32ole_record.c b/ext/win32ole/win32ole_record.c index 68b8eaeca6..28d6238492 100644 --- a/ext/win32ole/win32ole_record.c +++ b/ext/win32ole/win32ole_record.c @@ -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 diff --git a/ext/win32ole/win32ole_type.c b/ext/win32ole/win32ole_type.c index 48df6707e8..efcac883df 100644 --- a/ext/win32ole/win32ole_type.c +++ b/ext/win32ole/win32ole_type.c @@ -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 }; /* diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c index a2058db62a..5a431d8b12 100644 --- a/ext/win32ole/win32ole_typelib.c +++ b/ext/win32ole/win32ole_typelib.c @@ -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 diff --git a/ext/win32ole/win32ole_variable.c b/ext/win32ole/win32ole_variable.c index 9b142f9cd2..dd583828f2 100644 --- a/ext/win32ole/win32ole_variable.c +++ b/ext/win32ole/win32ole_variable.c @@ -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 diff --git a/ext/win32ole/win32ole_variant.c b/ext/win32ole/win32ole_variant.c index c357f9c8e1..1731ab7a61 100644 --- a/ext/win32ole/win32ole_variant.c +++ b/ext/win32ole/win32ole_variant.c @@ -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 -- cgit v1.2.3