summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--process.c3
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e44fedde61..7319ee1a72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Jun 23 23:48:21 2012 Tanaka Akira <akr@fsij.org>
+
+ * process.c (proc_spawn_cmd): unused variable removed to suppress a
+ warning.
+ (save_env): ditto.
+
+ [ruby-core:45797] reported by Luis Lavena.
+
Sat Jun 23 23:19:31 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add new_pgroup_given and new_pgroup_flag
@@ -9,6 +17,8 @@ Sat Jun 23 23:19:31 2012 Tanaka Akira <akr@fsij.org>
(rb_execarg_addopt): use the new fields.
(rb_spawn_process): follow the proc_spawn_cmd change.
+ [ruby-core:45794] [ruby-trunk - Bug #6633] reported by Luis Lavena.
+
Sat Jun 23 20:26:36 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add fd_dup2, fd_close, fd_open,
diff --git a/process.c b/process.c
index b30e413b28..a83c4120ab 100644
--- a/process.c
+++ b/process.c
@@ -1343,7 +1343,6 @@ proc_spawn_cmd_internal(char **argv, char *prog)
static rb_pid_t
proc_spawn_cmd(char **argv, VALUE prog, struct rb_execarg *eargp)
{
- VALUE options = eargp->options;
rb_pid_t pid = -1;
if (argv[0]) {
@@ -2705,10 +2704,8 @@ save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
static void
save_env(struct rb_execarg *sargp)
{
- VALUE soptions;
if (!sargp)
return;
- soptions = sargp->options;
if (sargp->env_modification == Qfalse) {
VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
if (RTEST(env)) {