summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--time.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 40bf0c0bed..fce7f4f9a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/time.c b/time.c
index d2f9a729e8..7d09c289e7 100644
--- a/time.c
+++ b/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 */