mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* time.c (time_arg): show actual year in 2-3 digits year warning.
(time_mdump): show actual year in "year too big to marshal" error. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13959 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
68543f3092
commit
1e3ca9807b
2 changed files with 8 additions and 3 deletions
|
@ -1,3 +1,8 @@
|
|||
Sun Nov 18 17:28:49 2007 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* time.c (time_arg): show actual year in 2-3 digits year warning.
|
||||
(time_mdump): show actual year in "year too big to marshal" error.
|
||||
|
||||
Sun Nov 18 14:03:44 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* eval_method.ci (rb_alias): do not call hook functions until
|
||||
|
|
6
time.c
6
time.c
|
@ -306,11 +306,11 @@ time_arg(int argc, VALUE *argv, struct tm *tm, time_t *usec)
|
|||
year = obj2long(v[0]);
|
||||
|
||||
if (0 <= year && year < 39) {
|
||||
rb_warning("2 digits year is used: %ld", year);
|
||||
year += 100;
|
||||
rb_warning("2 digits year is used");
|
||||
}
|
||||
else if (69 <= year && year < 139) {
|
||||
rb_warning("2 or 3 digits year is used");
|
||||
rb_warning("2 or 3 digits year is used: %ld", year);
|
||||
}
|
||||
else {
|
||||
year -= 1900;
|
||||
|
@ -1939,7 +1939,7 @@ time_mdump(VALUE time)
|
|||
tm = gmtime(&t);
|
||||
|
||||
if ((tm->tm_year & 0xffff) != tm->tm_year)
|
||||
rb_raise(rb_eArgError, "year too big to marshal");
|
||||
rb_raise(rb_eArgError, "year too big to marshal: %ld", (long)tm->tm_year);
|
||||
|
||||
p = 0x1UL << 31 | /* 1 */
|
||||
tobj->gmt << 30 | /* 1 */
|
||||
|
|
Loading…
Add table
Reference in a new issue