From 82abe79b9fa3b5a648f453076a28ed9566d02ec8 Mon Sep 17 00:00:00 2001 From: knu Date: Fri, 10 Sep 2010 07:51:58 +0000 Subject: * class.c (rb_scan_args): Add support for optional keyword argument hash. * README.EXT, README.EXT.ja: Update documentation accordingly. * dir.c (dir_initialize): Make use of the new rb_scan_args() feature. * io.c (rb_io_s_popen, rb_scan_open_args, rb_io_initialize) (rb_io_s_pipe, open_key_args, io_s_foreach, io_s_readlines) (rb_io_s_read, rb_io_set_encoding): Ditto. * transcode.c (str_transcode, econv_args) (econv_primitive_convert): Ditto. * ext/zlib/zlib.c (rb_gzreader_initialize): Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- dir.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'dir.c') diff --git a/dir.c b/dir.c index 483c8beafc..f9867e44d7 100644 --- a/dir.c +++ b/dir.c @@ -390,11 +390,10 @@ dir_initialize(int argc, VALUE *argv, VALUE dir) } fsenc = rb_filesystem_encoding(); - rb_scan_args(argc, argv, "11", &dirname, &opt); + argc = rb_scan_args(argc, argv, "1:", &dirname, &opt); if (!NIL_P(opt)) { VALUE v, enc=Qnil; - opt = rb_convert_type(opt, T_HASH, "Hash", "to_hash"); v = rb_hash_aref(opt, sym_enc); if (!NIL_P(v)) enc = v; -- cgit v1.2.3