diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-21 09:18:34 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-21 09:18:34 +0000 |
commit | b6ef272d025387e6707088ba2f9cef3b9031d2db (patch) | |
tree | 190b49f514b59163a44d62dccdaec4f0cc89176b /io.c | |
parent | d423b884b8d95b878d66de1abc2efa300f8971e2 (diff) | |
download | ruby-b6ef272d025387e6707088ba2f9cef3b9031d2db.tar.gz |
* ext/zlib/zlib.c: remove obsolete prototype macros.
* ext/zlib/zlib.c (struct gzfile): add encoding field to gzfile
structure.
* ext/zlib/zlib.c (rb_gzreader_getc): now works on characters.
* ext/zlib/zlib.c (rb_gzreader_getbyte): new method to retrieve
single byte.
* ext/zlib/zlib.c (rb_gzreader_readbyte): ditto.
* ext/zlib/zlib.c (rb_gzreader_each_byte): renamed from each_char
* ext/zlib/zlib.c (rb_gzreader_ungetc): allow unget strings.
* ext/zlib/zlib.c (rb_gzreader_ungetbyte): renamed from ungetc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19869 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 10 |
1 files changed, 4 insertions, 6 deletions
@@ -3854,8 +3854,8 @@ rb_io_mode_enc(rb_io_t *fptr, const char *modestr) } } -static int -io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p) +int +rb_io_extract_encoding_option(VALUE opt, rb_encoding **enc_p, rb_encoding **enc2_p) { VALUE encoding=Qnil, extenc=Qnil, intenc=Qnil; int extracted = 0; @@ -4009,7 +4009,7 @@ rb_io_extract_modeenc(VALUE *vmode_p, VALUE *vperm_p, VALUE opthash, } ecflags = rb_econv_prepare_opts(opthash, &ecopts); - if (io_extract_encoding_option(opthash, &enc, &enc2)) { + if (rb_io_extract_encoding_option(opthash, &enc, &enc2)) { if (has_enc) { rb_raise(rb_eArgError, "encoding specified twice"); } @@ -4717,7 +4717,6 @@ rb_scan_open_args(int argc, VALUE *argv, mode_t perm; opt = pop_last_hash(&argc, &argv); - rb_scan_args(argc, argv, "12", &fname, &vmode, &vperm); FilePathValue(fname); #if defined _WIN32 || defined __APPLE__ @@ -6878,9 +6877,8 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg) arg->io = rb_io_open(argv[0], INT2NUM(O_RDONLY), INT2FIX(0666), Qnil); return; } - opt = rb_check_convert_type(argv[argc-1], T_HASH, "Hash", "to_hash"); + opt = pop_last_hash(&argc, &argv); if (NIL_P(opt)) goto no_key; - arg->argc--; v = rb_hash_aref(opt, sym_open_args); if (!NIL_P(v)) { |