ruby-changes:15377
From: mame <ko1@a...>
Date: Fri, 9 Apr 2010 20:34:09 +0900 (JST)
Subject: [ruby-changes:15377] Ruby:r27269 (trunk): * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can
mame 2010-04-09 20:32:52 +0900 (Fri, 09 Apr 2010) New Revision: 27269 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27269 Log: * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can precede the last reference). [ruby-dev:40942] Modified files: trunk/ChangeLog trunk/dir.c Index: ChangeLog =================================================================== --- ChangeLog (revision 27268) +++ ChangeLog (revision 27269) @@ -1,3 +1,8 @@ +Fri Apr 9 20:29:13 2010 Yusuke Endoh <mame@t...> + + * dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can + precede the last reference). [ruby-dev:40942] + Fri Apr 9 20:05:05 2010 Yusuke Endoh <mame@t...> * dir.c (push_glob): add RB_GC_GUARD to prevent str being free'ed. Index: dir.c =================================================================== --- dir.c (revision 27268) +++ dir.c (revision 27269) @@ -1622,17 +1622,15 @@ { struct glob_args args; rb_encoding *enc = rb_enc_get(str); - int ret; if (enc == rb_usascii_encoding()) enc = rb_filesystem_encoding(); args.func = push_pattern; args.value = ary; args.enc = enc; - ret = ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, - rb_glob_caller, (VALUE)&args, enc); RB_GC_GUARD(str); - return ret; + return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, + rb_glob_caller, (VALUE)&args, enc); } static VALUE -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/