From b4f1270f6d0249894bd57ed42db8595655245eca Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 21 Jul 2006 14:58:18 +0000 Subject: [PATCH] * ruby.c (proc_options): script is never used while recursing. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ruby.c | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index af7b5b581e..71e0e6b38e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Jul 21 23:57:26 2006 Nobuyoshi Nakada + + * ruby.c (proc_options): script is never used while recursing. + Fri Jul 21 21:21:08 2006 Nobuyoshi Nakada * eval.c (rb_call0): include funcalled methods in caller list. diff --git a/ruby.c b/ruby.c index 594d728e9f..32278888ee 100644 --- a/ruby.c +++ b/ruby.c @@ -62,8 +62,6 @@ static VALUE do_loop = Qfalse, do_print = Qfalse; static VALUE do_check = Qfalse, do_line = Qfalse; static VALUE do_split = Qfalse; -static const char *script; - static int origargc; static char **origargv; @@ -447,10 +445,10 @@ process_sflag(void) static void proc_options(int argc, char **argv); static char* -moreswitches(char *s) +moreswitches(const char *s) { int argc; char *argv[3]; - char *p = s; + const char *p = s; argc = 2; argv[0] = argv[2] = 0; while (*s && !ISSPACE(*s)) @@ -462,7 +460,7 @@ moreswitches(char *s) proc_options(argc, argv); while (*s && ISSPACE(*s)) s++; - return s; + return (char *)s; } NODE *ruby_eval_tree; @@ -472,7 +470,8 @@ proc_options(int argc, char **argv) { char *argv0 = argv[0]; int do_search; - char *s; + const char *s; + char *script = 0; NODE *volatile script_node = 0; int version = 0; @@ -812,7 +811,7 @@ proc_options(int argc, char **argv) } #if defined DOSISH || defined __CYGWIN__ /* assume that we can change argv[n] if never change its length. */ - translate_char((char *)script, '\\', '/'); + translate_char(script, '\\', '/'); #endif argc--; argv++; }