diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-22 23:09:16 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-22 23:09:16 +0000 |
commit | 3eafc1660f290da3939c8f4647907275ade8d0ac (patch) | |
tree | 4bc1f03cc15efb17aca312d87bf7696e1d4f1fb1 /io.c | |
parent | f7fc42a7af1c88dae8b2ab44eaeb7042fb8d3b11 (diff) | |
download | ruby-3eafc1660f290da3939c8f4647907275ade8d0ac.tar.gz |
* process.c: use the name "eargp" for struct rb_execarg variables
consistently except for saving process attributes.
* io.c: ditto.
* ext/pty/pty.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -5343,7 +5343,7 @@ rb_pipe(int *pipes) #ifdef HAVE_FORK struct popen_arg { VALUE execarg_obj; - struct rb_execarg *execp; + struct rb_execarg *eargp; int modef; int pair[2]; int write_pair[2]; @@ -5462,7 +5462,7 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len) { struct popen_arg *p = (struct popen_arg*)pp; - return rb_exec_async_signal_safe(p->execp, errmsg, errmsg_len); + return rb_exec_async_signal_safe(p->eargp, errmsg, errmsg_len); } #endif @@ -5504,7 +5504,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc #if defined(HAVE_FORK) arg.execarg_obj = execarg_obj; - arg.execp = eargp; + arg.eargp = eargp; arg.modef = fmode; arg.pair[0] = arg.pair[1] = -1; arg.write_pair[0] = arg.write_pair[1] = -1; @@ -5541,7 +5541,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc } if (!NIL_P(execarg_obj)) { rb_execarg_fixup(execarg_obj); - pid = rb_fork_async_signal_safe(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg)); + pid = rb_fork_async_signal_safe(&status, popen_exec, &arg, arg.eargp->redirect_fds, errmsg, sizeof(errmsg)); } else { pid = rb_fork_ruby(&status); |