merges r23607 from trunk into ruby_1_9_1.

--
* file.c (istrailinggarbage): fixed typo.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 13 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 33aa4e059..faa473b09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 31 23:26:36 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* file.c (istrailinggarbage): fixed typo.
+
 Tue May 26 05:39:28 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (FilePathValue): prevent from GC.
diff --git a/file.c b/file.c
index 6a7cabae7..3d5c33bd7 100644
--- a/file.c
+++ b/file.c
@@ -2410,9 +2410,9 @@ rb_file_s_umask(int argc, VALUE *argv)
 #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 @@ ntfs_tail(const char *path)
 {
     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 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 		    }
 #if USE_NTFS
 		    else {
-			do *++s; while (istrailinggabage(*s));
+			do ++s; while (istrailinggarbage(*s));
 		    }
 #endif
 		    break;
@@ -2779,7 +2779,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
 		--s;
 	      case ' ': {
 		const char *e = s;
-		while (istrailinggabage(*s)) s++;
+		while (istrailinggarbage(*s)) s++;
 		if (!*s) {
 		    s = e;
 		    goto endpath;
@@ -3145,10 +3145,10 @@ rb_file_s_extname(VALUE klass, VALUE fname)
     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++;
 	    }
diff --git a/version.h b/version.h
index 46dd46fc3..ef50335ec 100644
--- a/version.h
+++ b/version.h
@@ -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