From e3a8c626308cb8546baaf75e6133df304142f0c8 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 24 Apr 2002 04:54:16 +0000 Subject: * io.c (rb_io_mode_flags): both 'r+b' and 'rb+' should be allowed. * io.c (rb_io_mode_modenum): ditto. * gc.c (rb_memerror): rename from mem_error, and exported. * gc.c (Init_GC): pre-allocate NoMemoryError instance. * object.c (convert_type): error message changed from "failed to convert" to "cannot convert", since it does not try to convert if an object does not respond to the converting method. * eval.c (block_pass): convert Method to Proc using rb_check_convert_type(). * object.c (rb_check_convert_type): always convert T_DATA * eval.c (rb_thread_cleanup): should not terminate main_thread by Fatal error. * regex.c (is_in_list): need to not exclude NUL and NEWLINE. * re.c (rb_reg_expr_str): wrong backslash escapement. * re.c (rb_reg_expr_str): do not escape embedded space characters. * marshal.c (w_object): T_DATA process patch from Joel VanderWerf . This is temporary hack; it remains undocumented, and it will be removed when marshaling is re-designed. * marshal.c (r_object): ditto. * numeric.c (num_step): Integer#step is moved to Numeric#step; Fixnum#step is merged into this method. * numeric.c (int_dotimes): Fixnum#times is merged. * numeric.c (int_upto): Fixnum#upto is merged. * numeric.c (int_downto): Fixnum#downto is merged. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2401 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- file.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'file.c') diff --git a/file.c b/file.c index 3a7f5e393f..064cc78259 100644 --- a/file.c +++ b/file.c @@ -1587,7 +1587,7 @@ rb_file_s_basename(argc, argv) VALUE *argv; { VALUE fname, fext, basename; - char *name, *p, *ext; + char *name, *p, *ext = NULL; int f; if (rb_scan_args(argc, argv, "11", &fname, &fext) == 2) { @@ -1998,7 +1998,7 @@ static VALUE rb_stat_clone(obj) VALUE obj; { - struct stat st, *nst; + struct stat *nst; VALUE clone; @@ -2403,7 +2403,7 @@ rb_find_file_ext(filep, ext) VALUE *filep; const char * const *ext; { - char *path, *e, *found; + char *path, *found; char *f = RSTRING(*filep)->ptr; VALUE fname; int i, j; @@ -2454,10 +2454,9 @@ VALUE rb_find_file(path) VALUE path; { - VALUE tmp, fname; + VALUE tmp; char *f = RSTRING(path)->ptr; char *lpath; - struct stat st; if (f[0] == '~') { path = rb_file_s_expand_path(1, &path); -- cgit v1.2.3