From 26afc1a2318479d3951736b9280817c9bcd3fac9 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 4 Sep 2008 01:33:47 +0000 Subject: * io.c (argf_next_argv, argf_set_encoding): copy struct wise. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19115 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- io.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'io.c') diff --git a/io.c b/io.c index 39ee4d7c2..40975f775 100644 --- a/io.c +++ b/io.c @@ -5883,10 +5883,7 @@ argf_next_argv(VALUE argf) rb_io_t *fptr; GetOpenFile(current_file, fptr); - fptr->encs.enc = argf_enc; - fptr->encs.enc2 = argf_enc2; - fptr->encs.flags = argf_ecflags; - fptr->encs.ecopts = argf_ecopts; + fptr->encs = ARGF.encs; clear_codeconv(fptr); } } @@ -7563,10 +7560,7 @@ argf_set_encoding(int argc, VALUE *argv, VALUE argf) } rb_io_set_encoding(argc, argv, current_file); GetOpenFile(current_file, fptr); - argf_enc = fptr->encs.enc; - argf_enc2 = fptr->encs.enc2; - argf_ecflags = fptr->encs.flags; - argf_ecopts = fptr->encs.ecopts; + ARGF.encs = fptr->encs; return argf; } -- cgit