summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-21 12:18:40 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-21 12:18:40 +0000
commited8040a62b9cd77d9c218eed0b993d4aa15eddc0 (patch)
treeef3c0424dab9669fe83d367d79db3034a74fa912 /io.c
parent511e25b2d597c86667a170b186e414cdd246acb6 (diff)
* process.c (rb_execarg_addopt): take a VALUE argument instead of
struct rb_execarg. (rb_exec_arg_addopt): follow the rb_execarg_addopt change. (check_exec_options_i): ditto. * io.c (pipe_open): follow the rb_execarg_addopt change. * internal.h (rb_execarg_addopt): follow the definition change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/io.c b/io.c
index d0a57e8fbd..c1ff1345a3 100644
--- a/io.c
+++ b/io.c
@@ -5520,21 +5520,21 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
rb_sys_fail_str(prog);
}
if (eargp) {
- rb_execarg_addopt(eargp, INT2FIX(0), INT2FIX(arg.write_pair[0]));
- rb_execarg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(arg.write_pair[0]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(arg.pair[1]));
}
break;
case FMODE_READABLE:
if (rb_pipe(arg.pair) < 0)
rb_sys_fail_str(prog);
if (eargp)
- rb_execarg_addopt(eargp, INT2FIX(1), INT2FIX(arg.pair[1]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(arg.pair[1]));
break;
case FMODE_WRITABLE:
if (rb_pipe(arg.pair) < 0)
rb_sys_fail_str(prog);
if (eargp)
- rb_execarg_addopt(eargp, INT2FIX(0), INT2FIX(arg.pair[0]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(arg.pair[0]));
break;
default:
rb_sys_fail_str(prog);
@@ -5598,21 +5598,21 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
rb_sys_fail_str(prog);
}
if (eargp) {
- rb_execarg_addopt(eargp, INT2FIX(0), INT2FIX(write_pair[0]));
- rb_execarg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(write_pair[0]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(pair[1]));
}
break;
case FMODE_READABLE:
if (rb_pipe(pair) < 0)
rb_sys_fail_str(prog);
if (eargp)
- rb_execarg_addopt(eargp, INT2FIX(1), INT2FIX(pair[1]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(1), INT2FIX(pair[1]));
break;
case FMODE_WRITABLE:
if (rb_pipe(pair) < 0)
rb_sys_fail_str(prog);
if (eargp)
- rb_execarg_addopt(eargp, INT2FIX(0), INT2FIX(pair[0]));
+ rb_execarg_addopt(execarg_obj, INT2FIX(0), INT2FIX(pair[0]));
break;
default:
rb_sys_fail_str(prog);