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

ruby-changes:29876

From: glass <ko1@a...>
Date: Fri, 12 Jul 2013 11:22:35 +0900 (JST)
Subject: [ruby-changes:29876] glass:r41928 (trunk): * hash.c (recursive_hash): use RHASH_SIZE() to check hash size.

glass	2013-07-12 11:22:01 +0900 (Fri, 12 Jul 2013)

  New Revision: 41928

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

  Log:
    * hash.c (recursive_hash): use RHASH_SIZE() to check hash size.

  Modified files:
    trunk/ChangeLog
    trunk/hash.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41927)
+++ ChangeLog	(revision 41928)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Jul 12 11:17:41 2013  Masaki Matsushita  <glass.saga@g...>
+
+	* hash.c (recursive_hash): use RHASH_SIZE() to check hash size.
+
 Fri Jul 12 00:20:00 2013  Masaki Matsushita  <glass.saga@g...>
 
 	* hash.c (rb_hash_size): use RHASH_SIZE().
Index: hash.c
===================================================================
--- hash.c	(revision 41927)
+++ hash.c	(revision 41928)
@@ -1869,12 +1869,9 @@ hash_i(VALUE key, VALUE val, VALUE arg) https://github.com/ruby/ruby/blob/trunk/hash.c#L1869
 static VALUE
 recursive_hash(VALUE hash, VALUE dummy, int recur)
 {
-    st_index_t hval;
+    st_index_t hval = RHASH_SIZE(hash);
 
-    if (!RHASH(hash)->ntbl)
-        return LONG2FIX(0);
-    hval = RHASH(hash)->ntbl->num_entries;
-    if (!hval) return LONG2FIX(0);
+    if (!hval) return INT2FIX(0);
     if (recur)
 	hval = rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval);
     else

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

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