summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-10 13:39:52 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-10 13:39:52 +0000
commit25b14c6b9c80b17dedc562bb635d71f88dff2c9a (patch)
tree5b170b161c4805c12c7c70243004f97a9a82d704
parent7bf9690701d38744548c56ec404f13a58d1cbf5a (diff)
downloadruby-25b14c6b9c80b17dedc562bb635d71f88dff2c9a.tar.gz
ruby-25b14c6b9c80b17dedc562bb635d71f88dff2c9a.tar.xz
ruby-25b14c6b9c80b17dedc562bb635d71f88dff2c9a.zip
* ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
[ruby-talk:103062] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6443 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/sdbm/init.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f77ba8d1d..20e9cb0b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 10 19:19:41 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * ext/sdbm/init.c (fsdbm_store): sdbm should use StringValue().
+ [ruby-talk:103062]
+
Wed Jun 9 18:04:14 2004 akira yamada <akira@ruby-lang.org>
* lib/uri/generic.rb (URI::Generic::merge,
diff --git a/ext/sdbm/init.c b/ext/sdbm/init.c
index 2dfd17196..0f9ae1dbf 100644
--- a/ext/sdbm/init.c
+++ b/ext/sdbm/init.c
@@ -475,14 +475,12 @@ fsdbm_store(obj, keystr, valstr)
}
fdbm_modify(obj);
- keystr = rb_obj_as_string(keystr);
+ StringValue(keystr);
key.dptr = RSTRING(keystr)->ptr;
key.dsize = RSTRING(keystr)->len;
- if (NIL_P(valstr)) return fsdbm_delete(obj, keystr);
-
- valstr = rb_obj_as_string(valstr);
+ StringValue(valstr);
val.dptr = RSTRING(valstr)->ptr;
val.dsize = RSTRING(valstr)->len;