diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 17:14:54 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-10-11 17:14:54 +0000 |
| commit | 960e6ec4155db284d7446f45b34bfabfedad1ea5 (patch) | |
| tree | b6d6f02e1e9cfd6af77e42d1722667a2b2df295e | |
| parent | b761d20ec07d6dc0154692152b624300c08b0626 (diff) | |
| download | ruby-960e6ec4155db284d7446f45b34bfabfedad1ea5.tar.gz ruby-960e6ec4155db284d7446f45b34bfabfedad1ea5.tar.xz ruby-960e6ec4155db284d7446f45b34bfabfedad1ea5.zip | |
* ext/digest/digest.c (get_digest_base_metadata): Use an instance
variable of a class object instead of a class variable for
metadata. This change is crucial for ruby 1.8 and applying it
also to the trunk will assure compatibilities.
* ext/digest/md5/md5init.c (Init_md5): Ditto.
* ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto.
* ext/digest/sha1/sha1init.c (Init_sha1): Ditto.
* ext/digest/sha2/sha2init.c (Init_sha2): Ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | ext/digest/digest.c | 4 | ||||
| -rw-r--r-- | ext/digest/md5/md5init.c | 4 | ||||
| -rw-r--r-- | ext/digest/rmd160/rmd160init.c | 4 | ||||
| -rw-r--r-- | ext/digest/sha1/sha1init.c | 4 | ||||
| -rw-r--r-- | ext/digest/sha2/sha2init.c | 4 |
6 files changed, 25 insertions, 10 deletions
@@ -1,3 +1,18 @@ +Thu Oct 12 02:12:31 2006 Akinori MUSHA <knu@iDaemons.org> + + * ext/digest/digest.c (get_digest_base_metadata): Use an instance + variable of a class object instead of a class variable for + metadata. This change is crucial for ruby 1.8 and applying it + also to the trunk will assure compatibilities. + + * ext/digest/md5/md5init.c (Init_md5): Ditto. + + * ext/digest/rmd160/rmd160init.c (Init_rmd160): Ditto. + + * ext/digest/sha1/sha1init.c (Init_sha1): Ditto. + + * ext/digest/sha2/sha2init.c (Init_sha2): Ditto. + Wed Oct 11 21:36:47 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/digest.c (rb_digest_base_alloc, diff --git a/ext/digest/digest.c b/ext/digest/digest.c index dd78739b8..b8144f370 100644 --- a/ext/digest/digest.c +++ b/ext/digest/digest.c @@ -28,11 +28,11 @@ get_digest_base_metadata(VALUE klass) VALUE obj; algo_t *algo; - if (rb_cvar_defined(klass, id_metadata) == Qfalse) { + if (rb_ivar_defined(klass, id_metadata) == Qfalse) { return NULL; } - obj = rb_cvar_get(klass, id_metadata); + obj = rb_ivar_get(klass, id_metadata); Data_Get_Struct(obj, algo_t, algo); diff --git a/ext/digest/md5/md5init.c b/ext/digest/md5/md5init.c index 781e8ea4c..6fdf6e0a2 100644 --- a/ext/digest/md5/md5init.c +++ b/ext/digest/md5/md5init.c @@ -31,6 +31,6 @@ Init_md5() rb_define_const(cDigest_MD5, "DIGEST_LENGTH", INT2NUM(MD5_DIGEST_LENGTH)); rb_define_const(cDigest_MD5, "BLOCK_LENGTH", INT2NUM(MD5_BLOCK_LENGTH)); - rb_cvar_set(cDigest_MD5, rb_intern("metadata"), - Data_Wrap_Struct(rb_cObject, 0, 0, &md5), Qtrue); + rb_ivar_set(cDigest_MD5, rb_intern("metadata"), + Data_Wrap_Struct(rb_cObject, 0, 0, &md5)); } diff --git a/ext/digest/rmd160/rmd160init.c b/ext/digest/rmd160/rmd160init.c index 896756723..585ba05c3 100644 --- a/ext/digest/rmd160/rmd160init.c +++ b/ext/digest/rmd160/rmd160init.c @@ -34,6 +34,6 @@ Init_rmd160() id_metadata = rb_intern("metadata"); - rb_cvar_set(cDigest_RMD160, id_metadata, - Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160), Qtrue); + rb_ivar_set(cDigest_RMD160, id_metadata, + Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160)); } diff --git a/ext/digest/sha1/sha1init.c b/ext/digest/sha1/sha1init.c index bd92c5940..e56f18bf6 100644 --- a/ext/digest/sha1/sha1init.c +++ b/ext/digest/sha1/sha1init.c @@ -31,6 +31,6 @@ Init_sha1() rb_define_const(cDigest_SHA1, "DIGEST_LENGTH", INT2NUM(SHA1_DIGEST_LENGTH)); rb_define_const(cDigest_SHA1, "BLOCK_LENGTH", INT2NUM(SHA1_BLOCK_LENGTH)); - rb_cvar_set(cDigest_SHA1, rb_intern("metadata"), - Data_Wrap_Struct(rb_cObject, 0, 0, &sha1), Qtrue); + rb_ivar_set(cDigest_SHA1, rb_intern("metadata"), + Data_Wrap_Struct(rb_cObject, 0, 0, &sha1)); } diff --git a/ext/digest/sha2/sha2init.c b/ext/digest/sha2/sha2init.c index cc815e7f1..c5a16ab4d 100644 --- a/ext/digest/sha2/sha2init.c +++ b/ext/digest/sha2/sha2init.c @@ -41,8 +41,8 @@ Init_sha2() rb_define_const(cDigest_SHA##bitlen, "DIGEST_LENGTH", INT2NUM(SHA##bitlen##_DIGEST_LENGTH)); \ rb_define_const(cDigest_SHA##bitlen, "BLOCK_LENGTH", INT2NUM(SHA##bitlen##_BLOCK_LENGTH)); \ \ - rb_cvar_set(cDigest_SHA##bitlen, id_metadata, \ - Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen), Qtrue); + rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \ + Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen)); FOREACH_BITLEN(DEFINE_ALGO_CLASS) } |