akr	2012-06-24 07:48:11 +0900 (Sun, 24 Jun 2012)

  New Revision: 36204

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36204

  Log:
    * internal.h (rb_execarg): options field removed.
    
    * process.c: follow the rb_execarg change.

  Modified files:
    trunk/ChangeLog
    trunk/internal.h
    trunk/process.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36203)
+++ ChangeLog	(revision 36204)
@@ -1,3 +1,9 @@
+Sun Jun 24 07:47:17 2012  Tanaka Akira  <akr@f...>
+
+	* internal.h (rb_execarg): options field removed.
+
+	* process.c: follow the rb_execarg change.
+
 Sat Jun 23 23:48:21 2012  Tanaka Akira  <akr@f...>
 
 	* process.c (proc_spawn_cmd): unused variable removed to suppress a
Index: process.c
===================================================================
--- process.c	(revision 36203)
+++ process.c	(revision 36204)
@@ -1265,7 +1265,6 @@
         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 @@
 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 @@
 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;
     }
 
Index: internal.h
===================================================================
--- internal.h	(revision 36203)
+++ internal.h	(revision 36204)
@@ -171,7 +171,6 @@
             VALUE argv_buf;
         } cmd;
     } invoke;
-    VALUE options;
     VALUE redirect_fds;
     VALUE envp_str;
     VALUE envp_buf;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/