diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-01 02:55:29 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-01 02:55:29 +0000 |
| commit | aa23bfaf08fb8eafa9c48fc0c3d79afc21ad3bf9 (patch) | |
| tree | b38b68424e3b395db27bd96bcce8a5660ccb1e85 | |
| parent | d84edcfd73b3779657a5b142882559ce1174338b (diff) | |
* io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | io.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Mon Nov 1 11:52:18 2004 NAKAMURA Usaku <[email protected]> + + * io.c (pipe_open): avoid conflict of variable name. [ruby-dev:24662] + Mon Nov 1 11:46:19 2004 WATANABE Hirofumi <[email protected]> * process.c (rb_f_exec): should check whether prog is NULL. @@ -2783,7 +2783,7 @@ pipe_open(argc, argv, pname, mode) #elif defined(_WIN32) FILE *fpr, *fpw; int openmode = rb_io_mode_modenum(mode); - char *prog = NULL; + char *exename = NULL; #endif char *cmd; @@ -2854,9 +2854,9 @@ pipe_open(argc, argv, pname, mode) cmd = ALLOCA_N(char, rb_w32_argv_size(args)); rb_w32_join_argv(cmd, args); free(args); - prog = pname; + exename = pname; } - while ((pid = rb_w32_pipe_exec(cmd, prog, openmode, &fpr, &fpw)) == -1) { + while ((pid = rb_w32_pipe_exec(cmd, exename, openmode, &fpr, &fpw)) == -1) { /* exec failed */ switch (errno) { case EAGAIN: |