merges r20148 from trunk into ruby_1_9_1.

* ext/gdbm/gdbm.c (fgdbm_index): make #index warn like Hash.
  [ruby-dev:37039]

* ext/sdbm/init.c (Init_sdbm): typo fixed.  [ruby-dev:37039]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 6 deletions

diff --git a/test/dbm/test_dbm.rb b/test/dbm/test_dbm.rb
index 5cf8acb68c..1845a6db55 100644
--- a/test/dbm/test_dbm.rb
+++ b/test/dbm/test_dbm.rb
@@ -217,7 +217,7 @@ if defined? DBM
 
       n = 0
       ret = @dbm.each_pair {|key, val|
-        assert_not_nil(i = keys.key(key))
+        assert_not_nil(i = keys.index(key))
         assert_equal(val, values[i])
 
         n += 1
@@ -239,7 +239,7 @@ if defined? DBM
       n = 0
       ret = @dbm.each_value {|val|
         assert_not_nil(key = @dbm.key(val))
-        assert_not_nil(i = keys.key(key))
+        assert_not_nil(i = keys.index(key))
         assert_equal(val, values[i])
 
         n += 1
@@ -260,7 +260,7 @@ if defined? DBM
 
       n = 0
       ret = @dbm.each_key {|key|
-        assert_not_nil(i = keys.key(key))
+        assert_not_nil(i = keys.index(key))
         assert_equal(@dbm[key], values[i])
 
         n += 1
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index 8c86d4510d..7e28d5121d 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -276,9 +276,9 @@ if defined? GDBM
       }
     end
 
-    def test_index
+    def test_key
       assert_equal('bar', @gdbm['foo'] = 'bar')
-      assert_equal('foo', @gdbm.index('bar'))
+      assert_equal('foo', @gdbm.key('bar'))
       assert_nil(@gdbm['bar'])
     end
 
@@ -354,7 +354,7 @@ if defined? GDBM
 
       n = 0
       ret = @gdbm.each_value {|val|
-        assert_not_nil(key = @gdbm.index(val))
+        assert_not_nil(key = @gdbm.key(val))
         assert_not_nil(i = keys.index(key))
         assert_equal(val, values[i])