merge revision(s) 14883:

shyouhei · shyouhei · commit 072943af6654 · 2008-06-07T21:04:24.000Z
* time.c (time_arg): use converted object.  [ruby-core:14759]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun  8 06:03:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* time.c (time_arg): use converted object.  [ruby-core:14759]
+
 Sun Jun  8 06:01:25 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
diff --git a/time.c b/time.c
@@ -349,7 +349,7 @@ time_arg(argc, argv, tm, usec)
 	    tm->tm_mon = -1;
 	    for (i=0; i<12; i++) {
 		if (RSTRING(s)->len == 3 &&
-		    strcasecmp(months[i], RSTRING(v[1])->ptr) == 0) {
+		    strcasecmp(months[i], RSTRING(s)->ptr) == 0) {
 		    tm->tm_mon = i;
 		    break;
 		}
diff --git a/version.h b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 163
+#define RUBY_PATCHLEVEL 164
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ time_arg(argc, argv, tm, usec)`
`349`	`349`	`tm->tm_mon = -1;`
`350`	`350`	`for (i=0; i<12; i++) {`
`351`	`351`	`if (RSTRING(s)->len == 3 &&`
`352`		`- strcasecmp(months[i], RSTRING(v[1])->ptr) == 0) {`
	`352`	`+ strcasecmp(months[i], RSTRING(s)->ptr) == 0) {`
`353`	`353`	`tm->tm_mon = i;`
`354`	`354`	`break;`
`355`	`355`	`}`