* internal.h (rb_execarg): options field removed.

* process.c: follow the rb_execarg change.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 7319ee1a72..9a0a089673 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 24 07:47:17 2012  Tanaka Akira  <akr@fsij.org>
+
+	* internal.h (rb_execarg): options field removed.
+
+	* process.c: follow the rb_execarg change.
+
 Sat Jun 23 23:48:21 2012  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (proc_spawn_cmd): unused variable removed to suppress a
diff --git a/internal.h b/internal.h
index cbcfe4ecf2..790cf5b31d 100644
--- a/internal.h
+++ b/internal.h
@@ -171,7 +171,6 @@ struct rb_execarg {
             VALUE argv_buf;
         } cmd;
     } invoke;
-    VALUE options;
     VALUE redirect_fds;
     VALUE envp_str;
     VALUE envp_buf;
diff --git a/process.c b/process.c
index a83c4120ab..2c6bd15b3c 100644
--- a/process.c
+++ b/process.c
@@ -1265,7 +1265,6 @@ mark_exec_arg(void *ptr)
         rb_gc_mark(eargp->invoke.cmd.argv_str);
         rb_gc_mark(eargp->invoke.cmd.argv_buf);
     }
-    rb_gc_mark(eargp->options);
     rb_gc_mark(eargp->redirect_fds);
     rb_gc_mark(eargp->envp_str);
     rb_gc_mark(eargp->envp_buf);
@@ -1888,12 +1887,9 @@ static void
 rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VALUE execarg_obj)
 {
     struct rb_execarg *eargp = rb_execarg_get(execarg_obj);
-    VALUE options;
     char fbuf[MAXPATHLEN];
 
     MEMZERO(eargp, struct rb_execarg, 1);
-    options = hide_obj(rb_ary_new());
-    eargp->options = options;
 
     if (!NIL_P(opthash)) {
         rb_check_exec_options(opthash, execarg_obj);
@@ -2724,16 +2720,11 @@ save_env(struct rb_execarg *sargp)
 int
 rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
 {
-    VALUE options = eargp->options;
     VALUE obj;
 
-    if (!RTEST(options))
-        return 0;
-
     if (sargp) {
         /* assume that sargp is always NULL on fork-able environments */
         MEMZERO(sargp, struct rb_execarg, 1);
-        sargp->options = hide_obj(rb_ary_new());
         sargp->redirect_fds = Qnil;
     }