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

* process.c (rb_exec_fillarg): take a VALUE argument instead of

Browse source 
struct rb_execarg.
  (rb_check_exec_options): ditto.
  (check_exec_options_i): ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-21 11:36:25 +00:00
parent 1b2c2316a5
commit 511e25b2d5
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Jun 21 20:34:19 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_exec_fillarg): take a VALUE argument instead of
struct rb_execarg.
(rb_check_exec_options): ditto.
(check_exec_options_i): ditto.
the third argument
Thu Jun 21 19:48:05 2012 Tanaka Akira <akr@fsij.org> Thu Jun 21 19:48:05 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_exec_async_signal_safe): use rb_execarg_run_options * process.c (rb_exec_async_signal_safe): use rb_execarg_run_options

14
process.c
View file

@ -1687,8 +1687,12 @@ check_exec_options_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
{ {
VALUE key = (VALUE)st_key; VALUE key = (VALUE)st_key;
VALUE val = (VALUE)st_val; VALUE val = (VALUE)st_val;
struct rb_execarg *e = (struct rb_execarg *)arg; VALUE execarg_obj = (VALUE)arg;
return rb_execarg_addopt(e, key, val); struct rb_execarg *e = rb_execarg_get(execarg_obj);
int ret;
ret = rb_execarg_addopt(e, key, val);
RB_GC_GUARD(execarg_obj);
return ret;
} }
static VALUE static VALUE
@ -1763,11 +1767,11 @@ check_exec_fds(VALUE options)
} }
static void static void
rb_check_exec_options(VALUE opthash, struct rb_execarg *e) rb_check_exec_options(VALUE opthash, VALUE execarg_obj)
{ {
if (RHASH_EMPTY_P(opthash)) if (RHASH_EMPTY_P(opthash))
return; return;
st_foreach(RHASH_TBL(opthash), check_exec_options_i, (st_data_t)e); st_foreach(RHASH_TBL(opthash), check_exec_options_i, (st_data_t)execarg_obj);
} }
static int static int
@ -1892,7 +1896,7 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VAL
e->options = options; e->options = options;
if (!NIL_P(opthash)) { if (!NIL_P(opthash)) {
rb_check_exec_options(opthash, e); rb_check_exec_options(opthash, execarg_obj);
} }
if (!NIL_P(env)) { if (!NIL_P(env)) {
env = rb_check_exec_env(env); env = rb_check_exec_env(env);