1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

file.c: apply2files returns Fixnum

Browse Source 
* file.c (apply2files): return Fixnum so that callers can just
  return it.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54532 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-04-10 21:59:01 +00:00
parent df63c544a6
commit e19df562a8
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
file.c
View File

@ -336,7 +336,7 @@ ignored_char_p(const char *p, const char *e, rb_encoding *enc)
#define apply2args(n) (rb_check_arity(argc, n, UNLIMITED_ARGUMENTS), argc-=n) #define apply2args(n) (rb_check_arity(argc, n, UNLIMITED_ARGUMENTS), argc-=n)
static long static VALUE
apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, void *arg) apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, void *arg)
{ {
long i; long i;
@ -350,7 +350,7 @@ apply2files(void (*func)(const char *, VALUE, void *), int argc, VALUE *argv, vo
(*func)(s, path, arg); (*func)(s, path, arg);
} }
return argc; return LONG2FIX(argc);
} }
/* /*
@ -2295,13 +2295,11 @@ static VALUE
rb_file_s_chmod(int argc, VALUE *argv) rb_file_s_chmod(int argc, VALUE *argv)
{ {
int mode; int mode;
long n;
apply2args(1); apply2args(1);
mode = NUM2INT(*argv++); mode = NUM2INT(*argv++);
n = apply2files(chmod_internal, argc, argv, &mode); return apply2files(chmod_internal, argc, argv, &mode);
return LONG2FIX(n);
} }
/* /*
@ -2369,13 +2367,12 @@ lchmod_internal(const char *path, VALUE pathv, void *mode)
static VALUE static VALUE
rb_file_s_lchmod(int argc, VALUE *argv) rb_file_s_lchmod(int argc, VALUE *argv)
{ {
long mode, n; long mode;
apply2args(1); apply2args(1);
mode = NUM2INT(*argv++); mode = NUM2INT(*argv++);
n = apply2files(lchmod_internal, argc, argv, (void *)(long)mode); return apply2files(lchmod_internal, argc, argv, (void *)(long)mode);
return LONG2FIX(n);
} }
#else #else
#define rb_file_s_lchmod rb_f_notimplement #define rb_file_s_lchmod rb_f_notimplement
@ -2431,14 +2428,12 @@ static VALUE
rb_file_s_chown(int argc, VALUE *argv) rb_file_s_chown(int argc, VALUE *argv)
{ {
struct chown_args arg; struct chown_args arg;
long n;
apply2args(2); apply2args(2);
arg.owner = to_uid(*argv++); arg.owner = to_uid(*argv++);
arg.group = to_gid(*argv++); arg.group = to_gid(*argv++);
n = apply2files(chown_internal, argc, argv, &arg); return apply2files(chown_internal, argc, argv, &arg);
return LONG2FIX(n);
} }
/* /*
@ -2506,14 +2501,12 @@ static VALUE
rb_file_s_lchown(int argc, VALUE *argv) rb_file_s_lchown(int argc, VALUE *argv)
{ {
struct chown_args arg; struct chown_args arg;
long n;
apply2args(2); apply2args(2);
arg.owner = to_uid(*argv++); arg.owner = to_uid(*argv++);
arg.group = to_gid(*argv++); arg.group = to_gid(*argv++);
n = apply2files(lchown_internal, argc, argv, &arg); return apply2files(lchown_internal, argc, argv, &arg);
return LONG2FIX(n);
} }
#else #else
#define rb_file_s_lchown rb_f_notimplement #define rb_file_s_lchown rb_f_notimplement
@ -2638,7 +2631,6 @@ rb_file_s_utime(int argc, VALUE *argv)
{ {
struct utime_args args; struct utime_args args;
struct timespec tss[2], *tsp = NULL; struct timespec tss[2], *tsp = NULL;
long n;
apply2args(2); apply2args(2);
args.atime = *argv++; args.atime = *argv++;
@ -2654,8 +2646,7 @@ rb_file_s_utime(int argc, VALUE *argv)
} }
args.tsp = tsp; args.tsp = tsp;
n = apply2files(utime_internal, argc, argv, &args); return apply2files(utime_internal, argc, argv, &args);
return LONG2FIX(n);
} }
#ifdef RUBY_FUNCTION_NAME_STRING #ifdef RUBY_FUNCTION_NAME_STRING
@ -2822,10 +2813,7 @@ unlink_internal(const char *path, VALUE pathv, void *arg)
static VALUE static VALUE
rb_file_s_unlink(int argc, VALUE *argv, VALUE klass) rb_file_s_unlink(int argc, VALUE *argv, VALUE klass)
{ {
long n; return apply2files(unlink_internal, argc, argv, 0);
n = apply2files(unlink_internal, argc, argv, 0);
return LONG2FIX(n);
} }
/* /*