1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* process.c (proc_spawn_cmd): unused variable removed to suppress a

Browse Source 
warning.
  (save_env): ditto.

  [ruby-core:45797] reported by Luis Lavena.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-23 14:50:38 +00:00
parent f1734b4287
commit 1ad4751aac
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> Sat Jun 23 23:19:31 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add new_pgroup_given and new_pgroup_flag * 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_execarg_addopt): use the new fields.
(rb_spawn_process): follow the proc_spawn_cmd change. (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> Sat Jun 23 20:26:36 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): add fd_dup2, fd_close, fd_open, * internal.h (rb_execarg): add fd_dup2, fd_close, fd_open,

3
process.c
View File

@ -1343,7 +1343,6 @@ proc_spawn_cmd_internal(char **argv, char *prog)
static rb_pid_t static rb_pid_t
proc_spawn_cmd(char **argv, VALUE prog, struct rb_execarg *eargp) proc_spawn_cmd(char **argv, VALUE prog, struct rb_execarg *eargp)
{ {
VALUE options = eargp->options;
rb_pid_t pid = -1; rb_pid_t pid = -1;
if (argv[0]) { if (argv[0]) {
@ -2705,10 +2704,8 @@ save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
static void static void
save_env(struct rb_execarg *sargp) save_env(struct rb_execarg *sargp)
{ {
VALUE soptions;
if (!sargp) if (!sargp)
return; return;
soptions = sargp->options;
if (sargp->env_modification == Qfalse) { if (sargp->env_modification == Qfalse) {
VALUE env = rb_const_get(rb_cObject, rb_intern("ENV")); VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
if (RTEST(env)) { if (RTEST(env)) {