summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-23 00:36:42 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-23 00:36:42 +0000
commit2a15a26c57faf4852a3f9b0afaafa886a78e7c96 (patch)
treeda80e457c165aaf7163e2c00b351320eab2ec65a /process.c
parent5c25fad66d614ad85cde6992c15b4dc422cec267 (diff)
* process.c: use the variable name "soptions" for sargp->options.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/process.c b/process.c
index 713b4431a4..450e3d3577 100644
--- a/process.c
+++ b/process.c
@@ -2344,7 +2344,7 @@ static int
save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{
if (sargp) {
- VALUE save = sargp->options;
+ VALUE soptions = sargp->options;
VALUE newary;
int save_fd = redirect_dup(fd);
if (save_fd == -1) {
@@ -2354,18 +2354,18 @@ save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_b
return -1;
}
rb_update_max_fd(save_fd);
- newary = rb_ary_entry(save, EXEC_OPTION_DUP2);
+ newary = rb_ary_entry(soptions, EXEC_OPTION_DUP2);
if (NIL_P(newary)) {
newary = hide_obj(rb_ary_new());
- rb_ary_store(save, EXEC_OPTION_DUP2, newary);
+ rb_ary_store(soptions, EXEC_OPTION_DUP2, newary);
}
rb_ary_push(newary,
hide_obj(rb_assoc_new(INT2FIX(fd), INT2FIX(save_fd))));
- newary = rb_ary_entry(save, EXEC_OPTION_CLOSE);
+ newary = rb_ary_entry(soptions, EXEC_OPTION_CLOSE);
if (NIL_P(newary)) {
newary = hide_obj(rb_ary_new());
- rb_ary_store(save, EXEC_OPTION_CLOSE, newary);
+ rb_ary_store(soptions, EXEC_OPTION_CLOSE, newary);
}
rb_ary_push(newary, hide_obj(rb_assoc_new(INT2FIX(save_fd), Qnil)));
}
@@ -2667,7 +2667,7 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
int rtype = NUM2INT(RARRAY_PTR(elt)[0]);
struct rlimit rlim;
if (sargp) {
- VALUE save = sargp->options;
+ VALUE soptions = sargp->options;
VALUE tmp, newary;
if (getrlimit(rtype, &rlim) == -1) {
ERRMSG("getrlimit");
@@ -2676,10 +2676,10 @@ run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg
tmp = hide_obj(rb_ary_new3(3, RARRAY_PTR(elt)[0],
RLIM2NUM(rlim.rlim_cur),
RLIM2NUM(rlim.rlim_max)));
- newary = rb_ary_entry(save, EXEC_OPTION_RLIMIT);
+ newary = rb_ary_entry(soptions, EXEC_OPTION_RLIMIT);
if (NIL_P(newary)) {
newary = hide_obj(rb_ary_new());
- rb_ary_store(save, EXEC_OPTION_RLIMIT, newary);
+ rb_ary_store(soptions, EXEC_OPTION_RLIMIT, newary);
}
rb_ary_push(newary, tmp);
}
@@ -2705,19 +2705,19 @@ save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
static void
save_env(struct rb_execarg *sargp)
{
- VALUE save;
+ VALUE soptions;
if (!sargp)
return;
- save = sargp->options;
- if (NIL_P(rb_ary_entry(save, EXEC_OPTION_ENV))) {
+ soptions = sargp->options;
+ if (NIL_P(rb_ary_entry(soptions, EXEC_OPTION_ENV))) {
VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
if (RTEST(env)) {
VALUE ary = hide_obj(rb_ary_new());
rb_block_call(env, rb_intern("each"), 0, 0, save_env_i,
(VALUE)ary);
- rb_ary_store(save, EXEC_OPTION_ENV, ary);
+ rb_ary_store(soptions, EXEC_OPTION_ENV, ary);
}
- rb_ary_store(save, EXEC_OPTION_UNSETENV_OTHERS, Qtrue);
+ rb_ary_store(soptions, EXEC_OPTION_UNSETENV_OTHERS, Qtrue);
}
}
#endif