[前][次][番号順一覧][スレッド一覧]

ruby-changes:7499

From: nobu <ko1@a...>
Date: Mon, 1 Sep 2008 16:49:12 +0900 (JST)
Subject: [ruby-changes:7499] Ruby:r19020 (trunk): * ext/digest/md5/md5init.c (md5), ext/digest/rmd160/rmd160init.c

nobu	2008-09-01 16:48:53 +0900 (Mon, 01 Sep 2008)

  New Revision: 19020

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19020

  Log:
    * ext/digest/md5/md5init.c (md5), ext/digest/rmd160/rmd160init.c
      (rmd160) ext/digest/sha1/sha1init.c (sha1),
      ext/digest/sha2/sha2init.c (sha256, sha384, sha512): constified.

  Modified files:
    trunk/ChangeLog
    trunk/ext/digest/md5/md5init.c
    trunk/ext/digest/rmd160/rmd160init.c
    trunk/ext/digest/sha1/sha1init.c
    trunk/ext/digest/sha2/sha2init.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19019)
+++ ChangeLog	(revision 19020)
@@ -1,3 +1,9 @@
+Mon Sep  1 16:48:50 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/digest/md5/md5init.c (md5), ext/digest/rmd160/rmd160init.c
+	  (rmd160) ext/digest/sha1/sha1init.c (sha1),
+	  ext/digest/sha2/sha2init.c (sha256, sha384, sha512): constified.
+
 Mon Sep  1 15:15:40 2008  NARUSE, Yui  <naruse@r...>
 
 	* enc/trans/japanese.trans: fix mapping priority.
Index: ext/digest/md5/md5init.c
===================================================================
--- ext/digest/md5/md5init.c	(revision 19019)
+++ ext/digest/md5/md5init.c	(revision 19020)
@@ -8,7 +8,7 @@
 #include "md5.h"
 #endif
 
-static rb_digest_metadata_t md5 = {
+static const rb_digest_metadata_t md5 = {
     RUBY_DIGEST_API_VERSION,
     MD5_DIGEST_LENGTH,
     MD5_BLOCK_LENGTH,
@@ -36,5 +36,5 @@
     cDigest_MD5 = rb_define_class_under(mDigest, "MD5", cDigest_Base);
 
     rb_ivar_set(cDigest_MD5, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &md5));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&md5));
 }
Index: ext/digest/rmd160/rmd160init.c
===================================================================
--- ext/digest/rmd160/rmd160init.c	(revision 19019)
+++ ext/digest/rmd160/rmd160init.c	(revision 19020)
@@ -8,7 +8,7 @@
 #include "rmd160.h"
 #endif
 
-static rb_digest_metadata_t rmd160 = {
+static const rb_digest_metadata_t rmd160 = {
     RUBY_DIGEST_API_VERSION,
     RMD160_DIGEST_LENGTH,
     RMD160_BLOCK_LENGTH,
@@ -36,5 +36,5 @@
     cDigest_RMD160 = rb_define_class_under(mDigest, "RMD160", cDigest_Base);
 
     rb_ivar_set(cDigest_RMD160, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &rmd160));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&rmd160));
 }
Index: ext/digest/sha1/sha1init.c
===================================================================
--- ext/digest/sha1/sha1init.c	(revision 19019)
+++ ext/digest/sha1/sha1init.c	(revision 19020)
@@ -8,7 +8,7 @@
 #include "sha1.h"
 #endif
 
-static rb_digest_metadata_t sha1 = {
+static const rb_digest_metadata_t sha1 = {
     RUBY_DIGEST_API_VERSION,
     SHA1_DIGEST_LENGTH,
     SHA1_BLOCK_LENGTH,
@@ -36,5 +36,5 @@
     cDigest_SHA1 = rb_define_class_under(mDigest, "SHA1", cDigest_Base);
 
     rb_ivar_set(cDigest_SHA1, rb_intern("metadata"),
-      Data_Wrap_Struct(rb_cObject, 0, 0, &sha1));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha1));
 }
Index: ext/digest/sha2/sha2init.c
===================================================================
--- ext/digest/sha2/sha2init.c	(revision 19019)
+++ ext/digest/sha2/sha2init.c	(revision 19020)
@@ -7,7 +7,7 @@
 #define FOREACH_BITLEN(func)	func(256) func(384) func(512)
 
 #define DEFINE_ALGO_METADATA(bitlen) \
-static rb_digest_metadata_t sha##bitlen = { \
+static const rb_digest_metadata_t sha##bitlen = { \
     RUBY_DIGEST_API_VERSION, \
     SHA##bitlen##_DIGEST_LENGTH, \
     SHA##bitlen##_BLOCK_LENGTH, \
@@ -46,7 +46,7 @@
     cDigest_SHA##bitlen = rb_define_class_under(mDigest, "SHA" #bitlen, cDigest_Base); \
 \
     rb_ivar_set(cDigest_SHA##bitlen, id_metadata, \
-      Data_Wrap_Struct(rb_cObject, 0, 0, &sha##bitlen));
+      Data_Wrap_Struct(rb_cObject, 0, 0, (void *)&sha##bitlen));
 
     FOREACH_BITLEN(DEFINE_ALGO_CLASS)
 }

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]