diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-23 00:18:32 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-23 00:18:32 +0000 |
| commit | 5c25fad66d614ad85cde6992c15b4dc422cec267 (patch) | |
| tree | 33dbeafa80f8f6e5d76f53a26aba800e97b659d5 /io.c | |
| parent | 0b3b2e885b2739769a4a0ca42420c708e084d547 (diff) | |
* process.c: use the name "sargp" for struct rb_execarg variables
consistently for saving process attributes.
* io.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -5486,7 +5486,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc int pair[2], write_pair[2]; #endif #if !defined(HAVE_FORK) - struct rb_execarg sarg; + struct rb_execarg sarg, *sargp = &sarg; #endif FILE *fp = 0; int fd = -1; @@ -5619,7 +5619,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc } if (!NIL_P(execarg_obj)) { rb_execarg_fixup(execarg_obj); - rb_execarg_run_options(eargp, &sarg, NULL, 0); + rb_execarg_run_options(eargp, sargp, NULL, 0); } while ((pid = (args ? rb_w32_aspawn(P_NOWAIT, cmd, args) : @@ -5636,7 +5636,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc { int e = errno; if (eargp) - rb_execarg_run_options(&sarg, NULL, NULL, 0); + rb_execarg_run_options(sargp, NULL, NULL, 0); close(pair[0]); close(pair[1]); if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) { @@ -5653,7 +5653,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc RB_GC_GUARD(argbuf); if (eargp) - rb_execarg_run_options(&sarg, NULL, NULL, 0); + rb_execarg_run_options(sargp, NULL, NULL, 0); if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) { close(pair[1]); fd = pair[0]; @@ -5675,11 +5675,11 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc } if (!NIL_P(execarg_obj)) { rb_execarg_fixup(execarg_obj); - rb_execarg_run_options(eargp, &sarg, NULL, 0); + rb_execarg_run_options(eargp, sargp, NULL, 0); } fp = popen(cmd, modestr); if (eargp) - rb_execarg_run_options(&sarg, NULL, NULL, 0); + rb_execarg_run_options(sargp, NULL, NULL, 0); if (!fp) rb_sys_fail_path(prog); fd = fileno(fp); #endif |