1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* time.c (make_time_t): revert round trip test. [ruby-dev:33058]

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-01-24 06:10:49 +00:00
parent 968e404220
commit 4eca4cadff
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Jan 24 15:09:40 2008 Tanaka Akira <akr@fsij.org>
* time.c (make_time_t): revert round trip test. [ruby-dev:33058]
Thu Jan 24 11:14:56 2008 Tanaka Akira <akr@fsij.org> Thu Jan 24 11:14:56 2008 Tanaka Akira <akr@fsij.org>
* string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is * string.c (rb_enc_cr_str_buf_cat): ASCII incompatible encoding is

29
time.c
View File

@ -825,37 +825,40 @@ make_time_t(struct tm *tptr, int utc_p)
buf = *tptr; buf = *tptr;
if (utc_p) { if (utc_p) {
#if defined(HAVE_TIMEGM) #if defined(HAVE_TIMEGM)
t = timegm(&buf); if ((t = timegm(&buf)) != -1)
if (t == (time_t)-1) return t;
#endif #ifdef NEGATIVE_TIME_T
t = search_time_t(&buf, utc_p);
if ((tmp = gmtime(&t)) && if ((tmp = gmtime(&t)) &&
tptr->tm_year == tmp->tm_year && tptr->tm_year == tmp->tm_year &&
tptr->tm_mon == tmp->tm_mon && tptr->tm_mon == tmp->tm_mon &&
tptr->tm_mday == tmp->tm_mday && tptr->tm_mday == tmp->tm_mday &&
tptr->tm_hour == tmp->tm_hour && tptr->tm_hour == tmp->tm_hour &&
tptr->tm_min == tmp->tm_min && tptr->tm_min == tmp->tm_min &&
tptr->tm_sec == tmp->tm_sec) { tptr->tm_sec == tmp->tm_sec
)
return t; return t;
} #endif
#endif
return search_time_t(&buf, utc_p);
} }
else { else {
#if defined(HAVE_MKTIME) #if defined(HAVE_MKTIME)
t = mktime(&buf); if ((t = mktime(&buf)) != -1)
if (t == (time_t)-1) return t;
#endif #ifdef NEGATIVE_TIME_T
t = search_time_t(&buf, utc_p);
if ((tmp = localtime(&t)) && if ((tmp = localtime(&t)) &&
tptr->tm_year == tmp->tm_year && tptr->tm_year == tmp->tm_year &&
tptr->tm_mon == tmp->tm_mon && tptr->tm_mon == tmp->tm_mon &&
tptr->tm_mday == tmp->tm_mday && tptr->tm_mday == tmp->tm_mday &&
tptr->tm_hour == tmp->tm_hour && tptr->tm_hour == tmp->tm_hour &&
tptr->tm_min == tmp->tm_min && tptr->tm_min == tmp->tm_min &&
tptr->tm_sec == tmp->tm_sec) { tptr->tm_sec == tmp->tm_sec
)
return t; return t;
} #endif
#endif
return search_time_t(&buf, utc_p);
} }
rb_raise(rb_eArgError, "couldn't generate a time");
} }
static VALUE static VALUE