From 8fcdb757a597b69d46216d7475ed4d07e6a330ef Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 10 Jun 2012 01:17:53 +0000 Subject: [PATCH] * process.c (rb_f_exec): use rb_exec_arg_prepare. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36000 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ process.c | 17 ++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c32aea9730..c78803bf73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Jun 10 10:14:26 2012 Tanaka Akira + + * process.c (rb_f_exec): use rb_exec_arg_prepare. + Sun Jun 10 06:43:51 2012 Tanaka Akira * process.c: split after_exec into async-signal-safe part and rest. diff --git a/process.c b/process.c index e452a9228b..64cde6c146 100644 --- a/process.c +++ b/process.c @@ -1968,6 +1968,13 @@ rb_exec_arg_fixup(struct rb_exec_arg *e) } } +static void +rb_exec_arg_prepare(struct rb_exec_arg *earg, int argc, VALUE *argv) +{ + rb_exec_arg_init(argc, argv, TRUE, earg); + rb_exec_arg_fixup(earg); +} + /* * call-seq: * exec([env,] command... [,options]) @@ -2019,8 +2026,7 @@ rb_f_exec(int argc, VALUE *argv) #define CHILD_ERRMSG_BUFLEN 80 char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' }; - rb_exec_arg_init(argc, argv, TRUE, &earg); - rb_exec_arg_fixup(&earg); + rb_exec_arg_prepare(&earg, argc, argv); rb_exec_err(&earg, errmsg, sizeof(errmsg)); if (errmsg[0]) @@ -3224,13 +3230,6 @@ rb_syswait(rb_pid_t pid) rb_waitpid(pid, &status, 0); } -static void -rb_exec_arg_prepare(struct rb_exec_arg *earg, int argc, VALUE *argv) -{ - rb_exec_arg_init(argc, argv, TRUE, earg); - rb_exec_arg_fixup(earg); -} - static rb_pid_t rb_spawn_process(struct rb_exec_arg *earg, char *errmsg, size_t errmsg_buflen) {