summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-31 14:26:40 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-31 14:26:40 +0000
commit7dbc1cf6b14a7a92e41a826838c9e0440f7082ec (patch)
treee87d1246e177da338e373ffa94aa194a59a8a3bc
parentb45d7f9341c5b2bd2e447a344b85ab5257530b09 (diff)
* file.c (istrailinggarbage): fixed typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23607 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--file.c16
-rw-r--r--version.h6
3 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c96192275a..97554612ea 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.
+
Fri May 29 09:19:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/thread/thread.c (unlock_mutex_inner): fixed wrong variable.
diff --git a/file.c b/file.c
index 297b749ecc..a26ec74cb5 100644
--- a/file.c
+++ b/file.c
@@ -2304,9 +2304,9 @@ rb_file_s_umask(argc, 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. */
@@ -2459,9 +2459,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)) {
@@ -2658,7 +2658,7 @@ file_expand_path(fname, dname, result)
}
#if USE_NTFS
else {
- do ++s; while (istrailinggabage(*s));
+ do ++s; while (istrailinggarbage(*s));
}
#endif
break;
@@ -2678,7 +2678,7 @@ file_expand_path(fname, dname, result)
--s;
case ' ': {
const char *e = s;
- while (istrailinggabage(*s)) s++;
+ while (istrailinggarbage(*s)) s++;
if (!*s) {
s = e;
goto endpath;
@@ -3022,10 +3022,10 @@ rb_file_s_extname(klass, 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 86314e89cd..d0d05529de 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-05-29"
+#define RUBY_RELEASE_DATE "2009-05-31"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090529
+#define RUBY_RELEASE_CODE 20090531
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 31
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];