kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* dir.c (struct glob_args, rb_glob_caller, rb_glob2, push_pattern),

Browse source 
(glob_brace): make consistent prototypes.

* dir.c (push_glob): set enc in the caller of rb_glob_caller as well
  as rb_glob2.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-07-09 02:11:21 +00:00
parent ec18fc70a3
commit 8dfc2f81c0
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Jul 9 11:11:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dir.c (struct glob_args, rb_glob_caller, rb_glob2, push_pattern),
(glob_brace): make consistent prototypes.
* dir.c (push_glob): set enc in the caller of rb_glob_caller as well
as rb_glob2.
Wed Jul 9 09:12:11 2008 NARUSE, Yui <naruse@ruby-lang.org> Wed Jul 9 09:12:11 2008 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c (options): use input_endian. * ext/nkf/nkf-utf8/nkf.c (options): use input_endian.

16
dir.c
View file

@ -1181,7 +1181,7 @@ enum answer { YES, NO, UNKNOWN };
#endif #endif
struct glob_args { struct glob_args {
void (*func)(const char *, VALUE, rb_encoding *); void (*func)(const char *, VALUE, void *);
const char *path; const char *path;
VALUE value; VALUE value;
rb_encoding *enc; rb_encoding *enc;
@ -1429,20 +1429,19 @@ ruby_glob(const char *path, int flags, ruby_glob_func *func, VALUE arg)
} }
static int static int
rb_glob_caller(const char *path, VALUE a, rb_encoding *enc) rb_glob_caller(const char *path, VALUE a, void *enc)
{ {
int status; int status;
struct glob_args *args = (struct glob_args *)a; struct glob_args *args = (struct glob_args *)a;
args->path = path; args->path = path;
args->enc = enc;
rb_protect(glob_func_caller, a, &status); rb_protect(glob_func_caller, a, &status);
return status; return status;
} }
static int static int
rb_glob2(const char *path, int flags, rb_glob2(const char *path, int flags,
void (*func)(const char *, VALUE, rb_encoding *), VALUE arg, void (*func)(const char *, VALUE, void *), VALUE arg,
rb_encoding* enc) rb_encoding* enc)
{ {
struct glob_args args; struct glob_args args;
@ -1467,7 +1466,7 @@ rb_glob(const char *path, void (*func)(const char *, VALUE, void *), VALUE arg)
} }
static void static void
push_pattern(const char *path, VALUE ary, rb_encoding *enc) push_pattern(const char *path, VALUE ary, void *enc)
{ {
VALUE vpath = rb_tainted_str_new2(path); VALUE vpath = rb_tainted_str_new2(path);
rb_enc_associate(vpath, enc); rb_enc_associate(vpath, enc);
@ -1539,7 +1538,7 @@ struct brace_args {
}; };
static int static int
glob_brace(const char *path, VALUE val, rb_encoding *enc) glob_brace(const char *path, VALUE val, void *enc)
{ {
struct brace_args *arg = (struct brace_args *)val; struct brace_args *arg = (struct brace_args *)val;
@ -1569,11 +1568,14 @@ static int
push_glob(VALUE ary, VALUE str, int flags) push_glob(VALUE ary, VALUE str, int flags)
{ {
struct glob_args args; struct glob_args args;
rb_encoding *enc = rb_enc_get(str);
args.func = push_pattern; args.func = push_pattern;
args.value = ary; args.value = ary;
args.enc = enc;
return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE, return ruby_brace_glob0(RSTRING_PTR(str), flags | GLOB_VERBOSE,
rb_glob_caller, (VALUE)&args, rb_enc_get(str)); rb_glob_caller, (VALUE)&args, enc);
} }
static VALUE static VALUE