diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-09 11:32:52 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-09 11:32:52 +0000 |
commit | 1f2def7dd84da6477df1ef9b4e8b39f6ce6f04cb (patch) | |
tree | 5a1c9876a4d7e6a101bbb2cda4f9e1c38ee2d928 /dir.c | |
parent | 5dd8daaa27e409ef1c63e70a59dcafb4a8f9775b (diff) | |
download | ruby-1f2def7dd84da6477df1ef9b4e8b39f6ce6f04cb.tar.gz |
* dir.c (push_glob): clear up the previous commit (RB_GC_GUARD can
precede the last reference). [ruby-dev:40942]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1622,17 +1622,15 @@ push_glob(VALUE ary, VALUE str, int flags) { 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 |