ruby-changes:12094
From: yugui <ko1@a...>
Date: Sat, 20 Jun 2009 18:08:45 +0900 (JST)
Subject: [ruby-changes:12094] Ruby:r23764 (ruby_1_9_1): merges r23607 from trunk into ruby_1_9_1.
yugui 2009-06-20 18:07:43 +0900 (Sat, 20 Jun 2009) New Revision: 23764 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23764 Log: merges r23607 from trunk into ruby_1_9_1. -- * file.c (istrailinggarbage): fixed typo. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/file.c branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 23763) +++ ruby_1_9_1/ChangeLog (revision 23764) @@ -1,3 +1,7 @@ +Sun May 31 23:26:36 2009 Nobuyoshi Nakada <nobu@r...> + + * file.c (istrailinggarbage): fixed typo. + Tue May 26 05:39:28 2009 Nobuyoshi Nakada <nobu@r...> * include/ruby/ruby.h (FilePathValue): prevent from GC. Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 23763) +++ ruby_1_9_1/version.h (revision 23764) @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-05-22" -#define RUBY_PATCHLEVEL 162 +#define RUBY_PATCHLEVEL 163 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 Index: ruby_1_9_1/file.c =================================================================== --- ruby_1_9_1/file.c (revision 23763) +++ ruby_1_9_1/file.c (revision 23764) @@ -2410,9 +2410,9 @@ #endif #if USE_NTFS -#define istrailinggabage(x) ((x) == '.' || (x) == ' ') +#define istrailinggarbage(x) ((x) == '.' || (x) == ' ') #else -#define istrailinggabage(x) 0 +#define istrailinggarbage(x) 0 #endif #ifndef CharNext /* defined as CharNext[AW] on Windows. */ @@ -2553,9 +2553,9 @@ { while (*path == '.') path++; while (*path && *path != ':') { - if (istrailinggabage(*path)) { + if (istrailinggarbage(*path)) { const char *last = path++; - while (istrailinggabage(*path)) path++; + while (istrailinggarbage(*path)) path++; if (!*path || *path == ':') return (char *)last; } else if (isdirsep(*path)) { @@ -2759,7 +2759,7 @@ } #if USE_NTFS else { - do *++s; while (istrailinggabage(*s)); + do ++s; while (istrailinggarbage(*s)); } #endif break; @@ -2779,7 +2779,7 @@ --s; case ' ': { const char *e = s; - while (istrailinggabage(*s)) s++; + while (istrailinggarbage(*s)) s++; if (!*s) { s = e; goto endpath; @@ -3145,10 +3145,10 @@ e = 0; while (*p && *p == '.') p++; while (*p) { - if (*p == '.' || istrailinggabage(*p)) { + if (*p == '.' || istrailinggarbage(*p)) { #if USE_NTFS const char *last = p++, *dot = last; - while (istrailinggabage(*p)) { + while (istrailinggarbage(*p)) { if (*p == '.') dot = p; p++; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/