archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

* dir.c (push_braces): was confusing VALUE and char*.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2004-11-11 05:55:02 +00:00
parent 185d6e251a
commit 98101c1f96
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,6 +1,8 @@
Thu Nov 11 09:41:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Nov 11 09:41:01 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* dir.c (rb_push_glob): Dir.glob should have call its block. * dir.c (push_braces): was confusing VALUE and char*.
* dir.c (rb_push_glob): Dir.glob should have called its block.
Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Nov 11 01:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>

11
dir.c
View file

@ -1153,19 +1153,18 @@ push_globs(ary, s, flags)
} }
static int static int
push_braces(ary, s, flags) push_braces(ary, str, flags)
VALUE ary; VALUE ary, str;
const char *s;
int flags; int flags;
{ {
VALUE buf; VALUE buf;
char *b; char *b;
const char *p, *t; const char *s, *p, *t;
const char *lbrace, *rbrace; const char *lbrace, *rbrace;
int nest = 0; int nest = 0;
int status = 0; int status = 0;
p = s; s = p = RSTRING(str)->ptr;
lbrace = rbrace = 0; lbrace = rbrace = 0;
while (*p) { while (*p) {
if (*p == '{') { if (*p == '{') {
@ -1202,7 +1201,7 @@ push_braces(ary, s, flags)
} }
} }
else { else {
status = push_globs(ary, s, flags); status = push_globs(ary, str, flags);
} }
return status; return status;